Commit graph

7537 commits

Author SHA1 Message Date
James R ed94549a37 Whitespace 2019-11-07 14:15:57 -08:00
James R 872e662618 That's a lot of whitespace 2019-11-07 13:42:54 -08:00
James R fff38da832 var2 unused, so remove it; signcolor can be unset 2019-11-07 13:05:50 -08:00
James R be7dcccb71 Declarations after Lua calls 2019-11-07 13:02:33 -08:00
toaster f11fc92fd7 Fix pmomz being set to 0 in the wrong place. (P_PlayerAfterThink is after every moving sector has changed its height, while P_MovePlayer is before it...) 2019-11-07 17:10:59 +00:00
toaster d2c6d6ad73 Prevent infinite lives rollover to extremely negative numbers. (Discovered while messing around with pandora's box recently.) 2019-11-07 14:06:27 +00:00
lachwright c43551384d Reduce RVZ particle spawns when no players are in proximity 2019-11-07 16:00:44 +08:00
Jaime Passos 6d024b7124 I guess I'll have to do at least SOMETHING about OpenGL 2019-11-05 17:35:16 -03:00
Jaime Passos ed967f077c Restore the last gameplay frame while on the intermission screen 2019-11-05 17:04:57 -03:00
lachwright cf39e181bb Display Eggman more frequently during skin roulette 2019-11-05 01:33:09 +08:00
lachwright eb6d3b3dbe Improve A_SignSpin 2019-11-04 23:10:13 +08:00
toaster ef886e4b80 Fix TC_DASHMODE and associated not being applied in GL. (Won't conflict with md3 branch because these lines weren't modified there!) 2019-11-04 13:11:04 +00:00
lachwright 5e03d40b33 New end-of-level signpost logic 2019-11-04 16:28:44 +08:00
mazmazz 43fff92c82 Alacroix: Fix our heroes' arms disappearing due to dropped frames 2019-11-04 02:43:48 -05:00
Steel Titanium 16c107e2ac
Fix garbage string being drawn on record attack menu
Pretty silly of me to assume it would be NUL-terminated by default.
2019-11-03 21:43:09 -05:00
mazmazz d268582315 Frame 4 typos 2019-11-03 19:53:05 -05:00
mazmazz cb6bc67944 Alacroix title: Give Tails his back tails 2019-11-03 18:38:09 -05:00
mazmazz 05ac1a1a21 Alacroix gfx optimization; dynamic loading/unloading of title gfx resolutions 2019-11-03 16:21:21 -05:00
mazmazz 82b65c87b8 Alacroix title screen character frames 2019-11-03 10:34:12 -05:00
mazmazz 42835905ef Load Alacroix character frames 2019-11-03 06:30:27 -05:00
mazmazz 96a80c51d3 TTMODE_USER logic 2019-11-02 21:51:45 -04:00
mazmazz 6db58bc2bf Alacroix title animation adjustments 2019-11-02 21:05:01 -04:00
mazmazz 067ef42e37 SNTX -> SONT 2019-11-02 13:30:03 -04:00
mazmazz fc02b73534 Remove TTCOUNTERSET to simplify custom title SOC 2019-11-02 12:40:12 -04:00
mazmazz 1ebcdb5344 Multi-res title screen gfx 2019-11-02 12:12:36 -04:00
mazmazz 0c1b5f07f0 Merge remote-tracking branch 'origin/master' into new-title 2019-11-01 21:06:46 -04:00
toaster 126fc44d6e Change sounds, after discussing with Lach. 2019-10-30 17:37:42 +00:00
toaster 67a99f6334 ACTUALLY applied colorized flashing for dashmode to non-SF_MACHINE players, which wasn't happening for non-transparent players because :VVV 2019-10-30 17:16:44 +00:00
Steel Titanium 96aa11c825 Merge branch 'revert-eda30fc9' into 'master'
Revert "Revert "Merge branch 'revert-973ad693' into 'master'""

See merge request STJr/SRB2Internal!435
2019-10-30 06:11:33 -04:00
Steel Titanium 0df7691d30 Revert "Revert "Merge branch 'revert-973ad693' into 'master'""
This reverts commit eda30fc995
2019-10-30 10:09:54 +00:00
Steel Titanium eda30fc995 Revert "Merge branch 'revert-973ad693' into 'master'"
This reverts merge request !434
2019-10-30 09:59:02 +00:00
Steel Titanium 9bd9df6726 Merge branch 'revert-973ad693' into 'master'
Revert "Merge branch 'update-libs' into 'master'"

See merge request STJr/SRB2Internal!434
2019-10-30 05:09:22 -04:00
Steel Titanium 76457663f0 Revert "Merge branch 'update-libs' into 'master'"
This reverts merge request !433
2019-10-30 09:07:56 +00:00
Steel Titanium 973ad6930d Merge branch 'update-libs' into 'master'
Update various of libraries

See merge request STJr/SRB2Internal!433
2019-10-30 05:01:18 -04:00
Jaime Passos 5464b6ab28 Use doomtype.h types instead of libpng types 2019-10-29 00:15:33 -03:00
Steel Titanium 64e07ac954
Update SDL2 to 2.0.10 2019-10-28 22:48:19 -04:00
Jaime Passos 0a49340ae1 Fix warnings when NOPNG=1 2019-10-28 23:46:33 -03:00
Louis-Antoine e91bf1a32e Fix some intro fades displaying text in all-caps 2019-10-28 16:10:22 +01:00
lachwright 8824cd64fd Merge branch 'master' into knuxstuff 2019-10-28 22:25:32 +08:00
lachwright 46ba988541 Slow climbing down underwater 2019-10-28 22:21:20 +08:00
toaster ce91bdaaab Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into dashmodecut 2019-10-28 14:19:25 +00:00
toaster 9a160823aa Replace the s3k sound used when starting dashmode with the Sonic CD equivalent, which among other things is more appropriate AND isn't used for anything unrelated so can have a more appropriate caption 2019-10-28 14:19:07 +00:00
lachwright b93c2467e7 Don't let Knuckles play the landing animation unless in fall state 2019-10-28 22:13:34 +08:00
toaster 97dd22e0e9 Merge branch 'noautobrakefix' into 'master'
Forgot to make pw_noautobrake count down........

See merge request STJr/SRB2Internal!427
2019-10-28 10:08:53 -04:00
lachwright 1306b2bbc5 Slow glide down underwater 2019-10-28 21:30:36 +08:00
toaster d9196485f6 Oh, this is why. pw_pushing was decremented twice each tic, because I copypasted it and then forgot to adjust it to say pw_noautobrake... 2019-10-28 13:01:15 +00:00
toaster 17dde0d91c Forgot to make pw_noautobrake count down........ 2019-10-28 12:54:55 +00:00
toaster 22649f698e Fix map_cons_t[] not having a null terminator, which should hopefully allow Lach to actually start their builds up on Mac again. 2019-10-28 11:34:20 +00:00
James R 33816e49ca Add overflow checks so we I_Error instead of death crash into oblivion
You'd love to know how we even reached (size_t)-1.
2019-10-28 00:40:25 -07:00
Steel Titanium 95a2ef4021
Merge branch 'master' into update-libs 2019-10-27 16:04:56 -04:00