Commit graph

1525 commits

Author SHA1 Message Date
Jaime Passos
a4ce7e908d Remove GTR_NOGAMEEND 2019-12-19 16:13:27 -03:00
Jaime Passos
063d4d0d86 Organise rules 2019-12-19 16:12:10 -03:00
Jaime Passos
18235cd672 Remove GTR_PLATFORM 2019-12-19 16:05:03 -03:00
Jaime Passos
9b1d5db5f8 Remove GTR_ROUNDENDMESSAGE 2019-12-19 15:47:37 -03:00
Jaime Passos
108129b222 GTR_DEATHMATCHSTARTS 2019-12-19 02:26:17 -03:00
Jaime Passos
ad317cd8a2 Merge remote-tracking branch 'origin/next' into gametype-clownery 2019-12-19 02:15:45 -03:00
Jaime Passos
920d99976c Lua! Lua! Lua!
Expecting the buildbot to complain
2019-12-19 02:13:09 -03:00
Jaime Passos
782643564f Whoops 2019-12-18 23:02:07 -03:00
Jaime Passos
25481512e7 Special Stages/token stuff 2019-12-18 22:46:17 -03:00
Jaime Passos
156d5fd37f Custom gametype rankings 2019-12-18 22:02:37 -03:00
Jaime Passos
35f783ab24 GTR_FRIENDLYFIRE, renamed GTR_HIDETIMEFROZEN, fixed other mistakes 2019-12-18 20:12:52 -03:00
Jaime Passos
97db6162e8 point limit/time limit 2019-12-18 19:43:12 -03:00
Jaime Passos
dcc8cdc143 Ringslinger tweaks 2019-12-18 19:26:45 -03:00
Jaime Passos
4fecde58b9 Limits checking 2019-12-18 18:59:47 -03:00
Jaime Passos
8de03f9738 Fix comment 2019-12-18 18:52:10 -03:00
Jaime Passos
d29bce1a21 Accept gametype rules in SOC by just their names as parameters. 2019-12-18 18:50:04 -03:00
Jaime Passos
65d6f88639 GTR_NOTITLECARD 2019-12-18 18:39:59 -03:00
Jaime Passos
5b0a305bc1 Fix lib_getenum. Also, adding gametypes also creates constant names for them. 2019-12-18 18:30:24 -03:00
Jaime Passos
52cc04ef78 Some sort of intermission tally support. 2019-12-18 17:13:05 -03:00
Jaime Passos
9c5a3b637c GTR_ALLOWEXIT 2019-12-18 16:52:05 -03:00
Jaime Passos
79f7bf2276 TOL stuff 2019-12-18 16:00:02 -03:00
Jaime Passos
968d1bb875 Fix warnings 2019-12-18 15:41:03 -03:00
Jaime Passos
78f4997164 GTR_EMERALDHUNT and GTR_SPAWNENEMIES 2019-12-18 14:57:42 -03:00
Jaime Passos
c408cef81b GTR_NOSPECTATORSPAWN 2019-12-18 14:47:39 -03:00
Jaime Passos
a82a5e664c SOC stuff 2019-12-18 14:37:48 -03:00
Jaime Passos
9b900e6fc7 TOL/Level platter stuff 2019-12-18 13:24:10 -03:00
Jaime Passos
a0cee9b35f Death of TOL_CUSTOM 2019-12-18 12:40:46 -03:00
Jaime Passos
607d066c01 More customisable title card
Add TitleCardZigZag, TitleCardZigZagText and TitleCardActDiamond fields to SOC.
Add the same fields to Lua under their internal names.
Turn map header level flags into an UINT16, so that NoTitleCard works. (NOBODY caught this, I'm actually disappointed.)
2019-12-18 00:28:58 -03:00
James R
132dd278ca Fix "SRB2" SOC directive, though its usefulness is debatable 2019-12-17 14:11:45 -08:00
Jaime Passos
be227cc58c un-ROTSPRITE rollangle and spriteinfo 2019-12-17 13:09:25 -03:00
Monster Iestyn
3022d559c8 Added a lot of SOC-editable variables to Lua, as well as the tutorialmode boolean 2019-12-16 20:26:19 +00:00
James R
ae73e8f4e0 Fix NOHW warnings 2019-12-12 14:00:13 -08:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
toaster
20cf020458 Fix clearing maps making the Tutorial option on the SP menu crash. 2019-12-05 13:42:08 +00:00
MascaraSnake
b52c71b6e2 Merge branch 'minusflip' into 'master'
Have Minus rotate in mid-air

Closes #326

See merge request STJr/SRB2Internal!532
2019-11-25 16:43:49 -05:00
toaster
e36dc688dd "showconditionset" option for Unlockables and Extra Emblems. See merge request (coming shortly) for full description/prompt. 2019-11-24 14:35:31 +00:00
lachwright
86ff608cfd Have Minus rotate in mid-air 2019-11-24 22:29:26 +08:00
toaster
4b9eb8fbe8 Enable lowercase text for Statistics and Unlockable Checklist menus (resolves #339). 2019-11-24 13:51:53 +00:00
MascaraSnake
62ae268a29 Merge branch 'menu-reordering' into 'master'
Menu reordering (also renaming secrets to extras)

See merge request STJr/SRB2Internal!511
2019-11-23 17:51:46 -05:00
MascaraSnake
6ac467896b Merge branch 'drtminus' into 'master'
drt minus

See merge request STJr/SRB2Internal!495
2019-11-22 16:09:58 -05:00
sphere
693d6b5ca5 Rename "secrets" to "extras". 2019-11-21 01:34:32 +01:00
lachwright
a9326be8d7 Add GFZ debris; reorganize wood debris index 2019-11-21 01:05:22 +08:00
MascaraSnake
04fbb5dbd3 Merge branch 'cobalt-ai' into 'master'
CobaltBW's Tails AI

See merge request STJr/SRB2Internal!358
2019-11-18 17:26:28 -05:00
MascaraSnake
66cc8046a5 Merge branch 'dragonbomber' into 'master'
Dragonbomber

See merge request STJr/SRB2Internal!489
2019-11-18 17:10:30 -05:00
toaster
420656a716 As requested by MotorRoach and doublechecked with MascaraSnake, DrT's Minus resprite. 2019-11-18 22:05:05 +00:00
toaster
7bcaa5c359 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into cobalt-ai
# Conflicts:
#	src/p_map.c
2019-11-18 21:33:51 +00:00
MascaraSnake
2ca069e5ba Merge branch 'titlecards' into 'master'
Titlecards

See merge request STJr/SRB2Internal!492
2019-11-18 16:22:32 -05:00
MascaraSnake
5324107edf Merge branch 'jester-fireball' into 'master'
Mario fireball by Jester (resolves #296)

Closes #296

See merge request STJr/SRB2Internal!487
2019-11-18 15:56:33 -05:00
Jaime Passos
8ce00492c2 Merge remote-tracking branch 'origin/master' into titlecards 2019-11-18 17:55:47 -03:00
MascaraSnake
ecd021abdf Merge branch 'fhzenemytweaks' into 'master'
Hardcode DrT's FHZ improvements (resolves #295).

Closes #295

See merge request STJr/SRB2Internal!483
2019-11-18 15:21:59 -05:00