lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7,516 Commits 1 Branch 29 Tags 122 MiB
Commit Graph

7516 Commits

Author SHA1 Message Date
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
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
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
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
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
James R 2078b47952 Move gamedata param to cover -resetdata 2019-10-27 10:33:40 -07:00
James R 4ac136f626 Custom gamedata parameter 2019-10-27 10:31:17 -07:00
toaster df785e1651 * Add alternate numerical drawer for continues on Intermission screen if there's > 5. 
* Tweak offsets on Continue screen numerical continue drawer to match.
 2019-10-27 17:20:43 +00:00
mazmazz 23c6011348 Fix char select music not playing in secrets menu 2019-10-27 13:12:36 -04:00
toaster 2439b2cb32 More consistent momentum handling for "groundpounding" shield abilities (elemental, bubble) in THZ goop. 2019-10-27 13:37:14 +00:00
toaster c221a89c67 Fix unsigned/signed comparisons. 2019-10-27 11:18:37 +00:00
Nev3r a58c794691 Missing ; 2019-10-27 12:03:52 +01:00
MascaraSnake 336c5cc61d Fixed a typo in the ZB config 2019-10-26 22:56:01 +02:00
MascaraSnake 801e83aef6 Merge branch 'use-zones-pk3' into 'master' 
Use zones.pk3 instead of zones.dta.

See merge request STJr/SRB2Internal!352
 2019-10-26 15:33:13 -04:00
MascaraSnake 9e9e6a8f8f Merge branch 'metalstuff' into 'master' 
Metal Sonic's jet fume

See merge request STJr/SRB2Internal!413
 2019-10-26 14:52:04 -04:00
MascaraSnake b6905f2733 Merge branch 'midi-toggle-fix' into 'master' 
Fix MIDI not being disabled when non-native

See merge request STJr/SRB2Internal!414
 2019-10-26 14:46:25 -04:00
mazmazz 26cb75e961 Fix MIDI not being disabled when non-native 2019-10-26 12:09:27 -04:00
lachwright e89948ce71 Merge branch 'master' into metalstuff 2019-10-26 16:07:59 +08:00
MascaraSnake be5da92a8d Merge branch 'knuxstuff' into 'master' 
Knuckles gameplay changes and/or improvements

See merge request STJr/SRB2Internal!354
 2019-10-26 02:41:40 -04:00
MascaraSnake 92be187731 Merge branch 'master' into knuxstuff 2019-10-26 08:09:13 +02:00
James R 634292a5fc Differing signedness comparison 2019-10-25 21:44:34 -07:00