ea28304d8c
Fix missing "RINGSNUMTICS" in dehacked.c
...
This fixes 16/20 of the HUD items in dehacked.c being off by one
(Same case as the MFE_ flags thing)
Also fixes dehacked.c mentioning "LAPS", which doesn't exist
2020-01-26 10:53:37 +01:00
cdc3386d48
Fix missing constant
2020-01-18 12:10:48 -03:00
999094f2f6
backwards compat
2020-01-17 16:11:17 -03:00
7adc108a2a
typoe
2020-01-17 00:34:31 -03:00
f93ddc3f37
Merge branch 'keywords-back-again' into 'next'
...
Level header keywords
See merge request STJr/SRB2!656
2020-01-16 20:05:24 -05:00
1be648578f
Merge branch 'clear-sign-sprite' into 'next'
...
Add generic signpost sprite for skins that don't have one
See merge request STJr/SRB2!626
2020-01-16 19:57:54 -05:00
407b00b22b
Merge branch 'showconditionset' into 'next'
...
Showconditionset
See merge request STJr/SRB2!651
2020-01-10 15:59:37 -05:00
3e3cb48feb
This is stupid
2020-01-09 12:15:26 -03:00
735289502c
Call it KEYWORDS
2020-01-08 14:41:38 -08:00
74364b84f9
Revert "Oh right, the keywords..."
...
This reverts commit a00dfcf420
2020-01-08 14:26:47 -08:00
3b90571987
Merge branch 'local-lua-commands' into 'next'
...
Local Lua commands + no magic numbers
See merge request STJr/SRB2!602
2020-01-08 16:14:30 -05:00
377194b077
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into showconditionset
...
# Conflicts:
# src/m_menu.c
2020-01-08 20:00:50 +00:00
01b8bd21cc
Dashmode tweaks:
...
- Remove the ability for non-SF_MACHINE players in dashmode to break spikes and monitors
- Replace instances of dashmode magic numbers with dashmode constants
- Add dashmode constants to dehacked.c
2020-01-07 15:38:48 +08:00
5ce1695047
Merge branch 'next' into clear-sign-sprite
2020-01-04 14:50:17 +08:00
a26c5f5428
Merge branch 'master' into next
2020-01-03 14:56:37 -05:00
da226139f1
Add generic signpost sprite for skins that don't have one
2020-01-03 13:12:18 +08:00
5bde4df439
Grab mouse again when closing menu, unpausing, etc
2020-01-02 00:45:28 +01:00
e3fcd860de
Merge remote-tracking branch 'origin/next' into local-lua-commands
2019-12-30 15:08:34 -08:00
181a366d4a
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
2019-12-30 18:39:31 -03:00
fc8c0f8a9a
Merge remote-tracking branch 'origin/master' into next
2019-12-30 13:16:53 -08:00
7676f11112
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
2019-12-30 12:09:45 -03:00
802ef0aba1
COM_LOCAL makes your commands NetXCmd free, FUCK NetXCmd
2019-12-29 21:07:28 -08:00
dc757f3086
Fuck magic numbers; COM_ flags for Lua commands!
2019-12-29 21:00:38 -08:00
0237dc8ca2
Add MFE_TOUCHLAVA and MFE_TRACERANGLE to Lua and SOC
2019-12-28 17:52:22 -08:00
2166571920
Add GTR_CUTSCENES. And I ran out of rule slots. Cool.
2019-12-28 20:33:28 -03:00
ae0acfba0f
Organise gametype ruleset again.
2019-12-28 20:18:21 -03:00
7a00b3a331
Add GTR_FRIENDLY.
2019-12-28 19:56:18 -03:00
45af6d8899
Rename GTR_MATCHEMERALDS to GTR_POWERSTONES.
2019-12-28 19:49:34 -03:00
4b604328d5
Rename GTR_HIDETIME to GTR_STARTCOUNTDOWN.
2019-12-28 19:47:03 -03:00
51404130af
Respawn delay gametype rule
2019-12-27 01:44:27 -03:00
cb29a9dd0a
CV_NOLUA for when a cvar should not be changed via Lua
2019-12-26 18:15:19 -08:00
c0390f5186
Merge remote-tracking branch 'origin/next' into rotsprite2
2019-12-26 20:27:29 -03:00
3622829504
Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery
2019-12-24 17:55:46 -03:00
02779cb6ef
Merge remote-tracking branch 'origin/master' into next
2019-12-24 11:53:49 -08:00
0780e48f86
Merge branch 'titlecard2' into 'next'
...
More customisable title card
See merge request STJr/SRB2!552
2019-12-24 14:47:55 -05:00
c61c1e2514
Turn the babysitting deterrent into its own rule.
2019-12-24 16:30:18 -03:00
b740daf5bf
GTR_HURTMESSAGES
2019-12-24 16:09:00 -03:00
40b0c853b7
Add IDENTIFIER to gametype DeHackEd.
2019-12-23 23:19:48 -03:00
630c06b7b0
Turn GTR_CHASECAM into GTR_FIRSTPERSON.
2019-12-23 19:24:06 -03:00
5ebd84c3e7
Move ALL the Lua global variable stuff into lua_script.c.
2019-12-23 18:49:23 -03:00
7425591815
Add pointlimit and timelimit to Lua.
2019-12-23 18:37:38 -03:00
6d7bdf8fdb
Lua gametyperules
2019-12-19 18:27:11 -03:00
9b2b526eb4
Removing commented out code
2019-12-19 16:22:55 -03:00
a39b6a1286
Allow access to bluescore and redscore
2019-12-19 16:17:08 -03:00
7efd9662d1
Remove GTR_NOGAMEEND
2019-12-19 16:13:27 -03:00
f4bb618f93
Organise rules
2019-12-19 16:12:10 -03:00
6d7262e985
Remove GTR_PLATFORM
2019-12-19 16:05:03 -03:00
768080977f
Remove GTR_ROUNDENDMESSAGE
2019-12-19 15:47:37 -03:00
ce0e4201b8
GTR_DEATHMATCHSTARTS
2019-12-19 02:26:17 -03:00
0accadf02f
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-19 02:15:45 -03:00
Zwip-Zwap Zapony