Commit graph

15286 commits

Author SHA1 Message Date
Arthur
532abf9279 dc_texheight must be (INT64) to prevent overflow and rendering softlock 2024-02-16 12:48:28 -05:00
Logan Aerl Arias
2747e30f8c Merge branch 'dedicated-server-build' into 'next'
Add dedicated server build

See merge request STJr/SRB2!2246
2024-02-15 18:07:32 +00: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
aa8fa149a7 GitLab CI: need libpng to read PNG textures, even for DEDICATED builds 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
Logan Aerl Arias
4f2879f31b Update .gitlab-ci.yml file
The Alpine 3 GCC build job now does the dedicated server build
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
Logan Aerl Arias
fa690e0190 Merge branch 'VSFix' into 'next'
Visual Studio compiles again

See merge request STJr/SRB2!2315
2024-02-14 23:57:54 +00: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
Alam Ed Arias
dfd47733e2 Merge branch 'fix-command-line-input' into 'next'
Fix input via command line/terminal not working

See merge request STJr/SRB2!2296
2024-02-14 17:26:45 +00:00
Alam Ed Arias
3a5c5410bf Merge branch SRB2:next into fix-command-line-input 2024-02-14 17:12:05 +00:00
Sal
f09dd25bbb Merge branch 'gamedata-check' into 'next'
Fix G_SaveGameData crash if quit early

See merge request STJr/SRB2!2313
2024-02-14 10:40:50 +00: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
spherallic
e26f1b4027 Restore overwritten linedef action in UZB config 2024-02-13 16:48:04 +01:00
spherallic
985b3f9fc3 Update UZB config files 2024-02-13 16:45:06 +01: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
65da8e5291 Merge branch 'batocera' into 'next'
Update .gitlab-ci.yml file

See merge request STJr/SRB2!2278
2024-02-13 00:26:00 +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
74b65956df Merge branch 'emblemexitfix' into 'next'
Only Award Bonuses / Record Attack Emblems from Physically Beating a Level

See merge request STJr/SRB2!2161
2024-02-12 05:40:42 +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
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
Logan Aerl Arias
8ef47be7a3 Merge branch 'SDL2-update-to-v2.30.0' into 'next'
update SDL2 to v2.30.0

See merge request STJr/SRB2!2307
2024-02-12 04:33:26 +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
Logan Aerl Arias
197243140f update SDL2 to v2.30.0
update SDL2 to v2.30.0
2024-02-11 22:33:08 -05:00
Logan Aerl Arias
c16791bc11 Update cpm-libgme.cmake
remove link to ZLIB
2024-02-11 22:00:34 +00:00
Alam Ed Arias
b9ff85332f Merge branch 'master' into next 2024-02-11 16:48:19 -05:00
Alam Ed Arias
fbc8a3524c Update .gitlab-ci.yml file
Do not care for single-bit-bitfield-constant-conversion warnings
2024-02-11 16:45:47 -05:00
Logan Aerl Arias
ec90c87fb8 Merge branch 'zlib-update-to-v1.3.1' into 'next'
update zlib to v1.3.1

See merge request STJr/SRB2!2303
2024-02-11 05:29:02 +00:00
Logan Aerl Arias
6bc6a428c9 add static library files for zlib
add static library files for zlib
2024-02-11 00:20:12 -05:00