katsy
ca11180976
Merge remote-tracking branch 'stjr/next' into lua-optimized-constants
2023-06-11 12:36:08 -05:00
sphere
363faed8d7
Merge branch 'sucky-steps' into 'next'
...
Port increment_move radius clamps from Ring Racers
See merge request STJr/SRB2!2013
2023-06-09 13:07:07 +00:00
sphere
65e1f88c75
Merge branch 'nightspowerhud' into 'next'
...
Add HUD icons for timed NiGHTS powerups
See merge request STJr/SRB2!1949
2023-06-09 11:34:25 +00:00
sphere
cd1b57a901
Merge branch 'textcolortweaks' into 'next'
...
Small text colormap tweaks
See merge request STJr/SRB2!1971
2023-06-09 11:33:26 +00:00
Sally Coolatta
7fa7653494
Port increment_move radius clamps from Ring Racers
...
Fixes inconsistencies with thin players, like with Liftoff Gantry's scale section, and with large characters colliding with steep slopes instead of going up them.
2023-06-05 13:54:09 -04: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
sphere
369d39a859
Merge branch 'stuckonyou' into 'next'
...
Allow targeting invulnerable bosses & don't break targeting when they take damage
See merge request STJr/SRB2!1917
2023-05-25 23:48:56 +00:00
sphere
38575f52e6
Merge branch 'scoreattacked' into 'next'
...
Reallow score chains from rolling
See merge request STJr/SRB2!1833
2023-05-25 22:48:31 +00:00
sphere
c37af2bf78
Merge branch 'uncap-console' into 'next'
...
Interpolate console animation, Make con_height update on the fly
Closes #905
See merge request STJr/SRB2!1878
2023-05-25 22:36:24 +00:00
sphere
796c06e2f7
Merge branch 'issue834' into 'next'
...
When attaching to a wall to do a climb, the second sidedef wasn't be handled properly.
Closes #834
See merge request STJr/SRB2!1908
2023-05-25 21:11:25 +00:00
sphere
1043a523d8
Merge branch 'fix-crushclaw-armageddon-hit' into 'next'
...
Fix segfault when Crushstaceans hit a player with Armageddon shield
See merge request STJr/SRB2!1980
2023-05-25 21:10:45 +00:00
sphere
19de187b02
Merge branch 'fix-getfreemem' into 'next'
...
Fix I_GetFreeMem for 64-bit platforms
See merge request STJr/SRB2!1982
2023-05-25 21:10:02 +00:00
sphere
5fe6138f7f
Merge branch 'fix-removed-shield-segfault' into 'next'
...
Fix segfault when shields are removed after thinking
See merge request STJr/SRB2!1975
2023-05-25 21:06:40 +00:00
sphere
89ce385fb9
Merge branch 'fix-null-standingslope' into 'next'
...
Fix segfault when going up steep slopes in rare cases
See merge request STJr/SRB2!1978
2023-05-25 21:06:00 +00:00
sphere
cb3acbc701
Merge branch 'fixlightleveldecrease' into 'next'
...
Fix linedef action 420 being unable to lower light levels properly by default
See merge request STJr/SRB2!1977
2023-05-25 21:03:40 +00:00
sphere
1a0c931053
Merge branch 'nobombsphereattract' into 'next'
...
Don't attract bomb spheres with Attraction shield
See merge request STJr/SRB2!1953
2023-05-25 21:02:48 +00:00
sphere
cf0c5f9084
Merge branch 'midsave-addons' into 'next'
...
Allow Cosmetic Add-Ons Mid-Save
Closes #911
See merge request STJr/SRB2!1877
2023-05-25 21:01:30 +00:00
sphere
777a1c6b83
Merge branch 'plane-scroller-tweaks-again' into 'next'
...
Plane scroller & wind/current/pusher improvements (again)
See merge request STJr/SRB2!1811
2023-05-25 21:00:30 +00:00
sphere
ce504d4e8e
Merge branch 'mobj-dispoffset' into 'next'
...
Turn dispoffset into a mobj field
See merge request STJr/SRB2!1708
2023-05-25 20:59:43 +00:00
MascaraSnake
55d96daa28
Merge branch 'refresh-spr2' into 'next'
...
[SUGOI] Refresh Sprite2s
See merge request STJr/SRB2!1750
2023-05-24 05:04:31 +00: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
spherallic
b9c86a0f7f
Zone Builder config updates
2023-05-23 17:54:32 +02:00
Jaime Ita Passos
7dc74fc364
Fix declaration of I_GetFreeMem in src/dummy/i_system.c
2023-05-19 15:12:20 -03:00
Jaime Ita Passos
2f98cd3b97
Fix I_GetFreeMem
2023-05-19 14:26:30 -03: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
6bb3ee226f
Fix segfault when going up steep slopes in rare cases
2023-05-16 19:34:22 +02:00
spherallic
2c689bae52
2.2.11
2023-05-16 18:20:15 +02:00
spherallic
e086d57421
Merge branch 'next' into public_next
2023-05-16 17:57:11 +02:00
spherallic
b487a71533
Fix light fades being unable to lower light levels
2023-05-14 16:26:34 +02:00
spherallic
b99ecde7b8
Fix [BOT] indicator color not being cleared
2023-05-07 17:42:39 +02:00
spherallic
ed46dd08a6
Prevent tmthing crash with P_SpawnParaloop in Lua
2023-05-07 17:33:12 +02:00
Gustaf Alhäll
03971f58a9
Fix segfault when shields are removed after thinking
2023-05-04 22:42:51 +02:00
spherallic
f1147618d0
Merge branch 'next' into public_next
2023-05-04 15:46:02 +02:00
sphere
62deaaadb4
Merge branch 'issue704' into 'next'
...
Fixes issue #704 and #618
Closes #618 and #704
See merge request STJr/SRB2!1912
2023-05-01 21:28:37 +00:00
sphere
ae0afe0361
Merge branch 'precutfls' into 'next'
...
Don't force fromlevelselect to be false after a pre-map cutscene
Closes #1003
See merge request STJr/SRB2!1972
2023-05-01 21:20:24 +00:00
sphere
ccec739860
Merge branch 'pointy-think-crash-fix' into 'next'
...
A_PointyThink crash fix (patch from #827 )
See merge request STJr/SRB2!1970
2023-05-01 21:18:40 +00:00
sphere
eabfadfdf7
Merge branch 'dedicatedemeraldbounce' into 'next'
...
Skip emerald bounce logic in intermission ticker on dedicated
See merge request STJr/SRB2!1969
2023-05-01 21:17:46 +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
sphere
5995c100b6
Merge branch 'fix-remove-source-damage' into 'next'
...
Fix segfault when removing source from ShouldDamage
See merge request STJr/SRB2!1967
2023-05-01 21:17:01 +00:00
sphere
a78922d022
Merge branch 'first-overlay-remove-fix' into 'next'
...
Fix segfault when first mobj in overlaycap is removed
See merge request STJr/SRB2!1963
2023-05-01 21:16:32 +00:00
Gustaf Alhäll
901c7362ed
Fix segfault when P_RemoveMobj is called within A_FaceTarget action
2023-04-30 14:05:10 +02:00
spherallic
d6cafea571
Don't force FLS to false after a pre-map cutscene
2023-04-28 15:30:02 +02:00
spherallic
98dcf2d228
Tweak yellow/green/blue/red/peridot text colors
2023-04-24 23:23:47 +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
c2c430853c
If Lua disabled intermission emeralds, skip sounds
2023-04-19 20:17:50 +02:00
spherallic
6ff37b47d9
Skip emerald bounce logic in Y_Ticker on dedicated
2023-04-19 12:13:29 +02:00
spherallic
e5a1fee759
Adjust default look/turn axis for new SDL2 version
2023-04-19 00:21:10 +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
3135cd37e6
Merge branch 'next' into public_next
2023-04-18 02:05:19 +02:00
