Commit graph

11847 commits

Author SHA1 Message Date
LJ Sonic
02f91d8911 Merge branch 'fix-luafile-transfer' into 'next'
Prevent a single client from blocking Lua file transfers

See merge request STJr/SRB2!1435
2021-03-31 14:28:22 -04:00
LJ Sonic
6f2f727a80 Merge branch 'our-menu-system-sucks' into 'next'
Our menu system sucks. That's all I have to say.

See merge request STJr/SRB2!1445
2021-03-31 13:51:04 -04:00
LJ Sonic
2132b8690f Our menu system sucks. That's all I have to say. 2021-03-31 19:49:37 +02:00
LJ Sonic
9081a3586a Merge branch 'floorsprite-fixes' into 'next'
Floorsprite fixes

See merge request STJr/SRB2!1443
2021-03-31 12:36:39 -04:00
Jaime Ita Passos
316ecff003 [Software] A few floorsprite fixes
This fixes the texture of the floorsprite sometimes facing the wrong way, since plane rendering can change the view angle.
2021-03-29 23:04:13 -03:00
Monster Iestyn
7abc5e10e5 Merge branch 'avoid-savemoddata' into 'next'
Fix addons with custom gamedata not loading

Closes #473

See merge request STJr/SRB2!1427
2021-03-26 13:06:49 -04:00
LJ Sonic
145155c3c7 Kick clients if they take too long to download a Lua file 2021-03-25 22:43:06 +01:00
LJ Sonic
addf0e3f13 Use a separate transfer status for disconnected nodes 2021-03-25 22:28:35 +01:00
SteelT
ce8ace610f Merge branch 'no-apng-compile-fix' into 'next'
Fix unused variable warning when USE_APNG is not defined

See merge request STJr/SRB2!1343
2021-03-25 14:02:23 -04:00
Monster Iestyn
b49eeac270 Merge branch 'custom3dcrash' into 'next'
Fix sigsegv caused by bad target check in A_Custom3DRotate

