Commit graph

13613 commits

Author SHA1 Message Date
Alam Ed Arias
53d74e7f89 Clean up stringop-overflow=4 warnings 2024-02-20 13:17:50 -05: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
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
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
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
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
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