Commit graph

13692 commits

Author SHA1 Message Date
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
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
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
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
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
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
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