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
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
MascaraSnake
1e822edb70
Fixed a typo in the ZB config
2019-10-26 22:56:01 +02: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
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
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
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
MascaraSnake
c8cfe08144
Merge branch 'mi-tinkers-with-lua-again' into 'master'
...
MI tinkers with lua again
See merge request STJr/SRB2Internal!392
2019-10-25 15:27:55 -04:00
MascaraSnake
a6b3491922
Merge branch 'intangible-flats-tangible-sides' into 'master'
...
Collide with walls of FOF if both planes are intangible
See merge request STJr/SRB2Internal!385
2019-10-25 15:26:54 -04:00
MascaraSnake
13edddc735
Merge branch 'be-more-nice-with-levelselect-mp' into 'master'
...
Remove level select restrictions in DEVELOP Multiplayer
Closes #238
See merge request STJr/SRB2Internal!399
2019-10-25 15:26:09 -04:00
MascaraSnake
e8b788918f
Merge branch 'walltransfermove' into 'master'
...
Let players move after spinning off a wall transfer
See merge request STJr/SRB2Internal!412
2019-10-25 15:20:20 -04:00
MascaraSnake
604198280e
Merge branch 'superminecarts' into 'master'
...
Super and Minecarts fixes (resolves #259 )
Closes #259
See merge request STJr/SRB2Internal!408
2019-10-25 15:19:47 -04:00
MascaraSnake
bd51ac8a70
Merge branch 'nonightsbot' into 'master'
...
Disable tailsbot in NiGHTS maps (resolves #261 )
Closes #261
See merge request STJr/SRB2Internal!409
2019-10-25 15:19:05 -04:00
MascaraSnake
4469294972
Merge branch 'cezfangcheat' into 'master'
...
CEZ3 Fang cheat fix (resolves #262 )
Closes #262
See merge request STJr/SRB2Internal!410
2019-10-25 15:18:16 -04:00
MascaraSnake
2e0af9ebf0
Merge branch 'waterlighting' into 'master'
...
Water lighting reversion (resolves #188 for now)
Closes #188
See merge request STJr/SRB2Internal!411
2019-10-25 15:17:35 -04:00
MascaraSnake
2cc74fc819
...and also rename the palm tree leaves accordingly
2019-10-25 20:48:51 +02:00
MascaraSnake
6c45a17601
Removed palm tree trunks from the ZB config. They no longer exist as mapthings.
2019-10-25 20:17:50 +02:00
lachwright
69692d6088
Don't fuck nojumpspin characters who are capable of rolling
2019-10-25 18:51:41 +08:00
lachwright
c970d7c100
Put player in jump state after spinning during a wall transfer
2019-10-25 18:48:40 +08:00
toaster
8de96771e2
Move INLEVEL macros for mobj_get and mobj_set to prevent mixed code/declaration errors.
2019-10-24 21:14:51 +01:00
toaster
58d4fce2bc
I can't figure out how to make this consistent at all, so in order to have the water look good in levels designed for it, I think it's necessary to effectively revert everything with SHITPLANESPARENCY to a roughly 2.1-equivalent behaviour.
2019-10-24 20:40:03 +01:00
toaster
f80453fd5b
Added an experiment with an alternate CEZ3 pinch behaviour (but keep it disabled because it was kind of boring).
2019-10-24 19:55:02 +01:00
toaster
930be3dad2
Fix CEZ3's first phase being cheated by Fang.
2019-10-24 19:33:03 +01:00
toaster
1305c1cde8
Disable tailsbot in NiGHTS maps, not just Special Stages. ( Resolves #261 )
2019-10-24 19:16:53 +01:00