Commit graph

409 commits

Author SHA1 Message Date
James R
17082fafbd Merge branch 'gtr-replace' into 'next'
Separate PvP damage from ringslinger

See merge request STJr/SRB2!831
2020-04-09 19:51:52 -04:00
Louis-Antoine
46df2b9551 Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
Zipper
5c9e689d04 Update p_inter.c 2020-03-05 18:48:20 -05:00
Zipper
cc26d9d2bf Update p_inter.c 2020-03-05 18:30:27 -05:00
ZipperQR
3ec5c0fa89 fix source player being nil 2020-03-05 12:26:27 +03:00
Tatsuru
0e281a12e1 Separate PvP damage from non-friendly gametypes 2020-03-03 11:56:57 -03: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
ba9f866acf Merge branch 'exitmove-tweaks' into 'next'
Exitmove tweaks

See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
James R
4f41da1d16 Merge branch 'starpost-config-additions' into 'next'
Starpost config additions

See merge request STJr/SRB2!680
2020-02-01 21:42:43 -05:00
fickleheart
7bcb2ec0f6 Move spawnsnap to Special/ignore on sector trigger
Also includes splitting the starpost logic into its own function.
2020-01-24 23:54:54 -06:00
Louis-Antoine
bb157866b7 Ignore disconnected players in tag gametypes
Disconnected players do not become IT at round start.

If all non-ITs are disconnected, the round ends.

If all ITs are disconnected, one of the non-ITs
becomes IT, or the round ends if in Hide & Seek.
2020-01-23 19:58:13 +01:00
Tatsuru
b37fc4573a No more losing lives when finished 2020-01-19 14:30:05 -03:00
James R
a9cd4a1c10 Merge branch 'software-dropshadows' into 'next'
Software dropshadows

See merge request STJr/SRB2!660
2020-01-17 18:56:13 -05:00
fickleheart
75741d6ac8 Declare checkbase for both sides of the if statement 2020-01-12 09:11:57 -06:00
fickleheart
fa8efa97e4 Checkpoint players at star post exact location with Ambush flag 2020-01-11 22:30:07 -06:00
fickleheart
52d9c08b71 Allow starpost Parameter to dictate order 2020-01-11 22:26:20 -06:00
fickleheart
d2c6af1167 Add mobj shadowscale property 2020-01-11 18:24:08 -06:00
toaster
862a4cce19 Make Fangboss' player pogo a little less bullshit by having an actually sensible calculation instead of trying to be smart.
The old behaviour was trying way too hard to be smart and as a consequence made the hitbox way too huge.
2020-01-11 17:08:08 +00:00
James R
75514def83 Merge branch 'respawndelaygametyperule' into 'next'
Gametype ruleset changes

See merge request STJr/SRB2!585
2020-01-01 17:49:53 -05:00
James R
d2651ef092 Merge branch 'minecartspawner-fix' into 'next'
Disable minecart spawners for players already riding a minecart

See merge request STJr/SRB2!608
2019-12-31 17:15:18 -05:00
Tatsuru
24e4552d5b Got rid of the uhh 2019-12-31 11:19:54 -03:00
James R
e70ae46a76 Merge branch 'fix-lua-scorechains' into 'next'
Fix scoreadd not doing anything in certain cases when modified by Lua

See merge request STJr/SRB2!579
2019-12-31 01:32:22 -05:00
Tatsuru
50ffcba552 Small 2019-12-31 01:48:50 -03:00
Tatsuru
15d4829e19 Appease the C90 entity 2019-12-31 01:20:11 -03:00
Tatsuru
5cf362dd87 Disable Minecart Spawners for players already riding a minecart 2019-12-31 00:38:09 -03:00
Jaime Passos
bd28daea02 Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-28 21:39:38 -03:00
Jaime Passos
63132da7e0 Rename GTR_MATCHEMERALDS to GTR_POWERSTONES. 2019-12-28 19:49:34 -03:00
Alam Ed Arias
2c03fcaac5 Merge branch 'master' into next 2019-12-27 17:08:16 -05:00
Jaime Passos
9ede8f7c2e In P_KillPlayer, check for the gametype's rules, instead of the gametype itself, before bursting rings. 2019-12-27 17:22:55 -03: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
3ce02b8135 burst emeralds with GTR_MATCHEMERALDS 2019-12-27 12:34:35 -03:00
Jaime Passos
070adb4191 Merge remote-tracking branch 'origin/next' into rotsprite2 2019-12-26 20:27:29 -03:00
James R
abdd904ef0 Merge branch 'char-damage-fix' into 'next'
Fix Amy and Fang being able to attack other players in MP Special Stages

See merge request STJr/SRB2!558
2019-12-26 18:18:10 -05:00
James R
2c93621d5c P_PlayerHitsPlayer is too big for inline, and these other functions are getting there 2019-12-26 14:59:31 -08:00
Sally Cochenour
176b853b01 Fix scoreadd not doing anything when modified by Lua
This does not change any vanilla behavior, as scoreadd is reset constantly on the ground anyway -- this simply makes the behavior modifiable for Lua scripts.
2019-12-26 14:02:02 -05:00
Steel Titanium
86381d31bf Clean up comment 2019-12-24 17:45:57 -05:00
Steel Titanium
ffa78e1531 Change this condition a bit 2019-12-24 17:44:06 -05:00
Jaime Passos
4f54da125d GTR_HURTMESSAGES 2019-12-24 16:09:00 -03:00
Steel Titanium
75cbfe9e54 Spawn Amy's shields for other players 2019-12-23 00:28:06 -05:00
Steel Titanium
14673656c3 Fix Amy and Fang being able to attack other players in MP Special Stages 2019-12-20 23:22:45 -05: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
31f3299bc2 GTR_DEATHPENALTY 2019-12-18 12:13:24 -03:00
Jaime Passos
789e881abc GTR_TEAMFLAGS 2019-12-18 11:43:50 -03:00
Jaime Passos
448494e19b More gametype rules yay!! 2019-12-18 01:54:45 -03:00
Jaime Passos
be227cc58c un-ROTSPRITE rollangle and spriteinfo 2019-12-17 13:09:25 -03:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00