Lactozilla
fe2daf907b
Make the display of palette index 255 consistent between renderers
2024-02-19 21:49:22 -03:00
Logan Aerl Arias
a8a92a57a7
Merge branch '1200-next-cannot-load-game-when-using-srb2-launcher' into 'next'
...
Do not alllow error codepaths of UPnP to leave the mutex locked
Closes #1200
See merge request STJr/SRB2!2349
2024-02-20 00:36:39 +00:00
Arthur
cf0834d917
Fix it the right way!
2024-02-19 19:16:38 -05:00
sphere
fed08744ba
Revert "Merge branch 'issue1150' into 'next'"
...
This reverts merge request !2334
2024-02-19 23:50:56 +00:00
Alam Ed Arias
15b1842a6d
Merge remote-tracking branch 'origin/1200-next-cannot-load-game-when-using-srb2-launcher' into 1200-next-cannot-load-game-when-using-srb2-launcher
2024-02-19 18:19:58 -05:00
Alam Ed Arias
11edc020ce
i_tcp.c: do not alllow error codepaths of UPnP to leave the mutex locked
2024-02-19 18:19:28 -05:00
sphere
69757fb956
Merge branch 'fix-gl-shaders-colormap' into 'next'
...
Fix tint equation shader
See merge request STJr/SRB2!2348
2024-02-19 23:14:03 +00:00
sphere
00d057c1c2
Merge branch 'upnp-status-log-only' into 'next'
...
Print UPnP status to log file/external console only
See merge request STJr/SRB2!2347
2024-02-19 23:13:58 +00:00
sphere
2065cc1191
Merge branch 'issue1034' into 'next'
...
Cutscene timing fixed
See merge request STJr/SRB2!2344
2024-02-19 23:13:35 +00:00
Alam Ed Arias
9c5d470bef
Merge branch 'master' into next
2024-02-19 18:07:54 -05:00
Lactozilla
7433137e98
Fix tint equation shader
2024-02-19 19:23:40 -03:00
Lactozilla
5a46f12c62
Merge branch 'next' into delete-unused-render-code
2024-02-19 19:20:48 -03:00
SteelT
802a1de11b
Print UPnP status to log file/external console only
...
I don't think It's not really important enough that it's worth always notifying the user about it.
2024-02-19 17:11:05 -05:00
SSNTails
d4074e5d4e
Merge branch SRB2:next into issue1034
2024-02-19 21:59:46 +00:00
Arthur
a9b003d35c
If somebody's gonna watch the intro 50+ times, it's gonna be me. :)
2024-02-19 16:59:20 -05:00
SteelT
91980907b9
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into ogl-palette-rendering
2024-02-19 16:04:47 -05:00
Logan Aerl Arias
3910d99aa7
goodbye R_Draw2sMultiPatchColumn_8 and R_Draw2sMultiPatchTranslucentColumn_8
2024-02-19 13:19:31 -05:00
sphere
7a3d88fcc6
Merge branch 'fix-translucent-pixels-on-transparent-pixels' into 'next'
...
Fix translucent pixels being visible on empty pixels
See merge request STJr/SRB2!2335
2024-02-19 13:35:13 +00:00
sphere
af08930232
Merge branch 'issue1150' into 'next'
...
Issue1150
See merge request STJr/SRB2!2334
2024-02-19 13:32:44 +00:00
Logan Aerl Arias
b3187d2e2f
Merge branch 'next' into any-resolution
2024-02-18 23:44:41 -05:00
Lactozilla
07656de1d2
Delete old and unused rendering-related code
...
- Deleted view border code
- Deleted highcolor code
- Deleted pre-NEWCLIP code
- Deleted ylookup and columnofs
- Deleted the last remnants of con_clipviewtop and dc_hires
2024-02-18 22:11:22 -03: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
ae88c01f6e
Merge branch SRB2:next into nonightsever
2024-02-18 19:58:36 +00:00
Arthur
8a823de013
Missed a few project settings previously for visual studio release mode.
2024-02-18 11:54:20 -05:00
spherallic
03c138b782
Merge branch 'next' into font_drawer
2024-02-18 17:43:39 +01:00
Arthur
73d354b956
Bring back WRITETHINGS, with custom filename and UDMF support!
2024-02-18 11:29:00 -05:00
sphere
6d645acbc8
Merge branch 'fix-1193' into 'next'
...
Fix #1193
Closes #1193
See merge request STJr/SRB2!2330
2024-02-18 14:42:42 +00:00
sphere
ada6c43c52
Merge branch 'issue1181' into 'next'
...
This was nothing more crazy than a buffer wraparound.
See merge request STJr/SRB2!2327
2024-02-18 14:40:25 +00:00
Zwip-Zwap Zapony
beb4bceff9
Even if they may not be used to "wallhack" per se, I agree that it'd be best to not allow them online.
2024-02-18 04:32:52 +00:00
Logan Aerl Arias
08f1349985
Merge branch 'next' into rendercvars
2024-02-17 23:21:23 -05:00
Arthur
f51f9f63f0
Update objectplace to ignore float argument and handle ZABSOLUTE
2024-02-17 22:48:31 -05:00
Logan Aerl Arias
e44d85a536
Merge branch SRB2:next into shield-gamepad-defaults
2024-02-18 02:43:46 +00:00
Logan Aerl Arias
ea4ad871b6
Merge branch 'fix-upnp-add' into 'next'
...
Fix UPnP port mapping not working
See merge request STJr/SRB2!2333
2024-02-18 01:22:25 +00:00
Logan Aerl Arias
cd04c90a8a
Merge branch 'fix_softlock' into 'next'
...
dc_texheight must be (INT64) to prevent overflow and rendering softlock
See merge request STJr/SRB2!2323
2024-02-18 01:21:04 +00:00
Logan Aerl Arias
9fb7b9026e
Merge branch 'rename-gr_allowclientshaders' into 'next'
...
Rename gr_allowclientshaders to gr_allowcustomshaders
See merge request STJr/SRB2!2319
2024-02-18 01:19:35 +00:00
Logan Aerl Arias
4109f7168b
Merge branch 'fix-motd-not-being-sent' into 'next'
...
Fix MOTD not being sent to players on first join
Closes #1194
See merge request STJr/SRB2!2317
2024-02-18 01:14:13 +00:00
Logan Aerl Arias
585ec0752e
Merge branch 'propercheats' into 'next'
...
Make the Cheats Command Reflect UsedCheats
See merge request STJr/SRB2!2160
2024-02-18 01:09:42 +00:00
Logan Aerl Arias
8bffe3e3a7
Merge branch 'fix-mobj-thinker-reference-corruption' into 'next'
...
Fix faulty references when spawning mobjs
See merge request STJr/SRB2!2126
2024-02-18 01:02:42 +00:00
Logan Aerl Arias
d895ff88f9
Update hw_batching.c
...
HWR_ProcessPolygon()'s shader parameter was renamed to shader_target
2024-02-17 19:53:25 -05:00
Logan Aerl Arias
9c85ccc820
Update hw_main.c
...
cv_fovchange was moved from hw_main.c to r_main.c
cv_glallowshaders was moved from hw_main.c to d_netcmd.c
2024-02-17 19:52:22 -05:00
Logan Aerl Arias
2d17c75165
Update r_defs.h
...
add back pic_t
2024-02-17 19:50:52 -05:00
Logan Aerl Arias
6763aaefff
Merge branch 'next' into ogl-palette-rendering
2024-02-17 19:06:18 -05:00
Lactozilla
719169a625
R_GenerateTexture: Fix translucent pixels being visible on empty pixels
2024-02-17 16:51:16 -03:00
Arthur
d3d210b3ca
Merge branch 'issue1150' of https://git.do.srb2.org/SSNTails/SRB2 into issue1150
2024-02-17 14:12:54 -05:00
Arthur
94c1ab7de2
Use floorz/ceilingz
2024-02-17 14:12:39 -05:00
SteelT
8962355d6c
Fix UPnP port mapping not working
...
Despite UPNP_AddPortMapping returning sucess status, no port mapping would actually be added at all. And that's due to a memset call in the middle of the function.
Wiping the IGDdatas struct, moving the memset to the start of the function fixes it and a port mapping is actually created/removed when a server is started/stopped.
2024-02-17 13:04:29 -05:00
sphere
a5bf4a5b8f
Merge branch 'fix-user-agent-string' into 'next'
...
Fix version text in UA string
See merge request STJr/SRB2!2324
2024-02-17 16:30:21 +00:00
Lactozilla
6e109be076
Fix #1193
2024-02-17 04:00:27 -03:00
Logan Aerl Arias
cf5520b275
Merge branch SRB2:next into instant-setscale
2024-02-17 03:25:41 +00:00
Arthur
7c257dc765
This was nothing more crazy than a buffer wraparound.
2024-02-16 19:47:15 -05:00
SSNTails
a94a0b9a47
Don't forget to check for dead dontdrawforviewmobjs!!
2024-02-16 16:24:39 -05:00
Lactozilla
98ba396dbc
Fix issues related to texture scaling
2024-02-16 17:28:55 -03:00
Lactozilla
3bcd19476c
Fix version text in UA string
2024-02-16 16:46:42 -03:00
Arthur
532abf9279
dc_texheight must be (INT64) to prevent overflow and rendering softlock
2024-02-16 12:48:28 -05:00
Hanicef
e74a819b68
Fix overshoot on credit text rendering
2024-02-15 23:05:03 +01:00
Hanicef
71ce173a0d
Fix credit sequence not compensating for non-green resolutions
2024-02-15 22:03:28 +01:00
SteelT
8f9b57df0a
Rename gr_allowclientshaders to gr_allowcustomshaders
2024-02-15 15:53:42 -05:00
Hanicef
de66e055a7
Fix keyboard input via console
2024-02-15 18:56:25 +01:00
Hanicef
6218f85658
Add I_GetSysName to dedicated build
2024-02-15 18:54:24 +01:00
Hanicef
27cf39dd54
Prevent recursion into quit functions
2024-02-15 18:54:24 +01:00
Alam Ed Arias
00d1cbfd2a
Revert "Update dedicated.mk
"
...
This reverts commit a5ef42476fa8b9d96509739be9b16528fce038f5.
Also, undo the DOS EOL
2024-02-15 18:54:24 +01:00
Logan Aerl Arias
a44cb494a7
Update dedicated.mk
...
remove the need for libPNG in dedicated server build
2024-02-15 18:54:24 +01:00
Logan Aerl Arias
ea66bffc6b
made "Alpine 3 GCC Dedicated" build
2024-02-15 18:54:24 +01:00
Logan Aerl Arias
e5637e2946
change name of binary in dedicated server build to lsrb2d
2024-02-15 18:54:24 +01:00
Hanicef
c4b076ea1b
Fix compiler warning on Windows
2024-02-15 18:54:24 +01:00
Hanicef
97abc19182
Pass -mconsole on MinGW build
2024-02-15 18:54:24 +01:00
Hanicef
41975f4f40
Force NOGME=1 on dedicated build
2024-02-15 18:54:24 +01:00
Hanicef
3ca9ce2842
Avoid needing SDL=0 when building dedicated
2024-02-15 18:54:24 +01:00
Hanicef
f2a9a81786
Fix Windows build
2024-02-15 18:54:24 +01:00
Gustaf Alhäll
28f196ad3e
Fix potential deadlock when using cond
2024-02-15 18:54:24 +01:00
Gustaf Alhäll
77e83ddebb
Add dedicated server build
2024-02-15 18:54:24 +01:00
Hanicef
88bdc3e433
Fix MOTD not being sent to players on first join
2024-02-15 18:36:28 +01:00
Logan Aerl Arias
5a16fd138f
fix path to x64 curl in VS project file
...
(edited by hand via WebIDE)
2024-02-14 23:53:13 +00:00
Arthur
0cb4a1397d
Remove absolute paths
2024-02-14 18:04:58 -05:00
Arthur
99c91d4bb3
Visual Studio compiles again
2024-02-14 16:36:36 -05:00
Hanicef
493a7db1ee
Fix thinker being added twice to mobj
2024-02-14 21:54:28 +01:00
Gustaf Alhäll
b808fde260
Fix broken titlescreen for MT_ALTVIEWMAN mobjs
2024-02-14 21:45:53 +01:00
Gustaf Alhäll
5c2821fb10
Fix faulty references when spawning mobjs
2024-02-14 21:45:52 +01:00
Alam Ed Arias
3a5c5410bf
Merge branch SRB2:next into fix-command-line-input
2024-02-14 17:12:05 +00:00
SteelT
a9a1a4bf65
Fix FreeBSD memory reporting if built with cmake
2024-02-14 02:59:26 -05:00
SteelT
97afd18e96
Fix G_SaveGameData crash if quit early
...
Fixes a crash that can occur if data struct is passed to G_SaveGameData before it is allocated.
2024-02-14 02:27:58 -05:00
sphere
ff851dcb44
Merge branch 'get-sys-name' into 'next'
...
Add common I_GetSysName function
See merge request STJr/SRB2!2308
2024-02-13 15:42:30 +00:00
sphere
2675441f74
Merge branch 'freeslot-double' into 'next'
...
Match mobj freeslot count with SRB2Kart
See merge request STJr/SRB2!2298
2024-02-13 15:34:44 +00:00
sphere
245a53b423
Merge branch 'fix-1190' into 'next'
...
Fix #1190
Closes #1190
See merge request STJr/SRB2!2310
2024-02-13 15:33:59 +00:00
sphere
eaab39bbaf
Merge branch 'fix-searchblockmap' into 'next'
...
Fix Lua 'searchBlockmap' (resolves #1191 )
Closes #1191
See merge request STJr/SRB2!2309
2024-02-13 15:32:41 +00:00
Logan Aerl Arias
ae8bfbe763
Merge branch '1168-accessing-an-invalid-variable-in-ticcmd_t-crashes-the-game' into 'next'
...
check if LUA field exists before accessing it
Closes #1168
See merge request STJr/SRB2!2261
2024-02-12 19:58:56 +00:00
Lactozilla
356e455335
Fix #1190
2024-02-12 16:58:00 -03:00
Lactozilla
a709ff9ecd
Fix Lua 'searchBlockmap'
2024-02-12 16:28:32 -03:00
Logan Aerl Arias
3087107175
Merge branch 'shieldrespawn' into 'next'
...
Respawn Certain Monitors in Co-op
See merge request STJr/SRB2!2152
2024-02-12 05:46:25 +00:00
SMS Alfredo
2e7fa1990a
Respawn Certain Monitors in Co-op
2024-02-12 05:46:25 +00:00
Logan Aerl Arias
2df90ec96b
Merge branch SRB2:next into emblemexitfix
2024-02-12 05:09:04 +00:00
Logan Aerl Arias
bf9904cfc2
Merge branch 'fireflower-icon' into 'next'
...
Display power-up icon for Fire Flower
See merge request STJr/SRB2!2097
2024-02-12 05:04:57 +00:00
Logan Aerl Arias
6d0fef8726
Merge branch SRB2:next into nonightsever
2024-02-12 04:53:51 +00:00
Logan Aerl Arias
bf4efe968f
Merge branch 'patch-refactor' into 'next'
...
Patch and texture refactor
See merge request STJr/SRB2!2104
2024-02-12 04:48:36 +00:00
SteelT
ddfb59d185
Add common I_GetSysName function
...
Replaces the OS defines in Command_Version_f() with a common function to fetch the system name the game is currently running on.
2024-02-11 23:31:34 -05:00
Zwip-Zwap Zapony
bdeec56270
Substitute MT_NULL with MT_RAY in Lua
2024-02-11 13:30:15 +01:00
Hanicef
634c972f6c
Fix console not being blocked by IT_CV_STRING
2024-02-11 12:08:42 +01:00
Alam Ed Arias
ae25209cd1
r_draw.c: fix compiling with clang
2024-02-10 19:25:27 -05:00
sphere
58cf8293e3
Merge branch 'fix-nil-mo-spawnmobj-hook' into 'next'
...
Fix segfault when trying to access mo->player->mo from SpawnMobj hook
Closes #1189
See merge request STJr/SRB2!2300
2024-02-10 23:39:37 +00:00
Logan Aerl Arias
5e175a3438
add Visual Studio 2022 support (via CMAKE)
2024-02-10 14:34:03 -05:00
Logan Aerl Arias
da394a87dd
add Visual Studio 2022 support (via CMAKE)
2024-02-10 19:29:48 +00:00
Hanicef
d0277b1799
fixup! Fix segfault when trying to access mo->player->mo from SpawnMobj hook
2024-02-10 20:19:45 +01:00
Hanicef
fe75a21bef
Fix segfault when trying to access mo->player->mo from SpawnMobj hook
2024-02-10 19:40:27 +01:00
sphere
279820cd6c
Merge branch 'slash-n' into 'next'
...
add checks for \n in chat messages
See merge request STJr/SRB2!2170
2024-02-10 15:22:33 +00:00
Sally Coolatta
d5c8fcac2b
Match freeslot count with SRB2Kart
2024-02-10 08:52:32 -05:00
Gustaf Alhäll
1a53971c39
Fix various segfaults caused by missing P_MobjWasRemoved checks
2024-02-09 19:39:20 +01:00
Hanicef
8155313344
Fix input via command line/terminal not working
2024-02-09 18:49:32 +01:00
sphere
0c59a46d5a
Merge branch 'fix-segfault-remove-thinglist' into 'next'
...
Fix segfault when removing mobjs while iterating thinglist
See merge request STJr/SRB2!2293
2024-02-08 23:17:54 +00:00
sphere
41613d89a1
Merge branch 'blockmap-links' into 'next'
...
Make objects able to collide with others if they occupy multiple blockmap cells (resolves #592 )
Closes #592
See merge request STJr/SRB2!2267
2024-02-08 23:16:59 +00:00
sphere
2cfbcf7fbf
Merge branch 'allow-banip-mask' into 'next'
...
Allow ban masks to be specified for banip
See merge request STJr/SRB2!2272
2024-02-08 23:16:47 +00:00
spherallic
7fc554bd4e
Merge branch 'showinput' of git.do.srb2.org:STJr/SRB2 into showinput
2024-02-08 23:12:03 +01:00
spherallic
16b28d177e
Merge branch 'next' into showinput
2024-02-08 23:09:09 +01:00
sphere
51f0758c47
Merge branch 'fix-console-double-mapping' into 'next'
...
Fix console binds incorrectly respecting keyboard layout
See merge request STJr/SRB2!2295
2024-02-08 21:35:05 +00:00
sphere
26c057f6e5
Merge branch 'fix-unlist-request' into 'next'
...
Fix /unlist request
See merge request STJr/SRB2!2294
2024-02-08 21:34:55 +00:00
sphere
0d526c0ff5
Merge branch 'http-download-port' into 'next'
...
HTTP downloader port
See merge request STJr/SRB2!2290
2024-02-08 21:34:36 +00:00
Hanicef
914cb167a4
Fix console binds incorrectly respecting layout keys
2024-02-08 21:50:43 +01:00
Felice D'Angelo
bdf13b6957
Fix /unlist request
2024-02-08 17:09:26 +00:00
Zwip-Zwap Zapony
21b8acf75d
Change P_MobjWasRemoved to P_RemoveMobj in the error message (thanks Zwip-Zwap Zapony)
2024-02-07 20:30:20 +00:00
Hanicef
e1d15b5ed5
Fix segfault when removing mobjs while iterating thinglist
2024-02-07 18:42:24 +01:00
sphere
1b2b7658a8
Merge branch 'fix-table-key-archiving' into 'next'
...
Fix archiving with tables that contain tables as keys
See merge request STJr/SRB2!2245
2024-02-07 15:09:38 +00:00
Lactozilla
7724fafa0b
Merge branch 'fix-1183' into 'next'
...
Fix #1183
Closes #1183
See merge request STJr/SRB2!2282
2024-02-06 21:54:27 +00:00
Lactozilla
9b33d5c808
Fix build warnings
2024-02-04 20:22:27 -03:00
Lactozilla
e7e54ef28c
Merge remote-tracking branch 'stjr/next' into http-download-port
2024-02-04 20:08:52 -03:00
Lactozilla
321415fd19
Rephrase
2024-02-04 20:08:49 -03:00
Lactozilla
b4beaa9f43
HTTP downloader port
2024-02-04 20:00:51 -03:00
sphere
c91fc082f9
Merge branch 'oldspecnightsrecordsfix' into 'next'
...
Fix hud_nightsrecords in old (multiplayer) special stages
See merge request STJr/SRB2!2191
2024-02-04 21:35:36 +00:00
sphere
fd92193f7e
Merge branch 'fix-slope-plane-distortion' into 'next'
...
Fix equation plane distortion
See merge request STJr/SRB2!2283
2024-02-04 21:33:17 +00:00
Sally Coolatta
c6a68f69ce
Update unlockables before level load executors
...
Another issue that seems related to #1122
2024-02-04 01:22:11 -05:00
Lactozilla
053a9fc2e2
Fix netgame joining
...
Regression introduced by !2279 .
2024-02-04 02:43:28 -03:00
Lactozilla
235bf724f0
Merge branch 'fix-sw-polyobject-interpolation' into 'next'
...
Interpolate polyobjects properly for the software renderer (resolves #950 )
Closes #950
See merge request STJr/SRB2!2284
2024-02-02 00:08:06 +00:00
MIDIMan
5bbc1e323a
Merge branch SRB2:next into disable-powerup-hud
2024-01-31 19:34:05 +00:00
sphere
bae687a1b9
Merge branch 'fix-slope-convex-sectors' into 'next'
...
Fix physics quirkiness on slopes with convex sectors
See merge request STJr/SRB2!2250
2024-01-30 22:38:56 +00:00
Lactozilla
41d9601018
Interpolate polyobjects properly for the software renderer
2024-01-30 18:57:24 -03:00
Lactozilla
c7c13e3372
Recalculate slope vectors at render time
2024-01-30 14:29:38 -03:00
Lactozilla
b15fca4d66
Fix line slopes
2024-01-30 14:05:01 -03:00
Lactozilla
1088310ae8
Replace FIXED_TO_DOUBLE and DOUBLE_TO_FIXED with FixedToDouble and DoubleToFixed
2024-01-30 00:00:35 -03:00
Lactozilla
8847cf77b4
Minor changes
2024-01-29 23:55:12 -03:00
Lactozilla
6180ddde32
Fix slope plane distortion
2024-01-29 22:08:22 -03:00
sphere
4649f3a46b
Merge branch '1173-next-moved-upnp-to-it-s-own-thread' into 'next'
...
Resolve "[NEXT] moved UPnP to it's own thread"
Closes #1173
See merge request STJr/SRB2!2263
2024-01-29 13:59:00 +00:00
sphere
225f085937
Merge branch 'optimize-batch-sorting' into 'next'
...
Optimize polygon sorting on batch renderer
See merge request STJr/SRB2!2253
2024-01-29 13:58:13 +00:00
sphere
4407b70fbb
Merge branch 'fix-ban-corruption' into 'next'
...
Fix bans by remote admins corrupting banlist
See merge request STJr/SRB2!2266
2024-01-29 13:57:09 +00:00
sphere
770bc934b1
Merge branch 'visit-unlockables-fix' into 'next'
...
Update & save unlockables when visiting a new map
Closes #1122
See merge request STJr/SRB2!2279
2024-01-29 13:55:43 +00:00
sphere
9e8020276f
Merge branch 'fix-3d-floor-skewtd' into 'next'
...
Fix 3D floor texture skewing
See merge request STJr/SRB2!2281
2024-01-29 13:55:40 +00:00
sphere
5a00859baa
Merge branch 'bouncy-nights-fixes' into 'next'
...
General NiGHTS Fixes
See merge request STJr/SRB2!2199
2024-01-29 13:55:25 +00:00
sphere
f6cd5ab13e
Merge branch 'fix-removed-viewmobj-segfault' into 'next'
...
Fix segfault when setting up view frame for a removed mobj
See merge request STJr/SRB2!2270
2024-01-29 13:53:59 +00:00
Lactozilla
1a63e72f5c
Fix #1183
...
- Fixed an incorrect access of skincolor_remaps[] in R_GetTranslationRemap
- Fixed R_GetTranslationForThing not being able to apply a translation over TC_RAINBOW or TC_DASHMODE
- OpenGL: Fixed MF2_LINKDRAW sprites possibly not using the correct translation
2024-01-29 04:32:52 -03:00
Lactozilla
61701c3c53
Fix 3D floor texture skewing
2024-01-29 03:54:15 -03:00
MIDIMan
ccb2785c44
Merge branch SRB2:next into disable-powerup-hud
2024-01-28 17:27:32 +00:00
Sally Coolatta
1e04896d3f
Update & save unlockables when visiting a new map
...
Resolves #1122
2024-01-26 15:37:38 -05:00
Lactozilla
36e64cb683
Merge branch 'fix-1177' into 'next'
...
Fix #1177
Closes #1177
See merge request STJr/SRB2!2268
2024-01-21 23:57:33 +00:00
