Commit graph

14498 commits

Author SHA1 Message Date
toaster
d28788786e 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
250e6d71ae Forgot to make pw_noautobrake count down........ 2019-10-28 12:54:55 +00:00
toaster
95e8ea0f8a 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
2e47b106a6 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
b948f74b4f 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:04:30 -07:00
TehRealSalt
6acf3e2337 dont overshadow 2019-10-27 21:35:27 -04:00
TehRealSalt
e2bc8a0d97 color spb icon with who threw it 2019-10-27 21:25:16 -04:00
TehRealSalt
66bef945e8 Can't do nothink 2019-10-27 21:01:27 -04:00
TehRealSalt
7676dfa713 SPB minimap proper order 2019-10-27 20:54:00 -04:00
TehRealSalt
0afc901d1f Shrinking animation 2019-10-27 20:15:27 -04:00
Sal
9ed7bf7626 Merge branch 'spb-waypoints' into 'sal-waypoints'
Fix SPB pathing + other SPB features + Sizedown item removal while we're at it

See merge request KartKrew/Kart!188
2019-10-27 19:47:07 -04:00
James R
5b90586f0d :oh: 2019-10-27 14:29:13 -07:00
James R
7431794b5c Oh right, the keywords... 2019-10-27 14:26:29 -07:00
James R
ab57df909b Fix minor unnecessary call 2019-10-27 14:25:20 -07:00
James R
b62d1ecf12 Fix compiler warnings 2019-10-27 14:23:53 -07:00
James R
aa2430f307 Use a superior strcasestr 2019-10-27 14:23:13 -07:00
James R
08ad257e17 Extend map name text matching code into a function 2019-10-27 14:23:03 -07:00
TehRealSalt
34e0b4b991 Radius was not made more coarse when I did the big-maps fix, so you were considered in every waypoint, meaning it worked exactly before I made this change in the first place
https://youtu.be/csnS0nszyuA
2019-10-27 17:18:22 -04:00
James R
658c1e82d0 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
b3f9bce439 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
TehRealSalt
54516aeee9 Don't force SPB in 1v1 2019-10-27 16:44:41 -04:00
Steel Titanium
dddf161dc9 Merge branch 'master' into update-libs 2019-10-27 16:04:56 -04:00
James R
7c0ca5bf7c Move gamedata param to cover -resetdata 2019-10-27 10:35:31 -07:00
James R
ea2adc8018 Move gamedata param to cover -resetdata 2019-10-27 10:33:40 -07:00
James R
bea18f1f1f Custom gamedata parameter 2019-10-27 10:31:17 -07:00
toaster
972b8ca733 * 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
26100abdc4 Fix char select music not playing in secrets menu 2019-10-27 13:12:36 -04:00
toaster
46d3f77c48 More consistent momentum handling for "groundpounding" shield abilities (elemental, bubble) in THZ goop. 2019-10-27 13:37:14 +00:00
toaster
8ec1ff55d9 Make player flash colorized when dashmode if not SF_MACHINE, per Sonic Advance 2. 2019-10-27 13:07:06 +00:00
TehRealSalt
d52e7a652e Faster waterskipping 2019-10-27 09:03:35 -04:00
toaster
df24e3089b * 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
4334384855 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
1f92a73135 Fix unsigned/signed comparisons. 2019-10-27 11:18:37 +00:00
Nev3r
2b33529b7c Missing ; 2019-10-27 12:03:52 +01:00
TehRealSalt
522959e762 Disable charging drift sparks in bounce pad state 2019-10-26 23:11:19 -04:00
TehRealSalt
2ddb6cd082 set starpost xyz in battle maps 2019-10-26 23:02:45 -04:00
MascaraSnake
1e822edb70 Fixed a typo in the ZB config 2019-10-26 22:56:01 +02:00
James R
502c72e975 Render title map on connecting to server screen too 2019-10-26 12:50:49 -07:00
MascaraSnake
04841768e4 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
a23cc44d93 Fix some jingle resuming behavior with boss music switching 2019-10-26 15:02:45 -04:00
MascaraSnake
1019116ede 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
2df34ef2cf 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
08bc1ea590 Fix MIDI not being disabled when non-native 2019-10-26 12:09:27 -04:00
Latapostrophe
58bed7d923 New item list + shrink destroys items 2019-10-26 17:08:22 +02:00
Latapostrophe
55c2fe31be SPB on floor 2019-10-26 13:27:43 +02:00
lachwright
9401241d6d Merge branch 'master' into metalstuff 2019-10-26 16:07:59 +08:00
MascaraSnake
e60821962b 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
b2190da52b Merge branch 'master' into knuxstuff 2019-10-26 08:09:13 +02:00
James R
8cb348424a Differing signedness comparison 2019-10-25 21:44:34 -07:00
James R
ac3e90b9a0 I say damn you massive initializer! 2019-10-25 21:36:10 -07:00