359d8a2c25
Optimizations from LJ and generic functions
2019-11-13 14:26:28 -08:00
c9aad2d186
Warn if the first argument is an option
2019-11-12 18:29:42 -08:00
46fbed8b71
Get map name from multiple arguments
...
(This means you don't need quoting.)
2019-11-12 17:42:54 -08:00
5fd6561d46
So you don't like macros?
2019-11-12 16:10:00 -08:00
fb9421893e
:oh:
2019-10-27 14:29:13 -07:00
a00dfcf420
Oh right, the keywords...
2019-10-27 14:26:29 -07:00
f0e19d1597
Fix minor unnecessary call
2019-10-27 14:25:20 -07:00
56ee233b08
Fix compiler warnings
2019-10-27 14:23:53 -07:00
7bf819f5af
Use a superior strcasestr
2019-10-27 14:23:13 -07:00
70df5242a3
Extend map name text matching code into a function
2019-10-27 14:23:03 -07:00
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
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
c221a89c67
Fix unsigned/signed comparisons.
2019-10-27 11:18:37 +00:00
a58c794691
Missing ;
2019-10-27 12:03:52 +01:00
336c5cc61d
Fixed a typo in the ZB config
2019-10-26 22:56:01 +02:00
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
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
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
26cb75e961
Fix MIDI not being disabled when non-native
2019-10-26 12:09:27 -04:00
e89948ce71
Merge branch 'master' into metalstuff
2019-10-26 16:07:59 +08:00
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
92be187731
Merge branch 'master' into knuxstuff
2019-10-26 08:09:13 +02:00
634292a5fc
Differing signedness comparison
2019-10-25 21:44:34 -07:00
64e7708832
I say damn you massive initializer!
2019-10-25 21:36:10 -07:00
6c9ad67c84
Fix pointer typo (whoops)
2019-10-26 08:34:38 +08:00
aa34f74f75
Remove imtermediary state transitions
2019-10-26 08:32:36 +08:00
ca768b044d
Merge branch 'master' into metalstuff
2019-10-26 08:30:37 +08:00
63d24d529a
Merge branch 'master' into knuxstuff
2019-10-26 05:53:49 +08:00
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
4d022046fa
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
1c1fefe25f
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
46d105dd53
Some basic code hygiene: Remove references to the air bob code being "old" or "outdated"
2019-10-25 22:55:10 +02:00
2118b0e613
Merge branch 'hammer-landing' into 'master'
...
Twinspin landing option
See merge request STJr/SRB2Internal!402
2019-10-25 16:39:02 -04:00
faf61912a6
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
7d69409cf7
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
4a9eb387f7
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
2a8e5b7bff
Merge branch 'james-kart' into 'master'
...
My changes to Kart
See merge request STJr/SRB2Internal!406
2019-10-25 15:36:40 -04:00
f1a7a3b4de
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
ff061fb813
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
f2596ab0bb
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
403d698724
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
d7480f20fa
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
080ff854b8
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
829706a090
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
5a28c03a26
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
2ee42c498b
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
7a09a8bd3a
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
6c60a67a4f
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
53ac815334
...and also rename the palm tree leaves accordingly
2019-10-25 20:48:51 +02:00
863101824a
Removed palm tree trunks from the ZB config. They no longer exist as mapthings.
2019-10-25 20:17:50 +02:00
James R