d3d8f85602
Merge branch 'the-colors-feel-so-right' into 'next'
...
New skin colors, add support for preferred opposite color to save cards, new lua features.
See merge request STJr/SRB2!787
2020-02-18 22:02:01 -05:00
92f65fd822
Merge branch 'exitmove-tweaks' into 'next'
...
Exitmove tweaks
See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
26825a2b4c
Merge branch 'pw-justlaunched' into 'next'
...
Add pw_justlaunched to tell modders when a player launches from a slope
See merge request STJr/SRB2!792
2020-02-18 21:53:05 -05:00
2d8522b9ec
Merge branch 'titlecard-options' into 'next'
...
Allow more options for when the titlecard shows up
See merge request STJr/SRB2!765
2020-02-18 21:52:03 -05:00
f0e2ba9e6a
Merge branch 'next' into the-colors-feel-so-right
2020-02-18 14:29:50 -05:00
0299f21dc7
Merge branch 'next' into the-colors-feel-so-right
2020-02-16 22:56:27 -05:00
0fbff66e25
Let scripters see if player just launched from slope
2020-02-16 21:34:07 -06:00
ae53c146e6
Allow SHOWTITLECARDFOR = NONE
2020-02-16 21:32:40 -06:00
187bd9ab23
Merge remote-tracking branch 'upstream/master' into titlecard-options
2020-02-16 21:32:27 -06:00
d9e2256a3c
Add six new skin colors
2020-02-14 22:30:37 -05:00
2fc7e56951
Cast Moment
2020-02-12 13:59:08 -03:00
7bc58c4c0e
Add MAXTOL
2020-02-12 13:41:30 -03:00
c827a72aab
Merge remote-tracking branch 'origin/next' into tolfix
2020-02-12 13:03:16 -03:00
d8793ce579
Merge branch 'gtr-shift' into 'next'
...
1 left shifted by zero is still 1
See merge request STJr/SRB2!766
2020-02-11 23:33:43 -05:00
e5a325994e
Use the provided Regex strings to properly turn the entire info.h states/mobjtypes lists into strings for dehacked.c
...
...it's surprising what we actually missed in the states list, apart from just the missing state (yes this makes the states fix branch redundant)
2020-02-09 19:15:04 +00:00
d0d7fd1589
Don't add a TOL_ twice.
2020-02-09 16:11:52 -03:00
5e516eb98d
1 left shifted by zero is still 1
2020-02-08 18:50:05 -03:00
fed8167a81
Allow more options for when the titlecard shows up
2020-02-08 11:13:40 -06:00
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
9e4c519cad
In-map visual indicator
2020-01-19 19:02:03 -03: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
James R