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
James R
fb9421893e
:oh:
2019-10-27 14:29:13 -07:00
James R
a00dfcf420
Oh right, the keywords...
2019-10-27 14:26:29 -07:00
James R
f0e19d1597
Fix minor unnecessary call
2019-10-27 14:25:20 -07:00
James R
56ee233b08
Fix compiler warnings
2019-10-27 14:23:53 -07:00
James R
7bf819f5af
Use a superior strcasestr
2019-10-27 14:23:13 -07:00
James R
70df5242a3
Extend map name text matching code into a function
2019-10-27 14:23:03 -07:00
James R
bb65e8d72f
Add support for custom keywords
...
For now, 32 characters separated by spaces.
Also fixed a SIGSEGV from an empty level title.
2019-10-27 14:10:26 -07:00
James R
6358d839ee
Overhaul the map command
...
Added support for map names, matched by substring and keywords too!
Added support for two digit MAP codes without the MAP part.
Added support for decimal map number. (But who cares.)
Gave a better description of command.
Supported abbreviated optional parameters.
And now REALLY detects incorrect parameters.
2019-10-27 14:02:36 -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
9e8733be42
Make player flash colorized when dashmode if not SF_MACHINE, per Sonic Advance 2.
2019-10-27 13:07:06 +00:00
toaster
fa187a66e2
* Disable dashmode if pw_carry is set or the player is exiting, in addition to getting the flag.
...
* Add a dashmode downpower sound.
2019-10-27 13:02:07 +00:00
toaster
0c52de7a29
Fix bot showing up in NiGHTS stages with a two-pronged approach.
...
* Sometimes, D_MapChange is passed a mapnum of -1, to complete an existing mapchange. Don't handle botingame checks when that happens.
* Disable charsel on secret level platter when selected map is a NiGHTS stage, since gameplay will be identical across characters (consistent with NiGHTS Attack).
Also:
* Replace IT_DYBIGSPACE hack in M_SetupChoosePlayer, and replace with a more direct workaround system for not being able to select characters before warping.
2019-10-27 12:20:17 +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
James R
b6e145f0c5
Render title map on connecting to server screen too
2019-10-26 12:50:49 -07: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
mazmazz
91eb380412
Fix some jingle resuming behavior with boss music switching
2019-10-26 15:02:45 -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
James R
64e7708832
I say damn you massive initializer!
2019-10-25 21:36:10 -07:00
mazmazz
c7c72a4892
Merge branch 'master' into new-title
2019-10-25 22:29:29 -04:00
mazmazz
8a8e91914b
Merge remote-tracking branch 'origin/new-title' into new-title
2019-10-25 22:28:31 -04:00
lachwright
6c9ad67c84
Fix pointer typo (whoops)
2019-10-26 08:34:38 +08:00
lachwright
aa34f74f75
Remove imtermediary state transitions
2019-10-26 08:32:36 +08:00
lachwright
ca768b044d
Merge branch 'master' into metalstuff
2019-10-26 08:30:37 +08:00
lachwright
63d24d529a
Merge branch 'master' into knuxstuff
2019-10-26 05:53:49 +08:00
MascaraSnake
03c5b70fc5
Merge branch 'newmenus' into 'master'
...
Better looking menus, nametags and much more. (Resolves #245 and #244 and #252 )
Closes #245 , #244 , and #252
See merge request STJr/SRB2Internal!389
2019-10-25 17:46:16 -04:00
