Commit graph

405 commits

Author SHA1 Message Date
Zipper
4d8a523da9 Update p_inter.c 2020-03-05 18:30:27 -05:00
ZipperQR
da9bf34175 fix source player being nil 2020-03-05 12:26:27 +03:00
Steel Titanium
76f26cda24 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R
7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
James R
92f65fd822 Merge branch 'exitmove-tweaks' into 'next'
Exitmove tweaks

See merge request STJr/SRB2!709
2020-02-18 21:58:18 -05:00
James R
5a524f21da 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
332b22a87a 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
b0b22b53d6 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
e9a8c2d21a No more losing lives when finished 2020-01-19 14:30:05 -03:00
James R
9a1cb0e30e Merge branch 'software-dropshadows' into 'next'
Software dropshadows

See merge request STJr/SRB2!660
2020-01-17 18:56:13 -05:00
fickleheart
8a6173a3f2 Declare checkbase for both sides of the if statement 2020-01-12 09:11:57 -06:00
fickleheart
e60ba92a92 Checkpoint players at star post exact location with Ambush flag 2020-01-11 22:30:07 -06:00
fickleheart
1e2a4c2cce Allow starpost Parameter to dictate order 2020-01-11 22:26:20 -06:00
fickleheart
ba8ff3d502 Add mobj shadowscale property 2020-01-11 18:24:08 -06:00
toaster
a5ad02eab9 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
48c83be89e Merge branch 'respawndelaygametyperule' into 'next'
Gametype ruleset changes

See merge request STJr/SRB2!585
2020-01-01 17:49:53 -05:00
James R
bd0deea11c 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
79f18a3c19 Got rid of the uhh 2019-12-31 11:19:54 -03:00
James R
4b91e49bf4 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
b68a629a71 Small 2019-12-31 01:48:50 -03:00
Tatsuru
2d0cdbe34f Appease the C90 entity 2019-12-31 01:20:11 -03:00
Tatsuru
47b096a357 Disable Minecart Spawners for players already riding a minecart 2019-12-31 00:38:09 -03:00
Jaime Passos
e63f77ea1a Merge remote-tracking branch 'origin/next' into respawndelaygametyperule 2019-12-28 21:39:38 -03:00
Jaime Passos
45af6d8899 Rename GTR_MATCHEMERALDS to GTR_POWERSTONES. 2019-12-28 19:49:34 -03:00
Alam Ed Arias
94bb6655a5 Merge branch 'master' into next 2019-12-27 17:08:16 -05:00
Jaime Passos
e03eaa554b 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
3b341245f1 Same deal, but for starposts. 2019-12-27 17:14:56 -03:00
Jaime Passos
1f96f70173 Preparing for the inevitable gametype rule that will handle cooplives... 2019-12-27 17:08:20 -03:00
Jaime Passos
6b8839d5aa burst emeralds with GTR_MATCHEMERALDS 2019-12-27 12:34:35 -03:00
Jaime Passos
c0390f5186 Merge remote-tracking branch 'origin/next' into rotsprite2 2019-12-26 20:27:29 -03:00
James R
aa9cc6e6f2 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
dd1ca69f54 P_PlayerHitsPlayer is too big for inline, and these other functions are getting there 2019-12-26 14:59:31 -08:00
Sally Cochenour
a1d944fc4d 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
8d8e0ca22c Clean up comment 2019-12-24 17:45:57 -05:00
Steel Titanium
b49672e3f9 Change this condition a bit 2019-12-24 17:44:06 -05:00
Jaime Passos
b740daf5bf GTR_HURTMESSAGES 2019-12-24 16:09:00 -03:00
Steel Titanium
356b25def4 Spawn Amy's shields for other players 2019-12-23 00:28:06 -05:00
Steel Titanium
ace202daf0 Fix Amy and Fang being able to attack other players in MP Special Stages 2019-12-20 23:22:45 -05: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
da4e759a73 GTR_DEATHPENALTY 2019-12-18 12:13:24 -03:00
Jaime Passos
299f2bd8cd GTR_TEAMFLAGS 2019-12-18 11:43:50 -03:00
Jaime Passos
ea5e0d28ed More gametype rules yay!! 2019-12-18 01:54:45 -03:00
Jaime Passos
c6f36fc470 un-ROTSPRITE rollangle and spriteinfo 2019-12-17 13:09:25 -03:00
Steel Titanium
d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
lachwright
c4f48ee979 Make Buggles spawn immediately breathable bubbles 2019-12-06 16:29:52 +08:00
MascaraSnake
07afb52a2a Merge branch 'deadstuff' into 'master'
Matters of mortality

See merge request STJr/SRB2Internal!558
2019-11-26 17:24:17 -05:00
toaster
c55a6cb3f8 MascaraSnake is a bully and will make a pariah out of me in front of his doctoral student colleagues if I don't change this 2019-11-26 17:10:59 -05:00
toaster
f1387a07a1 Instead of making conditions which check for death individually check for special stages to prevent lives loss, just set G_GametypeUsesLives to false in a special stage. 2019-11-26 12:30:32 +00:00