Commit graph

1525 commits

Author SHA1 Message Date
Jaime Passos
41840f6375 Merge remote-tracking branch 'origin/next' into pictureformats 2020-01-20 16:53:41 -03:00
Tatsuru
065b8adf42 In-map visual indicator 2020-01-19 19:02:03 -03:00
Jaime Passos
24f8f69218 Fix missing constant 2020-01-18 12:10:48 -03:00
Jaime Passos
1da214088b backwards compat 2020-01-17 16:11:17 -03:00
Jaime Passos
7ec8c607ce typoe 2020-01-17 00:34:31 -03:00
James R
ab86ef936a Merge branch 'keywords-back-again' into 'next'
Level header keywords

See merge request STJr/SRB2!656
2020-01-16 20:05:24 -05:00
James R
e831a61df5 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
Tatsuru
445269ce14 Expose colorization to mappers and SOC 2020-01-11 20:40:57 -03:00
James R
3225affa98 Merge branch 'showconditionset' into 'next'
Showconditionset

See merge request STJr/SRB2!651
2020-01-10 15:59:37 -05:00
Jaime Passos
a6472c2ffb Merge remote-tracking branch 'origin/next' into pictureformats 2020-01-10 04:11:26 -03:00
Tatsuru
8d5153a595 This is stupid 2020-01-09 12:15:26 -03:00
James R
4f0acda87c Call it KEYWORDS 2020-01-08 14:41:38 -08:00
James R
d3da473d4c Revert "Oh right, the keywords..."
This reverts commit 7431794b5c.
2020-01-08 14:26:47 -08:00
James R
40d080cfe1 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
toaster
44b68036e8 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
Jaime Passos
3b29ec3fbc Merge remote-tracking branch 'origin/next' into pictureformats 2020-01-07 16:10:25 -03:00
Jaime Passos
96340ac80c Move texture stuff to its own file 2020-01-07 12:35:10 -03:00
lachwright
1811a2a34d 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
Jaime Passos
4e0810e8a3 Picture formats test 2020-01-06 18:22:23 -03:00
lachwright
b15755837c Merge branch 'next' into clear-sign-sprite 2020-01-04 14:50:17 +08:00
Alam Ed Arias
caa7f52f7f Merge branch 'master' into next 2020-01-03 14:56:37 -05:00
lachwright
95ca48ada7 Add generic signpost sprite for skins that don't have one 2020-01-03 13:12:18 +08:00
Louis-Antoine
61a681ed02 Grab mouse again when closing menu, unpausing, etc 2020-01-02 00:45:28 +01:00
James R
81bdd2d473 Merge remote-tracking branch 'origin/next' into local-lua-commands 2019-12-30 15:08:34 -08:00
Jaime Passos
585db9fe2d Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-30 18:39:31 -03:00
James R
67ca512120 Merge remote-tracking branch 'origin/master' into next 2019-12-30 13:16:53 -08:00
Jaime Passos
12068930b2 Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-30 12:09:45 -03:00
James R
c7821da6b6 COM_LOCAL makes your commands NetXCmd free, FUCK NetXCmd 2019-12-29 21:07:28 -08:00
James R
2ab129b7bc Fuck magic numbers; COM_ flags for Lua commands! 2019-12-29 21:00:38 -08:00
James R
31b03fadcd Add MFE_TOUCHLAVA and MFE_TRACERANGLE to Lua and SOC 2019-12-28 17:52:22 -08:00
Jaime Passos
e5e4b4891a Add GTR_CUTSCENES. And I ran out of rule slots. Cool. 2019-12-28 20:33:28 -03:00
Jaime Passos
8f0d5bf468 Organise gametype ruleset again. 2019-12-28 20:18:21 -03:00
Jaime Passos
d165634870 Add GTR_FRIENDLY. 2019-12-28 19:56:18 -03:00
Jaime Passos
63132da7e0 Rename GTR_MATCHEMERALDS to GTR_POWERSTONES. 2019-12-28 19:49:34 -03:00
Jaime Passos
a7fa90d11d Rename GTR_HIDETIME to GTR_STARTCOUNTDOWN. 2019-12-28 19:47:03 -03:00
Jaime Passos
be32397562 Respawn delay gametype rule 2019-12-27 01:44:27 -03:00
James R
4100e43a9d CV_NOLUA for when a cvar should not be changed via Lua 2019-12-26 18:15:19 -08:00
Jaime Passos
070adb4191 Merge remote-tracking branch 'origin/next' into rotsprite2 2019-12-26 20:27:29 -03:00
Jaime Passos
31eeb90056 Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery 2019-12-24 17:55:46 -03:00
James R
ddae69f672 Merge remote-tracking branch 'origin/master' into next 2019-12-24 11:53:49 -08:00
James R
248e452d7d Merge branch 'titlecard2' into 'next'
More customisable title card

See merge request STJr/SRB2!552
2019-12-24 14:47:55 -05:00
Jaime Passos
debacf34bb Turn the babysitting deterrent into its own rule. 2019-12-24 16:30:18 -03:00
Jaime Passos
4f54da125d GTR_HURTMESSAGES 2019-12-24 16:09:00 -03:00
Jaime Passos
b1add48063 Add IDENTIFIER to gametype DeHackEd. 2019-12-23 23:19:48 -03:00
Jaime Passos
73bb0567cc Turn GTR_CHASECAM into GTR_FIRSTPERSON. 2019-12-23 19:24:06 -03:00
Jaime Passos
4ebbe4e518 Move ALL the Lua global variable stuff into lua_script.c. 2019-12-23 18:49:23 -03:00
Jaime Passos
6a5d68a979 Add pointlimit and timelimit to Lua. 2019-12-23 18:37:38 -03:00
Jaime Passos
644d0d86ad Lua gametyperules 2019-12-19 18:27:11 -03:00
Jaime Passos
b8671edef4 Removing commented out code 2019-12-19 16:22:55 -03:00
Steel Titanium
f94cfb5929 Allow access to bluescore and redscore 2019-12-19 16:17:08 -03:00