lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
3940 commits 1 branch 29 tags 122 MiB
Commit graph

3940 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz b28183129f NiGHTS drill meter penalty when mashing jump button 
Thanks Inuyasha (KS) for code
 2018-08-09 22:15:13 -04:00
mazmazz bf74b81842 Snappier NiGHTS pickup attraction 
* Old attraction is still used for non-NiGHTS players due to a momentum bug. The old way is good enough to sidestep the bug.
* Thanks Inuyasha (KS) for original code 🐶
 2018-08-09 21:24:01 -04:00
MascaraSnake 21cb0cab3c Reorganized the thing type numbers 2018-08-03 23:58:11 +02:00
Monster Iestyn 83d87c343b Fix Cacolantern's preparing sound being played everywhere across the map 
(or, in other words, fixing this to be the same as the equivalent state in the original SOC)
 2018-08-02 16:15:30 +01:00
Monster Iestyn b5ec286667 Merge branch 'master' into hardcoding-time-again 2018-08-02 16:04:54 +01:00
Monster Iestyn be5d0406bd Merge branch 'public_next' 
# Conflicts:
#	src/hardware/hw_md2.c
 2018-07-31 19:41:54 +01:00
Monster Iestyn 74646052b0 Merge branch 'master' into next 2018-07-31 19:36:30 +01:00
Monster Iestyn 485d990949 Merge branch 'gme-lowvolume-fix' into 'master' 
GME low volume fix

See merge request STJr/SRB2!248
 2018-07-31 14:35:32 -04:00
Monster Iestyn 16999b7080 Merge branch 'gme-pause' into 'master' 
Fix pausing on gme

See merge request STJr/SRB2!251
 2018-07-31 14:33:56 -04:00
Steel Titanium c02ee9a502 Re-did this fix. 2018-07-28 01:58:25 -04:00
Alam Ed Arias 79e4c3760a Merge branch 'master' into next 2018-07-20 17:35:53 -04:00
Alam Ed Arias 1ee7eda0ad Fixup PROFILEMODE 2018-07-20 17:35:18 -04:00
Monster Iestyn a06ef26149 Merge branch 'master' into next 2018-07-11 21:37:23 +01:00
Monster Iestyn 8e19611033 Merge branch 'opengl-fof-lowerunpegged' into 'master' 
OpenGL: FOF walls + Lower unpegged

See merge request STJr/SRB2!258
 2018-07-11 16:36:26 -04:00
Monster Iestyn 09ae0aae53 Merge branch 'master' into next 2018-07-11 21:18:39 +01:00
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
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