Commit graph

514 commits

Author SHA1 Message Date
Henry3230
e0f666d30b MobjDamage hook tweaks for special stages 2024-06-24 22:28:16 +00:00
spherallic
dfecbe87b8 Fix FreeBSD build error 2024-03-21 19:30:45 +01:00
sphere
620f1e55aa Merge branch 'mpss-extratime' into 'next'
Make Extra Time powerup work in old-style special stages

See merge request STJr/SRB2!2292
2024-03-21 15:49:12 +00:00
Hanicef
d00c6a8ab9 Fix softlock on old special stages when running out of time due to being hit 2024-03-20 22:49:12 +01:00
sphere
dedd80a0f0 Merge branch 'issue1195' into 'next'
Issue #1195 - Standing at a corner under steam, but far away enough to not be...

See merge request STJr/SRB2!2318
2024-03-13 13:49:49 +00:00
Arthur
e19b9e7d24 A little bit of semantic cleanup 2024-02-27 07:12:22 -05:00
Logan Aerl Arias
52f53f03b7 Merge branch 'next' into instant-setscale 2024-02-24 11:42:27 -05:00
Logan Aerl Arias
b3c3a45a6c Merge branch SRB2:next into fix-missing-mobjwasremoved-checks 2024-02-18 22:56:44 +00:00
Logan Aerl Arias
cf5520b275 Merge branch SRB2:next into instant-setscale 2024-02-17 03:25:41 +00:00
SSNTails
7e880d7698 A little more elegance. 2024-02-15 15:22:33 -05:00
SSNTails
d8723c4b7f Don't forget about pushables! 2024-02-15 15:18:26 -05:00
SSNTails
fdb94b15ea Issue #1195 - Standing at a corner under steam, but far away enough to not be impacted by it, causes the player animation to reset for a tic 2024-02-15 12:42:31 -05:00
SMS Alfredo
2e7fa1990a Respawn Certain Monitors in Co-op 2024-02-12 05:46:25 +00:00
Gustaf Alhäll
1a53971c39 Fix various segfaults caused by missing P_MobjWasRemoved checks 2024-02-09 19:39:20 +01:00
spherallic
af4e64d1a5 Make Extra Time powerup work in old-style special stages 2024-02-05 01:28:35 +01:00
Zwip-Zwap Zapony
564d18b1ea Add and use an "instant" parameter for P_SetScale 2024-01-03 14:04:40 +01:00
Logan Aerl Arias
8c3d590730 Merge branch SRB2:next into exitfix 2023-12-31 17:03:12 +00:00
Logan Aerl Arias
64da1fada1 Merge branch 'handle-player-mobjsetstate' into 'next'
Handle player state is P_SetMobjState

See merge request STJr/SRB2!2239
2023-12-26 00:00:39 +00:00
Logan Aerl Arias
b5a4f227f6 Merge branch 'fix-segfault-removemobj-spawn' into 'next'
Fix segfaults when P_RemoveMobj is called from MobjSpawn hook

See merge request STJr/SRB2!1973
2023-12-25 23:58:26 +00:00
Gustaf Alhäll
ddba6e80f7
Handle player state is P_MobjSetState 2023-12-23 13:45:16 +01:00
Alam Ed Arias
a2e288a4dc Merge branch 'master' into fix-segfault-removemobj-spawn 2023-10-28 20:40:07 -04:00
SMS Alfredo
71b0f002c9 Only Consider ExitLevel a Cheat When Used to Cheat 2023-09-19 17:17:00 -05:00
LJ Sonic
2a896538d9 Merge branch 'netcode-rerefactor' into 'next'
Re-delete netcode

