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
toaster
6ac44415fb
Make P_CanPickupItem check whether Sonic is in a state to recieve it when Tailsbot tries to get it.
...
Specfically, this fixes the case where Sonic runs into something hazardous and spills his rings, but Tailsbot is immediately behind and ends up picking them all up the tic before they also get hurt.
2019-11-26 11:55:31 +00:00
toaster
c0bc46ca9c
A bunch of spike tweaks.
...
* Make it possible to break them in reverse gravity (resolves #348 ) by making the spikes break in a circle around the spike touched, rather than in a circle around the player.
* Fix the spike chunks spawned not being flipped in reverse gravity by using P_SpawnMobjFromMobj.
* Make their breaking sound singular (prevents eardrum destruction).
2019-11-24 22:38:26 +00:00
Monster Iestyn
d1d1098f7c
fix object type restrictions for popping monitors
...
(MT_BOUNCERING to MT_GRENADERING are actually the ammo pickups, MT_THROWNBOUNCE to MT_THROWNGRENADE are what actually want here)
2019-11-19 12:31:20 -05:00
MascaraSnake
7dc3484e5d
Merge branch 'dragonbomber' into 'master'
...
Dragonbomber
See merge request STJr/SRB2Internal!489
2019-11-18 17:10:30 -05:00
MascaraSnake
2001cad144
Merge branch 'capsuletweaks' into 'master'
...
Egg Capsule tweaks
See merge request STJr/SRB2Internal!474
2019-11-18 15:24:13 -05:00
lachwright
b721c035f8
Add Dragonbomber enemy
2019-11-18 05:23:59 +08:00
toaster
52bd4b05e1
* Make the Egg Capsule only explode for one second, but have the number of explosions (and flickies) multiplied 1.5 times.
...
* If the player is spindashing when the level is exited, they will un-spindash. (Currently you get stuck in charging)
2019-11-15 15:20:36 +00:00
Jaime Passos
88fb22d688
Yeah, yeah...
2019-11-14 22:14:40 -03:00
MascaraSnake
b0786f12de
Merge branch 'coop-item-respawn' into 'master'
...
Allow item respawn in co-op again
See merge request STJr/SRB2Internal!466
2019-11-14 18:06:32 -05:00
MascaraSnake
8f6890025c
Merge branch 'secretstuff' into 'master'
...
The letter
See merge request STJr/SRB2Internal!438
2019-11-14 17:49:23 -05:00
Louis-Antoine
f4beb4a56f
Disable monitor respawning in co-op
2019-11-14 22:27:02 +01:00
Louis-Antoine
ffd9cfebe6
Allow item respawn in co-op again
...
Why was it even disabled anyway.
2019-11-14 16:37:09 +01:00
MascaraSnake
d9558fb724
Merge branch 'atz-hazards' into 'master'
...
Azure Temple Zone hazards, round 2
See merge request STJr/SRB2Internal!437
2019-11-12 18:05:44 -05:00
toaster
5729ba3cd2
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording
...
# Conflicts:
# src/p_user.c
2019-11-12 21:56:46 +00:00
MascaraSnake
7c7fc35ec5
Merge branch 'deathlaunch' into 'master'
...
Fix players being launched by slopes and pmomz when dying.
See merge request STJr/SRB2Internal!452
2019-11-11 11:22:12 -05:00
