Commit graph

634 commits

Author SHA1 Message Date
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
MascaraSnake
af85de53d7 Rename P_LoadThingsOnly to P_RespawnThings to make it clearer that it doesn't actually reload the things from the file, it just respawns them. 2019-12-28 14:13:26 +01:00
MascaraSnake
f67ff6d97e Rename P_SetupLevel to the more accurate P_LoadLevel and separate out some of its content into subfunctions 2019-12-28 11:30:39 +01:00
Jaime Passos
62d79eef2a Same deal, but for starposts. 2019-12-27 17:14:56 -03:00
Jaime Passos
ff80c4ef4d Preparing for the inevitable gametype rule that will handle cooplives... 2019-12-27 17:08:20 -03:00
Jaime Passos
203f4c50a0 add G_CompetitionGametype(void) 2019-12-27 12:28:00 -03:00
Jaime Passos
ca3941f5b8 use GTR_DEATHMATCHSTARTS 2019-12-27 12:14:33 -03:00
MascaraSnake
82d21224cf Merge branch 'next' into kill-zshift
# Conflicts:
#	src/p_mobj.c
2019-12-27 08:11:04 +01:00
Jaime Passos
be32397562 Respawn delay gametype rule 2019-12-27 01:44:27 -03:00
James R
0fd77ff5f4 Merge remote-tracking branch 'origin/master' into next 2019-12-26 15:35:53 -08:00
James R
bd472eb353 Merge branch 'turnmultiplier' into 'master'
Option to increase the turning speed

See merge request STJr/SRB2!553
2019-12-26 18:18:23 -05:00
MascaraSnake
b1a43c7c4a Use mthing->z instead of mthing->options >> ZSHIFT in G_AddGhost 2019-12-26 20:54:06 +01:00
Jaime Passos
42c71d3f42 Merge remote-tracking branch 'origin/next' into gametype-clownery 2019-12-25 06:09:00 -03:00
Jaime Passos
31eeb90056 Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery 2019-12-24 17:55:46 -03:00
James R
27e251e7fc Merge branch 'wipes2' into 'master'
Wipe styles cleanup

See merge request STJr/SRB2!525
2019-12-24 14:47:14 -05:00
Jaime Passos
debacf34bb Turn the babysitting deterrent into its own rule. 2019-12-24 16:30:18 -03:00
Jaime Passos
c6dd9f016e Title card fixes. 2019-12-24 16:22:25 -03:00
Jaime Passos
c76154d3a1 Don't warn about missing CTF starts if the gametype doesn't have team flags. 2019-12-24 16:12:05 -03:00
Jaime Passos
c832d26ee9 ViewpointSwitch improvements. 2019-12-23 20:22:57 -03:00
Jaime Passos
73bb0567cc Turn GTR_CHASECAM into GTR_FIRSTPERSON. 2019-12-23 19:24:06 -03:00
Jaime Passos
100144d4db Merge remote-tracking branch 'origin/master' into gametype-clownery 2019-12-23 18:21:13 -03:00
James R
9fd3088956 Whoops I forgot player 2 2019-12-22 21:29:41 -08:00
James R
2b2d4c139f Merge remote-tracking branch 'origin/master' into turnmultiplier 2019-12-22 21:26:36 -08:00
Jaime Passos
f3a91afe90 Make G_PlatformGametype only check the gametype rules, to avoid unintended side effects 2019-12-19 16:31:38 -03:00
Jaime Passos
b8671edef4 Removing commented out code 2019-12-19 16:22:55 -03:00
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
6c2b62a795 fix warnings 2019-12-19 02:20:49 -03:00
Jaime Passos
8bd0fc842f allow CTF spawns in GTR_TEAMS gametype rule 2019-12-19 02:17:03 -03:00
Jaime Passos
920d99976c Lua! Lua! Lua!
Expecting the buildbot to complain
2019-12-19 02:13:09 -03:00
Jaime Passos
f9bbcfc0f3 GTR_CAMPAIGN and GTR_NOGAMEEND 2019-12-18 22:50:49 -03:00
Jaime Passos
25481512e7 Special Stages/token stuff 2019-12-18 22:46:17 -03:00
Jaime Passos
24f546d992 Fix timelimit/pointlimit checks in HU_DrawRankings, organise rules in gametypedefaultrules a bit 2019-12-18 22:23:30 -03:00
Jaime Passos
156d5fd37f Custom gametype rankings 2019-12-18 22:02:37 -03:00
Jaime Passos
0e3bf527a2 ViewpointSwitch hook for Lua 2019-12-18 20:43:54 -03:00
Jaime Passos
35f783ab24 GTR_FRIENDLYFIRE, renamed GTR_HIDETIMEFROZEN, fixed other mistakes 2019-12-18 20:12:52 -03:00
Jaime Passos
dcc8cdc143 Ringslinger tweaks 2019-12-18 19:26:45 -03:00
Jaime Passos
65d6f88639 GTR_NOTITLECARD 2019-12-18 18:39:59 -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
0323205a9a How did I mess this up? 2019-12-18 15:23:41 -03:00
Jaime Passos
78f4997164 GTR_EMERALDHUNT and GTR_SPAWNENEMIES 2019-12-18 14:57:42 -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