Commit graph

7046 commits

Author SHA1 Message Date
lachwright
77776e5fe8 Don't let Knuckles play the landing animation unless in fall state 2019-10-28 22:13:34 +08:00
lachwright
3a97e7b807 Slow glide down underwater 2019-10-28 21:30:36 +08:00
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
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
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
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
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
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
mazmazz
08bc1ea590 Fix MIDI not being disabled when non-native 2019-10-26 12:09:27 -04:00
lachwright
9401241d6d Merge branch 'master' into metalstuff 2019-10-26 16:07:59 +08: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
mazmazz
31d7254d14 Merge branch 'master' into new-title 2019-10-25 22:29:29 -04:00
lachwright
b3dab79f7c Fix pointer typo (whoops) 2019-10-26 08:34:38 +08:00
lachwright
8958355e22 Remove imtermediary state transitions 2019-10-26 08:32:36 +08:00
lachwright
fa206f7411 Merge branch 'master' into metalstuff 2019-10-26 08:30:37 +08:00
lachwright
4835d26c8b Merge branch 'master' into knuxstuff 2019-10-26 05:53:49 +08:00
MascaraSnake
0073310c39 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
MascaraSnake
9574f8ac78 Merge branch 'object_tweaks' into 'master'
Object tweaks (object_tweaks division 3)

See merge request STJr/SRB2Internal!394
2019-10-25 17:45:48 -04:00
MascaraSnake
b0136da8b6 Merge branch 'linedef-153' into 'master'
Dynamic Sinking Platform (for Red Volcano Zone)

See merge request STJr/SRB2Internal!401
2019-10-25 16:56:19 -04:00
MascaraSnake
3232c5dc25 Some basic code hygiene: Remove references to the air bob code being "old" or "outdated" 2019-10-25 22:55:10 +02:00
MascaraSnake
24ede2cfc9 Merge branch 'hammer-landing' into 'master'
Twinspin landing option

See merge request STJr/SRB2Internal!402
2019-10-25 16:39:02 -04:00
MascaraSnake
6c45b44070 Merge branch 'lua-allow-player' into 'master'
Allow access to players userdata outside levels.

See merge request STJr/SRB2Internal!386
2019-10-25 15:40:31 -04:00
MascaraSnake
a039814673 Merge branch 'set-name-on-join' into 'master'
Set the player's name as soon as they enter the game

See merge request STJr/SRB2Internal!397
2019-10-25 15:38:21 -04:00
MascaraSnake
f5f21db2f4 Merge branch 'window-focus-music' into 'master'
Window focus options for playing sounds/music

See merge request STJr/SRB2Internal!407
2019-10-25 15:37:06 -04:00
MascaraSnake
2004577314 Merge branch 'james-kart' into 'master'
My changes to Kart

See merge request STJr/SRB2Internal!406
2019-10-25 15:36:40 -04:00
MascaraSnake
92faebafc9 Merge branch 'kartport_misc-changes' into 'master'
Kart ports: misc changes

See merge request STJr/SRB2Internal!380
2019-10-25 15:33:30 -04:00
MascaraSnake
7c9c2553b2 Merge branch 'kartport_namedvalues' into 'master'
Kart-port - Named cvar values + Improved "HELP" command (round 3)

See merge request STJr/SRB2Internal!388
2019-10-25 15:32:56 -04:00
toaster
0842d1f328 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into object_tweaks
# Conflicts:
#	extras/conf/SRB2-22.cfg
2019-10-25 20:32:15 +01:00