Commit graph

499 commits

Author SHA1 Message Date
Sally Cochenour
d1580a5b42 More Flame Shield visuals 2020-03-26 08:48:02 -04:00
James R
572bf314e5 Merge remote-tracking branch 'origin/master' into resume 2020-03-22 19:01:05 -07:00
James R
abcba53781 Merge remote-tracking branch 'origin/master' into parties 2020-03-22 18:28:07 -07:00
Sally Cochenour
25bc236bde Merge branch 'master' into new-items 2020-03-22 20:50:28 -04:00
Sally Cochenour
7f07fa9b2d Move item box counter stuff into k_battle 2020-03-22 16:23:56 -04:00
Sally Cochenour
b1ec5654bc Merge branch 'master' into targets 2020-03-22 14:31:17 -04:00
James R
911dd57334 Restore level music to where it left off
Toggleable via the resume cvar.
2020-03-21 22:28:55 -07:00
Louis-Antoine
46df2b9551 Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Sally Cochenour
040865b589 Merge branch 'master' into new-items 2020-03-17 19:31:47 -04:00
Latapostrophe
1f5bbb2c3d Merge branch 'push-more-lua' into awful-mix 2020-03-11 07:37:47 +01:00
Latapostrophe
f98a74638f More explicit var names for countdown and countdown2 2020-03-11 07:37:33 +01:00
James R
18aa2972e5 Merge remote-tracking branch 'origin/master' into parties-only 2020-03-05 21:41:23 -08:00
fickleheart
cf11f1ef6e SUPER EXPERIMENTAL FREEZE-B-GONE 2020-03-05 22:19:39 -06:00
Sally Cochenour
65e9aeec62 This was in the wrong place 2020-03-01 16:03:31 -05:00
Sally Cochenour
3633dc341a Merge branch 'master' into targets 2020-03-01 15:42:49 -05:00
Sally Cochenour
6956e1d24e Store random states in mobjinfo instead of precipprops
My reasoning is that it wouldn't make much sense to have a weather type that has snow, but doesn't randomize the sprite it uses, so we don't need to copy-paste the same "randomstates" for each weather type.
2020-03-01 13:13:59 -05:00
James R
4f40edaf01 Maybe localdisplayplayers is a bad idea 2020-02-23 23:21:20 -08:00
James R
46ac563eaf Implement big bad parties (splitscreen with network players)
Use the 'invite' command to invite another player to your party.

If that player accepts, via the 'acceptinvite' command, they and any
splitscreen players on their machine will be added after the players
in your party. They may also use the 'rejectinvite' command.

Use the 'leaveparty' command to leave a party. You and any splitscreen players
on your machine will be removed from the party. Players after you will be
shifted to take your place on the splitscreen.
2020-02-23 23:20:20 -08:00
James R
f164320c88 Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen 2020-02-23 23:20:20 -08:00
Steel Titanium
fc042e90f0 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
James R
b329536bd1 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
Jaime Passos
83112c8248 Add MAXTOL 2020-02-12 13:41:30 -03:00
fickleheart
0de2068b88 More fixes for titlecard option stuff 2020-02-09 17:53:50 -06:00
fickleheart
33c103c319 Allow more options for when the titlecard shows up 2020-02-08 11:13:40 -06: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
fickleheart
067b132eb1 Merge remote-tracking branch 'origin/next' into next-newcontrols 2020-01-04 09:57:09 -06:00
fickleheart
77ba835f4f Merge branch 'next' into next-newcontrols
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
2019-12-31 12:58:36 -06:00
fickleheart
61a8f715ac Convert analog/directionchar cvars into 2-long arrays 2019-12-30 14:01:14 -06: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
Jaime Passos
31eeb90056 Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery 2019-12-24 17:55:46 -03: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
73bb0567cc Turn GTR_CHASECAM into GTR_FIRSTPERSON. 2019-12-23 19:24:06 -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
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
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