Commit graph

162 commits

Author SHA1 Message Date
James R 735289502c Call it KEYWORDS 2020-01-08 14:41:38 -08:00
James R 74364b84f9 Revert "Oh right, the keywords..."
This reverts commit a00dfcf420.
2020-01-08 14:26:47 -08:00
fickleheart f8a3e3b898 Merge remote-tracking branch 'origin/next' into next-newcontrols 2020-01-04 09:57:09 -06:00
fickleheart b22de48c03 Merge branch 'next' into next-newcontrols
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
2019-12-31 12:58:36 -06:00
fickleheart e0f35d207f Convert analog/directionchar cvars into 2-long arrays 2019-12-30 14:01:14 -06:00
Jaime Passos 2166571920 Add GTR_CUTSCENES. And I ran out of rule slots. Cool. 2019-12-28 20:33:28 -03:00
Jaime Passos ae0acfba0f Organise gametype ruleset again. 2019-12-28 20:18:21 -03:00
Jaime Passos 7a00b3a331 Add GTR_FRIENDLY. 2019-12-28 19:56:18 -03:00
Jaime Passos 45af6d8899 Rename GTR_MATCHEMERALDS to GTR_POWERSTONES. 2019-12-28 19:49:34 -03:00
Jaime Passos 4b604328d5 Rename GTR_HIDETIME to GTR_STARTCOUNTDOWN. 2019-12-28 19:47:03 -03:00
Jaime Passos 51404130af Respawn delay gametype rule 2019-12-27 01:44:27 -03:00
Jaime Passos 3622829504 Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery 2019-12-24 17:55:46 -03:00
Jaime Passos c61c1e2514 Turn the babysitting deterrent into its own rule. 2019-12-24 16:30:18 -03:00
Jaime Passos b740daf5bf GTR_HURTMESSAGES 2019-12-24 16:09:00 -03:00
Jaime Passos 630c06b7b0 Turn GTR_CHASECAM into GTR_FIRSTPERSON. 2019-12-23 19:24:06 -03:00
Jaime Passos 7efd9662d1 Remove GTR_NOGAMEEND 2019-12-19 16:13:27 -03:00
Jaime Passos f4bb618f93 Organise rules 2019-12-19 16:12:10 -03:00
Jaime Passos 6d7262e985 Remove GTR_PLATFORM 2019-12-19 16:05:03 -03:00
Jaime Passos 768080977f Remove GTR_ROUNDENDMESSAGE 2019-12-19 15:47:37 -03:00
Jaime Passos ce0e4201b8 GTR_DEATHMATCHSTARTS 2019-12-19 02:26:17 -03:00
Jaime Passos ef7e53488d GTR_CAMPAIGN and GTR_NOGAMEEND 2019-12-18 22:50:49 -03:00
Jaime Passos 5daedc70e7 Special Stages/token stuff 2019-12-18 22:46:17 -03:00
Jaime Passos d0e18444fb GTR_FRIENDLYFIRE, renamed GTR_HIDETIMEFROZEN, fixed other mistakes 2019-12-18 20:12:52 -03:00
Jaime Passos 396106829a Ringslinger tweaks 2019-12-18 19:26:45 -03:00
Jaime Passos ec8682b2af GTR_NOTITLECARD 2019-12-18 18:39:59 -03:00
Jaime Passos 5f73d48614 Some sort of intermission tally support. 2019-12-18 17:13:05 -03:00
Jaime Passos e3584e8230 GTR_ALLOWEXIT 2019-12-18 16:52:05 -03:00
Jaime Passos 5b0a094f67 TOL stuff 2019-12-18 16:00:02 -03:00
Jaime Passos d3d91726f5 GTR_EMERALDHUNT and GTR_SPAWNENEMIES 2019-12-18 14:57:42 -03:00
Jaime Passos 0577cec01b GTR_NOSPECTATORSPAWN 2019-12-18 14:47:39 -03:00
Jaime Passos 1e2331d672 SOC stuff 2019-12-18 14:37:48 -03:00
Jaime Passos 79d5192b7c TOL/Level platter stuff 2019-12-18 13:24:10 -03:00
Jaime Passos b759ebf622 Death of TOL_CUSTOM 2019-12-18 12:40:46 -03:00
Jaime Passos 45580ce557 Make NUMGAMETYPEFREESLOTS lower because netcode 2019-12-18 12:36:54 -03:00
Jaime Passos 7807424633 NUMGAMETYPES vs gametypecount 2019-12-18 12:30:01 -03:00
Jaime Passos 15862ed02c G_NewGametype 2019-12-18 12:23:42 -03:00
Jaime Passos 6660d63028 There are only so many bits 2019-12-18 12:14:18 -03:00
Jaime Passos da4e759a73 GTR_DEATHPENALTY 2019-12-18 12:13:24 -03:00
Jaime Passos 83732f38a9 GTR_PITYSHIELD 2019-12-18 12:09:44 -03:00
Jaime Passos 299f2bd8cd GTR_TEAMFLAGS 2019-12-18 11:43:50 -03:00
Jaime Passos 185fa2799d Update comments 2019-12-18 11:33:56 -03:00
Jaime Passos ea5e0d28ed More gametype rules yay!! 2019-12-18 01:54:45 -03:00
Jaime Passos 7bfdc2caa0 Gametype rules draft, mind the debug command 2019-12-18 01:25:57 -03:00
Jaime Passos 317191ec7c Freeslot moment! 2019-12-18 00:52:50 -03:00
Jaime Passos 254d812901 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
Steel Titanium d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
toaster 2b5957fd1c Fix #457 and another bug I just realised in one fell swoop.
That is to say, MV_PERFECT can be applied in singleplayer, but that doesn't update your best rings on the map in record attack, so the thing being yellow doesn't make sense if your rings are (none). Therefore, make it a two-flag, two-bit process.
2019-12-05 09:47:29 +00:00
toaster 7ff616b26e Do a whole bunch of cleanup for mapvisited and intermission related things.
* Move the visitation flags, Record Attack/NiGHTS Attack data, and emblem checking to outside of Y_StartIntermission.
* Y_CleanupScreenBuffer never got called for maps which skip the intermission, leading to a small memory leak; this is now fixed by moving it to G_AfterIntermission.
* Y_FollowIntermission was just G_AfterIntermission with modeattacking specific behaviour, but this is desired for all places where G_AfterIntermission is called, so just merge this into G_AfterIntermission.

Notably, these changes are necessary because there are now three maps in the main SP campaign which do not end with traditional intermissions. As a result, this fixes an issue where Black Core's tracks are not available in the Sound Test (due to MV_BEATEN never being applied).

Also, since I was here: Remove "gotperfect" from recorddata_t. This is a duplicate of `mapvisited[gamemap-1] & MV_PERFECT` which uses more memory. I have kept the new spacing in the gamedata for compatibility with RC1 savedatas, but moved it across to the original method everywhere else.
2019-11-21 16:10:28 +00:00
Jaime Passos 85f1b847e9 LF_WARNINGTITLE 2019-11-18 15:04:40 -03:00
Jaime Passos 6920d20a0f map header option 2019-11-18 14:08:47 -03:00