Commit graph

13811 commits

Author SHA1 Message Date
James R
909e07be65 Rename HAVE_STRLCPY to SRB2_HAVE_STRLCPY, fix non-glibc compile
- Fix compile with msvcrt
- Fix compile with SDL 2.28.2
2023-08-20 07:31:10 -04:00
Sal
f0b09dec6b Merge branch 'linux-render-switching-fix' into 'master'
fix linux renderer switching

See merge request STJr/SRB2!2110
2023-08-20 02:43:26 +00:00
bitten2up
93f11508fc
remove stray else 2023-08-19 19:52:10 -05:00
Sal
ea76826489 Merge branch 'fix-glibc-238' into 'master'
Fix glibc 2.38 compile

See merge request STJr/SRB2!2092
2023-08-04 18:41:29 +00:00
James R
b120d00c9f Fix glibc 2.38 compile
glibc 2.38 added strlcpy and strlcat.
2023-08-03 16:46:47 -07:00
sphere
c29999aea7 Merge branch 'suppress-warnings' into 'master'
Suppress libdivide warnings in GCC/Clang

See merge request STJr/SRB2!1991
2023-07-15 17:38:19 +00:00
sphere
5da5b6dd86 Merge branch 'fix-exotic-prids' into 'master'
Fix PRIdS define for Windows MINGW64

See merge request STJr/SRB2!1367
2023-07-15 17:38:12 +00:00
Zwip-Zwap Zapony
05f1a9a2c8 Suppress libdivide warnings in GCC/Clang 2023-05-29 14:38:22 +02:00
spherallic
eb1492fe6e Zone Builder config updates 2023-05-23 17:51:56 +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
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
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
spherallic
d6cafea571 Don't force FLS to false after a pre-map cutscene 2023-04-28 15:30:02 +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