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 |
|
spherallic
|
e4f92cc667
|
Always important
|
2023-04-18 02:04:23 +02:00 |
|
sphere
|
57b0dfcfac
|
Merge branch 'nobotcamerareset' into 'next'
Don't call P_ResetCamera when spawning a bot
Closes #971
See merge request STJr/SRB2!1966
|
2023-04-18 00:01:04 +00:00 |
|
sphere
|
2e048ec6b3
|
Merge branch 'titlecardticker' into 'next'
Fix titlecard hook being inconsistent on map load
Closes #965
See merge request STJr/SRB2!1965
|
2023-04-18 00:01:01 +00:00 |
|
spherallic
|
930b1355ed
|
Don't call P_ResetCamera when spawning a bot
|
2023-04-14 12:03:21 +02:00 |
|
spherallic
|
c61594931d
|
Fix titlecard hook being inconsistent on map load
|
2023-04-14 00:28:14 +02:00 |
|
spherallic
|
488f0fdfab
|
bruh
|
2023-04-12 20:06:02 +02:00 |
|
spherallic
|
9499cb5409
|
Merge branch 'next' into public_next
|
2023-04-12 19:51:17 +02:00 |
|
sphere
|
2df3fb53da
|
Merge branch 'strong-lua-command-restrictions' into 'next'
Fix up Lua command/cvar safety
See merge request STJr/SRB2!1943
|
2023-04-12 17:50:01 +00:00 |
|
sphere
|
630c324114
|
Merge branch 'dedicatedaddonsfolder' into 'public_next'
Define cv_addons_folder in dedicated
See merge request STJr/SRB2Internal!639
|
2023-04-12 17:48:54 +00:00 |
|
MascaraSnake
|
6258f14bab
|
Merge branch 'setcontrol-buffer-overflow' into 'next'
Fix buffer overflow in setcontrol with 2 arguments
See merge request STJr/SRB2!1954
|
2023-04-12 09:20:33 +00:00 |
|
MascaraSnake
|
4f8625ef76
|
Merge branch 'metal-sonic-use-after-free' into 'next'
Fix use-after-free when Metal Sonic charges energy balls
See merge request STJr/SRB2!1956
|
2023-04-12 09:20:00 +00:00 |
|
MascaraSnake
|
d6375b1e18
|
Merge branch 'fix-wallspike-segfault' into 'next'
Fix segfault when destroying wall spike while it moves
See merge request STJr/SRB2!1959
|
2023-04-12 09:19:50 +00:00 |
|
MascaraSnake
|
29582e453d
|
Merge branch 'ptera-escape-bad-state' into 'next'
Fix crash during debug when escaping pterabyte
See merge request STJr/SRB2!1960
|
2023-04-12 09:19:40 +00:00 |
|
MascaraSnake
|
efee750874
|
Merge branch 'mapheader-alloc-fix' into 'next'
Fix R_SkinUsable crashes in (some) custom addons
Closes #994
See merge request STJr/SRB2!1962
|
2023-04-12 08:01:50 +00:00 |
|
MascaraSnake
|
9e8200c1e3
|
Merge branch 'ambient-sound-fix' into 'next'
Fix custom ambient sound mobjs not working
See merge request STJr/SRB2!1961
|
2023-04-12 08:01:38 +00:00 |
|
spherallic
|
4b6de096e5
|
Define cv_addons_folder in dedicated
|
2023-04-12 00:59:08 +02:00 |
|
Gustaf Alhäll
|
cf67ba1d01
|
fixup! Fix segfault when killing wall spike while it moves
|
2023-04-11 22:51:18 +02:00 |
|
Gustaf Alhäll
|
cb849ca4f0
|
Fix segfault when first mobj in overlaycap is removed
|
2023-04-11 22:13:29 +02:00 |
|
Monster Iestyn
|
b98af785f5
|
Merge branch 'fofflags-bruh' into 'next'
Fix flag mixup in P_GetOldFOFFlags()
Closes #995
See merge request STJr/SRB2!1958
|
2023-04-11 19:08:59 +00:00 |
|
MascaraSnake
|
8486bd083a
|
R_SkinUsable: Only check header of current map if one exists
|
2023-04-11 19:13:30 +02:00 |
|
MascaraSnake
|
846cf71e6a
|
F_StartTitleScreen: Make sure the level header for gamemap always exists
|
2023-04-11 18:48:23 +02:00 |
|
MascaraSnake
|
1cd5e10ab0
|
Fix custom ambient sound mobjs not working
|
2023-04-11 16:19:27 +02:00 |
|
Gustaf Alhäll
|
4c02bde4e9
|
Fix crash during debug when escaping pterabyte
|
2023-04-10 18:31:12 +02:00 |
|
Gustaf Alhäll
|
8b77af7378
|
Fix segfault when killing wall spike while it moves
|
2023-04-10 14:55:19 +02:00 |
|
MascaraSnake
|
16ad23f06d
|
Fix flag mixup in P_GetOldFOFFlags()
|
2023-04-10 14:08:53 +02:00 |
|
Gustaf Alhäll
|
8218ce0fe2
|
Fix use-after-free when Metal Sonic charges energy balls
|
2023-04-07 14:49:31 +02:00 |
|
Gustaf Alhäll
|
2e3963fd16
|
Fix buffer overflow for setcontrol with 2 arguments
|
2023-04-02 21:58:42 +02:00 |
|
spherallic
|
9d6456c326
|
Merge branch 'next' into public_next
|
2023-04-02 19:33:16 +02:00 |
|
sphere
|
3c81938496
|
Merge branch 'io-limit' into 'next'
Add basic rate limitation for Lua file access
See merge request STJr/SRB2!1947
|
2023-03-31 16:13:42 +00:00 |
|
sphere
|
3f499178b0
|
Merge branch 'forceverticalflipflag' into 'next'
Add flag to action 433 to force MFE_VERTICALFLIP
See merge request STJr/SRB2!1948
|
2023-03-31 16:13:23 +00:00 |
|
sphere
|
e82bb933e7
|
Merge branch 'botchanges' into 'next'
Bot adjustments
See merge request STJr/SRB2!1951
|
2023-03-31 16:13:05 +00:00 |
|
spherallic
|
1470d099e3
|
Update copyright year & credits
|
2023-03-31 14:53:31 +02:00 |
|
spherallic
|
91ef59f76b
|
Fix tiny regression with special stage tally
|
2023-03-31 13:36:54 +02:00 |
|