See merge request STJr/SRB2!2083
2023-09-18 16:47:28 +00:00
Lactozilla
69df136e2b Merge remote-tracking branch 'stjr/next' into team-gametype-keep-player-color 2023-09-12 19:17:07 -03:00
Sally Coolatta
9d9b6d83c2 Don't NiGHTS pull emblems you can't collect 2023-08-19 23:58:43 -04:00
Sal
492fe94597 Warp cheat adjustments 2023-08-07 18:35:20 +00:00
Lactozilla
3377fa986a Remember the player's color after a team gametype 2023-08-07 13:37:07 -03:00
LJ Sonic
0ade3ae0bc Move tic and net command handling to new files 2023-07-27 15:38:45 +02:00
Sally Coolatta
7c2a241042 Remove the need for setting rotation axis in spriteinfo for models
Now it just does it like Software
2023-07-24 04:40:15 -04:00
sphere
d7a84b967c Merge branch 'strongpower' into 'next'
Add player->powers[pw_strong], refactor attacks and busting conditions, and allow breaking floors and ceilings separately

See merge request STJr/SRB2!1366
2023-07-05 17:05:47 +00:00
katsy
f261b9f0e1 Add player->powers[pw_strong], refactor attacks and busting conditions, and allow breaking floors and ceilings separately 2023-07-05 17:05:47 +00:00
spherallic
b97f0a8643 Fix MT_NIGHTSCORE color cycling, using link colors 2023-06-20 20:06:43 +02:00
sphere
f1106236ad Merge branch 'sphere-fix' into 'next'
Fix Flung Spheres not using the Blue Sphere collection effect

See merge request STJr/SRB2!1995
2023-06-12 23:46:05 +00:00
Sally Coolatta
cf228757a1 Emblems disappear on collection again, only for SP 2023-06-02 16:06:50 -04:00
Sally Coolatta
645dd7d662 Stop endlessly chasing NIGHTSPULL emblems 2023-06-02 16:06:50 -04:00
Sally Coolatta
c1e641be43 Improve emblem sharing conditions 2023-06-02 16:06:50 -04:00
Sally Coolatta
9cce2195d4 Make ShareEmblems more Top Down style 2023-06-02 16:06:49 -04:00
Sally Coolatta
d7c5e16f6c Play sound globally if emblems are shared 2023-06-02 16:06:44 -04:00
Sally Coolatta
303d636f8e Individual emblems mode 2023-06-02 16:06:43 -04:00
Sally Coolatta
49fa46d80e Online emblems
Currently, emblems share with everyone. Will add an option to toggle this.
2023-06-02 16:06:43 -04:00
SMS Alfredo
58b3b8e075 Fix Flung Spheres not using the Blue Sphere collection effect 2023-05-31 22:33:16 -05:00
MascaraSnake
e4933b3e94 Merge branch 'allow-modified-saving' into 'next'
[SUGOI] Allow saving in modified games.

See merge request STJr/SRB2!1749
2023-05-24 05:04:26 +00:00
sphere
f83f1a1229 Merge branch 'fix-mobj-damage-null-pain-state' into 'next'
Fix segfault when damaging mobj with no painstate

See merge request STJr/SRB2!1968
2023-05-01 21:17:35 +00:00
Gustaf Alhäll
4967c296ab
Fix segfaults when P_RemoveMobj is called from MobjSpawn hook 2023-04-30 12:43:31 +02:00
Gustaf Alhäll
ad412c9700
Fix segfault when damaging mobj with no painstate 2023-04-18 22:08:26 +02:00
Gustaf Alhäll
072dd2eda7
Fix segfault when removing source from ShouldDamage 2023-04-18 20:46:13 +02:00
spherallic
1470d099e3 Update copyright year & credits 2023-03-31 14:53:31 +02:00
Eidolon
e5dea805fa Revert "Merge branch 'gamepad-refactor' into next"
This reverts commit 696e2ab909, reversing
changes made to d98d59494f.
2023-01-26 19:26:28 -06:00
LJ Sonic
379cc4207a Revert "Merge branch 'netcode-refactor' into merging"
This reverts merge request !1920
2023-01-15 17:57:23 +00:00
LJ Sonic
7c2fe20cd5 Move tic and net command handling to new files 2023-01-05 22:51:17 +01:00