Commit graph

668 commits

Author SHA1 Message Date
sphere
dbe3c0c76d Merge branch 'flingring_perfectbonus' into 'next'
Transform FlingRing when attracted instead of spawning new Ring

Closes #1218

See merge request STJr/SRB2!2390
2024-06-03 14:52:20 +00:00
SSNTails
8e43f0a46e Merge branch SRB2:next into issue1133 2024-03-16 14:38:00 +00:00
SSNTails
b4ad054422 Zwip Zwap Zapony's suggestions 2024-03-16 10:28:49 -04:00
BarrelsOFun
cfc23648f5 Transform FlingRing instead of spawning new Ring 2024-03-13 19:58:24 -07: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
MIDIMan
22d7f392d0 Move some stuff around in P_DoBoss5Death 2024-03-10 19:34:21 -04:00
MIDIMan
f354c0b2ea Fix Fang's death sequence 2024-03-10 10:44:08 -04:00
Logan Aerl Arias
a73f9476f3 fixed call to P_SetScale() within A_MinusDigging() that I missed 2024-02-24 23:57:09 -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
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
Logan Aerl Arias
2df90ec96b Merge branch SRB2:next into emblemexitfix 2024-02-12 05:09:04 +00:00
Gustaf Alhäll
1a53971c39 Fix various segfaults caused by missing P_MobjWasRemoved checks 2024-02-09 19:39:20 +01:00
Lactozilla
756e9d0d48 Link objects into multiple blockmap sectors
Ported from ZDoom
2024-01-17 19:10:19 -03:00
Logan Aerl Arias
a3b79056e9 Merge branch 'translations' into 'next'
ZDoom translations

See merge request STJr/SRB2!2190
2024-01-17 03:24:54 +00:00
Zwip-Zwap Zapony
564d18b1ea Add and use an "instant" parameter for P_SetScale 2024-01-03 14:04:40 +01:00
Lactozilla
b6e4771085 Merge branch 'next' into translations 2024-01-02 22:06:14 -03:00
Lactozilla
31f7616d3a Fix #1166 2024-01-02 20:58:55 -03:00
Logan Aerl Arias
487b0d22ed Merge branch 'next' into raise-skin-limit 2024-01-01 16:55:04 -05:00
Logan Aerl Arias
82f37ccadd Merge branch SRB2:next into emblemexitfix 2023-12-31 17:03:43 +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
Lactozilla
a3e6b5e0fb Merge remote-tracking branch 'stjr/next' into raise-skin-limit 2023-11-23 13:48:18 -03:00
Lactozilla
2064c220a0 Fix warnings 2023-10-31 03:44:20 -03:00
Lactozilla
0731272fab Add A_SetTranslation and load TRNSLATE before SOC and Lua scripts 2023-10-30 20:52:28 -03:00
Alam Ed Arias
a2e288a4dc Merge branch 'master' into fix-segfault-removemobj-spawn 2023-10-28 20:40:07 -04:00
Alam Ed Arias
49d9619192 Merge branch 'master' into raise-skin-limit 2023-10-28 18:09:42 -04:00
SMS Alfredo
7bcad024f8 Only Award Bonuses / RA Emblems from Physically Beating a Level 2023-09-19 21:48:01 -05:00
Lactozilla
3377fa986a Remember the player's color after a team gametype 2023-08-07 13:37:07 -03:00
Sal
b7443cfa05 Merge branch 'lawofattraction' into 'next'
Fix ring attraction and homing attack math errors (resolves #1045, #1001)

Closes #1001 and #1045

See merge request STJr/SRB2!2033
2023-08-02 14:54:33 +00:00
Sal
03ae681714 Merge branch 'a_scaletoground' into 'next'
Fix A_ConnectToGround's Handling of Scaled Mobjs

Closes #1038

See merge request STJr/SRB2!2029
2023-07-26 12:17:14 +00:00
Nev3r
022ddcf363 Merge branch 'models-plus-final' into 'next'
3D models support for spritexoffset, spriteyoffset, spritexscale, spriteyscale, parity with sprite rollangle

See merge request STJr/SRB2!1840
2023-07-24 12:46:10 +00:00
Sal
b238a6db50 Merge branch 'shockwave-action' into 'next'
Add a standalone action for shockwaves

See merge request STJr/SRB2!1777
2023-07-24 11:01:41 +00: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
47436ee495 Merge branch 'bosszero' into 'next'
Do not consider 0 a valid executor tag for bosses

Closes #1017

See merge request STJr/SRB2!2037
2023-07-14 13:17:48 +00:00
spherallic
a4bcf4e2ce Do not consider 0 a valid executor tag for bosses 2023-07-06 18:06:23 +02:00
MIDIMan
4342dacbdf Fix A_FishJump for custom objects in binary maps 2023-07-05 14:25:10 -04:00
katsy
2c66f2ce27 Fix homing attack and ring attraction math dumbs 2023-07-03 16:27:07 -05:00
Zwip-Zwap Zapony
b405f50caa Fix A_ConnectToGround's handling of scaled mobjs 2023-06-24 19:35:57 +02:00
Lach
647e6aac12 Simplify the way skincolors' invshades are used 2023-06-20 20:03:13 +02:00
sphere
d6d424f102 Merge branch 'fix-remove-facetarget-action' into 'next'
Fix segfault when P_RemoveMobj is called within A_FaceTarget action

See merge request STJr/SRB2!1974
2023-05-26 01:15:40 +00:00
Gustaf Alhäll
d4951f7cdd
Fix segfault when Crushstaceans hit a player with Armageddon shield 2023-05-16 22:18:11 +02:00
Gustaf Alhäll
901c7362ed
Fix segfault when P_RemoveMobj is called within A_FaceTarget action 2023-04-30 14:05:10 +02:00
Gustaf Alhäll
4967c296ab
Fix segfaults when P_RemoveMobj is called from MobjSpawn hook 2023-04-30 12:43:31 +02:00
SteelT
2d3153079b A_PointyThink crash fix (patch from #827)
Fixes A_PointyThink crashing in certain scenarios
2023-04-22 17:02:06 -04:00
spherallic
1470d099e3 Update copyright year & credits 2023-03-31 14:53:31 +02:00
sphere
7eabccbfac Merge branch 'issue568' into 'next'
Fixes issue #568

Closes #568

See merge request STJr/SRB2!1913
2023-02-27 20:37:50 +00:00
spherallic
207053a023 Prevent A_LobShot from dividing by 0 2023-01-13 17:10:50 +01:00