8842 commits

Author	SHA1	Message	Date
MascaraSnake	11493e61d2	Merge branch 'executordelay' into 'udmf-next' ... UDMF linedef executor delay See merge request STJr/SRB2!918	2020-06-01 07:57:23 -04:00
MascaraSnake	969c48fac8	Merge branch 'udmf-next' into udmf-polyobjects ... # Conflicts: # src/p_polyobj.c	2020-05-16 11:18:47 +02:00
MascaraSnake	ff3768f3e0	Merge branch 'udmf-next' into executordelay	2020-05-13 10:01:41 +02:00
MascaraSnake	1ccda0b85c	Merge branch 'next' into udmf-next	2020-05-13 10:01:12 +02:00
MascaraSnake	d3ec12c842	Merge branch 'udmf-next' into executordelay ... # Conflicts: # src/p_spec.c	2020-05-13 09:55:25 +02:00
Monster Iestyn	8c88c3dbb4	added missing extern keyword for ntemprecords in doomstat.h (definition is in g_game.c)	2020-05-12 18:43:49 +01:00
Monster Iestyn	064f4bcf34	added missing extern keyword for ms_RoomId in mserv.h (the definition is already in the .c file in this case)	2020-05-12 18:42:16 +01:00
Monster Iestyn	dab212dc56	turn all non-extern variables in s_sound.h into externs (and put their real definitions in the .c file)	2020-05-12 18:40:51 +01:00
Monster Iestyn	89cd756cd8	make savegamename in doomdef.h an extern, put the actual definition in d_main.c	2020-05-12 18:37:15 +01:00
Steel Titanium	feced5ec3c	Merge branch 'master' into next	2020-05-11 18:20:09 -04:00
SteelT	78fe9af56a	Merge branch 'splitscreen-titlecards-fix' into 'master' ... Fix splitscreen Title Card act name regression See merge request STJr/SRB2!934	2020-05-11 18:18:22 -04:00
SteelT	432cca7556	Merge branch 'menu-soc-bullshit-mergefix' into 'master' ... Menu soc bullshit mergefix See merge request STJr/SRB2!933	2020-05-11 18:17:59 -04:00
James R	e80f6497d7	Merge remote-tracking branch 'origin/next' into 2.2.4-prep	2020-05-11 15:01:32 -07:00
Louis-Antoine	0c4f983eb5	Fix crash with rollout rock	2020-05-11 23:48:35 +02:00
James R	a645f3a44f	Update patch.pk3 asset hash	2020-05-11 14:41:36 -07:00
James R	c52c8e0282	Update version names, SUBVERSION, MODVERSION	2020-05-11 14:41:36 -07:00
Monster Iestyn	d508d16cef	Merge branch 'master' into next	2020-05-11 20:08:02 +01:00
Zwip-Zwap Zapony	334ad93c56	Fix splitscreen Title Card act name regression ... This fixes act names not being shown on player 2's view	2020-05-11 19:57:20 +02:00
MascaraSnake	e288c9d4f2	Merge branch 'fix-simple-camera-and-eggstatue' into 'next' ... Fix Simple Camera not working with the tutorial's statue challenge See merge request STJr/SRB2!931	2020-05-11 13:31:09 -04:00
toaster	e5bc0583e5	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into fickleheart/SRB2-menu-soc-bullshit ... # Conflicts: # src/m_menu.c	2020-05-11 15:00:31 +01:00
James R	7257fc730a	Remove instances of HAVE_BLUA that actually disable Lua now	2020-05-10 19:59:56 -07:00
James R	6b4ee94e38	Use camera angle, not mobj angle, when comparing Angle Anchor	2020-05-10 19:40:28 -07:00
sphere	61dfee7e13	Don't show the FPS counter during startup.	2020-05-11 01:33:34 +02:00
Steel Titanium	fabd76a5fe	Merge branch 'next' into 2.2.3-prep	2020-05-10 17:05:56 -04:00
Monster Iestyn	49864f646e	Merge branch '2.2.3-prep' of git@git.magicalgirl.moe:STJr/SRB2.git into 2.2.3-prep	2020-05-10 20:10:11 +01:00
Monster Iestyn	197da95a23	Last minute OpenGL fix: don't check flippedness in HWR_RotateSpritePolyToAim if the mobj is actually a precipmobj! ... precipmobj_t does not have eflags, so P_MobjFlip checking it would actually be accessing memory addresses beyond the end of the struct	2020-05-10 20:09:08 +01:00
lachwright	215ff828f8	Merge branch 'master' into next	2020-05-11 01:29:10 +08:00
Lachlan Wright	357ad68599	Merge branch 'patch_music' into 'next' ... patch_music.pk3 See merge request STJr/SRB2!812	2020-05-10 12:51:49 -04:00
lachwright	b7af502ed4	Update MD5 hashes for player.dta and patch.pk3	2020-05-11 00:23:32 +08:00
Monster Iestyn	3ce4c1b789	Fix logging on Mac ... These fixes were suggested by Sveciaost on #mac-users on Discord	2020-05-10 16:47:01 +01:00
Monster Iestyn	baee6a1d57	Update version number to 2.2.3 in all the usual files, also updated MODVERSION	2020-05-10 16:02:23 +01:00
LJ Sonic	280633019a	Merge branch 'gfz3laser-mkii' into 'next' ... New Greenflower Zone 3 laser See merge request STJr/SRB2!924	2020-05-09 16:40:40 -04:00
LJ Sonic	62d5d16f5c	Merge branch 'optimise-archiving' into 'next' ... Optimise net-archiving of Lua strings, numbers and booleans See merge request STJr/SRB2!904	2020-05-09 16:40:28 -04:00
sphere	c55d6dbc9f	Make showfps save to config, and add a compact option.	2020-05-08 15:40:50 +02:00
Lachlan	426925c5fc	Play the 1-up sound when 1upsound is set to sound	2020-05-08 04:07:00 +08:00
MascaraSnake	60aa0f82f3	Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next	2020-05-07 22:00:02 +02:00
MascaraSnake	650f44566f	Fixed a typo	2020-05-07 21:59:39 +02:00
lachwright	9d21d790a4	Prevent laser sprites clipping into walls/off ledges	2020-05-08 02:58:56 +08:00
lachwright	36b400387e	Remove MF_NOBLOCKMAP from MT_LASER so Silver can find it	2020-05-07 23:24:33 +08:00
lachwright	3a1988fc01	Fix knockback scaling	2020-05-07 22:47:34 +08:00
lachwright	51a5ece294	Merge remote-tracking branch 'origin/next' into gfz3laser-mkii	2020-05-07 22:34:44 +08:00
Alam Ed Arias	24df9f032f	Merge branch 'master' into next	2020-05-06 18:36:20 -04:00
Alam Ed Arias	38232ce07e	fix build errors in public master	2020-05-06 18:35:54 -04:00
Monster Iestyn	30105621d4	Merge branch 'master' into next	2020-05-06 21:51:36 +01:00
Lachlan	05ea95d0eb	Merge branch 'next' into gfz3laser-mkii	2020-05-06 09:10:27 +08:00
lachwright	63cb58a10a	Update new GFZ3 laser	2020-05-06 09:03:03 +08:00
lachwright	92c900f284	New GFZ3 laser	2020-05-06 09:01:02 +08:00
Louis-Antoine	2d6c9a94f4	Fix compiler warning	2020-05-05 14:05:19 +02:00
MascaraSnake	5282f01a53	Fix PolyObject flags not being applied when there is no parameter line	2020-05-05 08:40:59 +02:00
MascaraSnake	df3ca712d8	Move polyobject crush option to the first line args	2020-05-04 23:27:26 +02:00