See merge request STJr/SRB2!1430
2021-03-24 14:24:21 -04:00
Monster Iestyn
5b746a4853 Merge branch 'fix-opengl-drawcroppedpatch' into 'next'
Fix OpenGL V_DrawCroppedPatch (Fixes #452)

Closes #452

See merge request STJr/SRB2!1412
2021-03-24 11:34:58 -04:00
katsy
959a60d858 fix sigsegv in A_Custom3DRotate 2021-03-21 16:09:11 -05:00
Monster Iestyn
0073f25170 Fix clobbering error in hw_md2.c by adding "volatile" to png_FILE.
(Apparently Kart made this exact fix 2 years ago and it was never backported?)
2021-03-21 19:49:32 +00:00
Monster Iestyn
ea58717772 Merge branch 'print-backtrace-ii' into 'next'
Fix compile warning on Windows

See merge request STJr/SRB2!1426
2021-03-21 12:55:44 -04:00
sphere
3a0be379d3 Avoid savemoddata being set in W_InitFile to fix addons with gamedata. 2021-03-15 18:11:02 +01:00
lachablock
f0e5b721ad Disallow write_backtrace on Windows entirely 2021-03-15 15:17:55 +11:00
Lach
7878e50218 Merge branch 'final-tweaks' into 'next'
More final tweaks for 2.2.9 I guess

See merge request STJr/SRB2!1417
2021-03-14 20:52:47 -04:00
Lach
14a2f60b4a Merge branch 'dropdropSHAdow' into 'next'
Papersprite dropshadows no longer askance

Closes #409

See merge request STJr/SRB2!1408
2021-03-14 20:52:25 -04:00
Lach
9a71a1b01e Merge branch 'opengl-renderflags-fix' into 'next'
Fix a few renderflags oversights in OpenGL

See merge request STJr/SRB2!1422
2021-03-14 20:51:57 -04:00
Lach
cde974e27c Merge branch 'ogl-blend-var-fix' into 'next'
Fix for #422

Closes #422

See merge request STJr/SRB2!1425
2021-03-14 20:51:40 -04:00
Hannu Hanhi
ff29b6d9b7 Fix wrong color on player models' first frame by updating variable after loading blend texture 2021-03-13 23:07:51 +02:00
LJ Sonic
2b576eade2 Remove misleading comment 2021-03-12 19:54:01 +01:00
Lachlan Wright
f42bf71f9a Merge branch 'ogl-compileshaders-bug' into 'next'
Remove misplaced SetShader call in CompileShaders (Fixes #402)

Closes #402

See merge request STJr/SRB2!1423
2021-03-09 00:14:17 -05:00
Lachlan Wright
0b689368e3 Merge branch 'sw-culling-inaccuracy' into 'next'
Use double precision in R_StoreWallRange sloped seg culling calculations (Fixes #434)

Closes #434

See merge request STJr/SRB2!1424
2021-03-09 00:13:53 -05:00
LJ Sonic
46103ff375 Merge branch 'print-backtrace' into 'next'
Print a backtrace when SRB2 crashes in a Unix-like environment.

See merge request STJr/SRB2!1288
2021-03-07 08:26:44 -05:00
Hannu Hanhi
c08012fe8a Use double precision in R_StoreWallRange sloped seg culling calculations
Fixes culling issues in CEZ2 skybox
2021-03-06 19:56:25 +02:00
Hannu Hanhi
f39eb1ec10 Remove misplaced SetShader call in CompileShaders 2021-03-06 19:38:17 +02:00
Jaime Ita Passos
06bad96b03 Fix a few renderflags oversights in OpenGL 2021-03-02 02:27:14 -03:00
Lachlan Wright
e24ed9bd75 Merge branch 'nogmever' into 'next'
Check if GME_VERSION is defined.

See merge request STJr/SRB2!1372
2021-03-01 17:50:48 -05:00
Lachlan Wright
5ede909a1f Merge branch 'fix-flipped-bounce' into 'next'
Fix CA_BOUNCE height when flipped (Fixes #428)

Closes #428

See merge request STJr/SRB2!1373
2021-03-01 17:49:54 -05:00
Steel Titanium
85bd18eeec Merge branch 'master' into next 2021-03-01 16:55:48 -05:00
Lachlan Wright
8ea7e3498d Merge branch 'marathon-pause-fix' into 'next'
Disable pausing during score screens in marathon mode

See merge request STJr/SRB2!1416
2021-03-01 16:51:28 -05:00
Lachlan Wright
4c4b4b1f68 Merge branch 'skincolor-modif-fix' into 'next'
Fix translation colormap cache rebuilding using the old translation enumerations (fixes #443, #449, #459)

Closes #443, #449, and #459

See merge request STJr/SRB2!1421
2021-03-01 16:49:20 -05:00
Lachlan Wright
b71a9478da Merge branch 'linkdraw-scale-fix' into 'next'
Fix thing scale mismatch in R_DrawVisSprite. (Fixes #458)

Closes #458

See merge request STJr/SRB2!1420
2021-03-01 16:49:10 -05:00
Lachlan Wright
032c40863d Merge branch 'revert-e305de03' into 'next'
Revert "Merge branch 'player-speed' into 'next'"

Closes #466 and #471

See merge request STJr/SRB2!1418
2021-03-01 16:49:00 -05:00
James R
0bd0b98909 Fix dependency file trying to be made for SRB2.res and not for interface/blua/hardware files 2021-02-28 17:02:08 -08:00
James R
2a9cb311b3 I forgot to add the dep directory 2021-02-28 16:14:54 -08:00
Jaime Ita Passos
049b50a791 Change I_Error message 2021-02-28 17:47:12 -03:00
Jaime Ita Passos
f71281b498 Fix translation colormap cache rebuilding using the old translation enumerations
This was causing a buffer underwrite too. Lovely.
2021-02-28 17:05:25 -03:00
Jaime Ita Passos
95c6139b32 Fix thing scale mismatch in R_DrawVisSprite 2021-02-28 16:23:40 -03:00
sphere
943b7b5aab Merge branch 'fix-implicit-tablecheck' into 'next'
Fix "implicit declaration of function 'DEH_TableCheck'" warning

See merge request STJr/SRB2!1419
2021-02-28 12:14:28 -05:00
sphere
3fe8e01a4e Merge branch 'udb-config-bruh' into 'master'
Nice UDB config there, SRB2.

See merge request STJr/SRB2!1354
2021-02-28 11:57:30 -05:00
GoldenTails
4a0c907d34 Make it more async-signal-safe 2021-02-27 18:07:47 -06:00
GoldenTails
9a2e330af2 Print the backtrace before showing the signal handler popup. 2021-02-27 18:07:47 -06:00
GoldenTails
0c71a73513 Use file descriptors and ditch file streams, for now. 2021-02-27 18:07:47 -06:00
GoldenTails
9bc3050c49 Crash backtrace logging for NEWSIGNALHANDLER. 2021-02-27 18:07:47 -06:00
Jaime Ita Passos
a8909190ff Fix "implicit declaration of function 'DEH_TableCheck'" warning 2021-02-27 12:04:48 -03:00
James R
0243a31ee4 Merge branch 'dependency-files' into 'master'
Dependency files

See merge request STJr/SRB2!1407
2021-02-27 05:38:13 -05:00
Lachlan Wright
67b06edf3e Revert "Merge branch 'player-speed' into 'next'"
This reverts merge request !1309
2021-02-27 03:38:13 +00:00
LJ Sonic
dc9b2443ce Merge branch 'debugmode-reborn' into 'next'
Make DEBUGMODE=1 builds (finally) compile, run and work in netgames

See merge request STJr/SRB2!1405
2021-02-26 17:43:45 -05:00