4032 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Monster Iestyn	c127ea3ceb	Merge branch 'opengl-projectsprite-fix' into 'master' ... OpenGL HWR_ProjectSprite fix See merge request STJr/SRB2!255	2018-07-11 16:15:42 -04:00
Monster Iestyn	2cd2b6bf10	Backport Kart Krew's fix for the 1px HOM with horizon lines	2018-07-08 22:30:37 +01:00
colette	0a931a1364	Update f_finale.c	2018-07-07 20:20:46 -04:00
Alam Ed Arias	17570c1ad6	Merge branch 'master' into next	2018-07-07 16:42:50 -04:00
Alam Arias	a79b9a9127	Update m_misc.c	2018-07-07 20:41:11 +00:00
Alam Arias	7da6aca450	Update m_misc.c	2018-07-07 20:33:19 +00:00
Monster Iestyn	f1bba60373	Merge branch 'md2-fopen-error' into 'master' ... More helpful error messages See merge request STJr/SRB2!243	2018-07-06 14:38:59 -04:00
Monster Iestyn	130de10f97	Merge branch 'md2-smoother-interpolation' into 'master' ... Smoother MD2 interpolation See merge request STJr/SRB2!224	2018-07-06 14:38:37 -04:00
MonsterIestyn	3e9103bec2	Merge pull request #252 from GoldenTails/patch-1 ... Fixed MD2 models not loading correctly on Linux	2018-07-06 19:12:21 +01:00
GoldenTails	761a221840	Merge remote-tracking branch 'STJrSRB2/master' into patch-1	2018-07-05 16:44:34 -05:00
Monster Iestyn	e5236c3137	Merge branch 'master' into next	2018-07-05 21:09:39 +01:00
Monster Iestyn	8c56e39c18	Merge branch 'lua-exploit-fix' into 'master' ... Lua exploit fix See merge request STJr/SRB2!259	2018-07-05 16:08:08 -04:00
MonsterIestyn	d77ba1dab6	Merge pull request #264 from LJSonik/password-security-fix ... Disable admin password by default	2018-07-05 20:16:19 +01:00
LJSonik	3b39b3b7c8	Merge branch 'master' into password-security-fix	2018-07-05 20:58:00 +02:00
MonsterIestyn	51c6e8d84c	Merge pull request #232 from LJSonik/minor-net-command-fixes ... Minor net command fixes	2018-07-05 19:56:17 +01:00
LJSonik	bd6373bc86	Merge branch 'master' into minor-net-command-fixes	2018-07-05 20:00:38 +02:00
LJSonik	8e3c3a6f65	Merge branch 'master' into password-security-fix	2018-07-05 19:46:36 +02:00
Steel Titanium	c8d0eb04f4	Merge remote-tracking branch 'upstream/master' into md2-smoother-interpolation	2018-07-05 01:23:56 -04:00
Steel Titanium	c61035571b	Merge remote-tracking branch 'upstream/master' into md2-fopen-error	2018-07-05 01:21:09 -04:00
Steel Titanium	46aa4c3503	Merge remote-tracking branch 'upstream/master' into gme-lowvolume-fix	2018-07-05 01:20:32 -04:00
Steel Titanium	8aee862ff8	Merge remote-tracking branch 'upstream/master' into gme-pause	2018-07-05 01:16:43 -04:00
Monster Iestyn	82d953bbc2	Fixed the Lua crash exploit.	2018-07-04 20:15:36 +01:00
Monster Iestyn	dfb5f06d7e	fix compiler errors (shadowed vars, comparisons between unsigned + signed, an unused function arg, and a non-static function with no prototype)	2018-07-02 21:03:04 +01:00
Monster Iestyn	bcffe61277	remove MF_RUNSPAWNFUNC from MT_CACOLANTERN	2018-07-02 20:35:39 +01:00
Monster Iestyn	c045e8cf8d	Since there is only one type of the old spikeball that doesn't rotate, there is no point using A_RotateSpikeBall in its states anymore. ... Likewise, A_RotateSpikeBall no longer has to care about the object type of the actor, for the same reason.	2018-07-01 22:01:00 +01:00
Monster Iestyn	daa87947a4	huh, no wonder the two FHZ ice types looked the same in objectplace; they were using the same spawnstate it seems	2018-07-01 19:47:26 +01:00
Monster Iestyn	76c8d30ed2	Fix special stage map end var defaults to use the correct map numbers	2018-06-30 18:14:04 +01:00
Monster Iestyn	80d6253eec	Don't re-enable MD5 checks yet, we're not even near RC phase yet	2018-06-30 18:09:39 +01:00
Monster Iestyn	25cd61c094	Merge branch 'master' into next	2018-06-27 15:06:12 +01:00
Monster Iestyn	03e2a2b445	Merge branch 'mp-menu-playername-fix' into 'master' ... Multiplayer menu playername fix See merge request STJr/SRB2!256	2018-06-27 10:01:39 -04:00
Monster Iestyn	d8a86a8d74	Fix OpenGL completely missing the ability to alter FOF wall pegging by lower unpegged flag. Stupid OpenGL. ... Sorry in advance Lat'!	2018-06-26 21:41:05 +01:00
Monster Iestyn	415c095274	fix the multiplayer menu not allowing the full max length for player names unlike the "name" console command	2018-06-26 17:46:04 +01:00
Monster Iestyn	aed30519d4	Fix HWR_ProjectSprite to check properly whether the displayed player's mobj or its subsector exists, to avoid a crash when checking for fake planes. (also use viewplayer since its available to use, silly hardware code) ... Also tweaked a weird splitscreen check in HWR_DrawSpriteShadow; still investigating whether stplyr is ever not player 2 when it's player 2's view, but this looks better for now	2018-06-23 18:47:32 +01:00
Monster Iestyn	b74c01b38f	Merge branch 'precipmobj-fix' into 'master' ... Add sprite2 to precipmobj_t See merge request STJr/SRB2Internal!150	2018-06-20 08:25:40 -04:00
MascaraSnake	a601cacfff	Added sprite2 to precipmobj_t	2018-06-20 14:04:49 +02:00
toaster	1ffa45f875	Rework software coronas a bit, apply them to the flame and flame holder too, and spawn them only if MTF_EXTRA is given.	2018-06-19 23:16:49 +01:00
toaster	2ab1d91ec9	* Fix nextstate, radius, and painchance of fire torch decoration. ... * Fix waving flag object type's... flags. *womp womp*	2018-06-19 21:58:49 +01:00
Monster Iestyn	fe6b47dc00	Merge branch 'master' into leveltitle-tinkering ... # Conflicts: # src/hu_stuff.h # src/st_stuff.c	2018-06-14 21:26:44 +01:00
toaster	37e1fae07d	Fixing dehacked.c consistency.	2018-06-13 18:10:32 +01:00
toaster	7f86e147f3	Fix the starposts not being cleared properly.	2018-06-12 02:26:42 +01:00
toaster	a56811cb0d	Fix all the Floral Fieldsing pv2 discovered.	2018-06-12 01:08:03 +01:00
toaster	1bd963db7a	Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into hardcoding-time-again	2018-06-12 00:57:21 +01:00
Monster Iestyn	75d2073307	Do the usual hack for loading a lump from a map WAD in a pk3, but this time for P_LoadThingsOnly	2018-06-11 20:23:00 +01:00
Monster Iestyn	e39bbab532	Merge branch 'public_flatsprite' ... # Conflicts: # src/hardware/hw_main.c # src/r_things.c	2018-06-11 19:53:16 +01:00
Monster Iestyn	5f09f60856	Merge branch 'public_flatsprite' into 'public_flatsprite' ... OpenGL: Paper Sprites: The Thousands of Bugs See merge request STJr/SRB2!253	2018-06-11 14:46:51 -04:00
Sryder	672ca12550	Merge branch 'public_flatsprite' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite	2018-06-11 19:40:35 +01:00
Monster Iestyn	54e92a96b3	backport fix to L/R sprite loading code from internal ... basically we don't want L/R sprites to always be flipped, for obvious reasons	2018-06-11 19:36:47 +01:00
toaster	934c178941	Remove unpopular exitlevel limitation.	2018-06-10 20:02:34 +01:00
Sryder	ea915e5778	Fix papersprites more for real this time ... (Seperate AL and AR sprites were broken, I figured out I was a dunce, oh noey)	2018-06-09 22:58:03 +01:00
toaster	c5ab2ffa11	At FF and Sphere's suggestion, make the ring hoops work natively in normal stages and require more replacing for special stage conversion purposes.	2018-06-09 21:42:37 +01:00