Commit graph

16170 commits

Author SHA1 Message Date
Lactozilla
8fbbf802e6 Update copyrights to 2025 2025-01-16 14:13:30 -03:00
LJ Sonic
71602b087d Merge branch 'fix-teamintermission' into 'next'
Fix #1342

Closes #1342

See merge request STJr/SRB2!2587
2025-01-14 18:11:32 +00:00
Lugent
3d6d53a926 Oops, forgot the commit. 2025-01-12 00:54:27 -04:00
Alam Ed Arias
1bb51b0ed3 Revert "Merge branch 'slopecontrast-fix' into 'next'"
This reverts merge request !2585
2025-01-11 13:12:08 +00:00
Alam Ed Arias
419aca414d Merge branch 'slopecontrast-fix' into 'next'
Fix slope contrast

See merge request STJr/SRB2!2585
2025-01-10 07:08:31 +00:00
Alam Ed Arias
95bdd7729b Merge branch SRB2:next into slopecontrast-fix 2025-01-10 06:56:42 +00:00
Alam Ed Arias
209ba5e7cf Merge branch 'improve-sleep-accuracy' into 'next'
Further improve sleep accuracy on UNIX systems

Closes #1210

See merge request STJr/SRB2!2583
2025-01-10 06:56:03 +00:00
Alam Ed Arias
7d8f442ea5 Merge branch SRB2:next into improve-sleep-accuracy 2025-01-10 06:36:46 +00:00
Alam Ed Arias
e003defd66 Merge branch 'haiku-update-support' into 'next'
Update outdated __HAIKU__ directives

See merge request STJr/SRB2!2569
2025-01-10 06:36:03 +00:00
Alam Ed Arias
3a0c38e418 Merge branch 'next' into 'next'
Fix CMake not finding OpenMPT on Haiku

See merge request STJr/SRB2!2570
2025-01-10 06:33:16 +00:00
Alam Ed Arias
96cc0f35a5 Merge branch SRB2:next into haiku-update-support 2025-01-10 06:15:14 +00:00
Alam Ed Arias
286466db27 Merge branch SRB2:next into next 2025-01-10 06:03:52 +00:00
Alam Ed Arias
6cb7549cab Merge branch 'fix-bootmap-load' into 'next'
Fix BootMap not having any effect when loaded from the addon menu

See merge request STJr/SRB2!2529
2025-01-10 06:00:46 +00:00
Alam Ed Arias
c847b1a710 Merge branch SRB2:next into fix-bootmap-load 2025-01-10 05:18:38 +00:00
Alam Ed Arias
ad0a2717bb Merge branch 'add-room-id-cvar' into 'next'
Add CVar for changing room ID

See merge request STJr/SRB2!2487
2025-01-10 05:18:00 +00:00
Alam Ed Arias
1db9679f01 Merge branch SRB2:next into add-room-id-cvar 2025-01-10 05:00:21 +00:00
Alam Ed Arias
f1a43cc028 Merge branch 'interpolation-speed-fix' into 'next'
Model animation duration fixes

See merge request STJr/SRB2!2498
2025-01-10 04:59:24 +00:00
Alam Ed Arias
671d92745c Merge branch SRB2:next into interpolation-speed-fix 2025-01-10 04:17:57 +00:00
Alam Ed Arias
ddb615161c Merge branch 'tsourdt3rdport3' into 'next'
Add actual multiplayer automap support

See merge request STJr/SRB2!2488
2025-01-10 04:02:34 +00:00
Alam Ed Arias
e355cf832e Merge branch SRB2:next into tsourdt3rdport3 2025-01-10 03:51:04 +00:00
Alam Ed Arias
93ea201a6a Merge branch 'refactor-tty-input' into 'next'
Refactor TTY input handling

See merge request STJr/SRB2!2451
2025-01-10 03:50:43 +00:00
Alam Ed Arias
89d11cf146 Merge branch SRB2:next into refactor-tty-input 2025-01-10 03:40:03 +00:00
Alam Ed Arias
d5b205d926 Merge branch 'fix-keybinding-layout-issues' into 'next'
Fix issues with custom pause menu binds

See merge request STJr/SRB2!2305
2025-01-10 03:37:59 +00:00
Hanicef
819ecb0152 Fix issues with custom pause menu binds 2025-01-10 03:37:58 +00:00
Alam Ed Arias
be3d4c9eee Merge branch 'mipmapstuff' into 'next'
Replace gluBuild2DMipmaps with GL_GENERATE_MIPMAPS

See merge request STJr/SRB2!2287
2025-01-10 03:20:16 +00:00
Alam Ed Arias
1fa444d79e Merge branch SRB2:next into mipmapstuff 2025-01-10 03:08:50 +00:00
Alam Ed Arias
1a00e636b6 Merge branch 'extra-resolutions' into 'next'
Extra resolutions

See merge request STJr/SRB2!1795
2025-01-10 03:02:30 +00:00
Spectrum (Jonathan Dove)
3b1711c028 Extra resolutions 2025-01-10 03:02:30 +00:00
Alam Ed Arias
9756b9e19b Merge branch 'fix-1310' into 'next'
Convert waddir to an absolute path

Closes #1310

See merge request STJr/SRB2!2538
2025-01-10 01:10:09 +00:00
chromaticpipe ‎
ddc1c63fc6 register slope contrast cvar so it actually works 2025-01-08 22:31:20 +00:00
LJ Sonic
41549005ed Merge branch 'rigatoni' into 'next'
Fix being unable to use CTRL keyboard shortcuts on menu input fields (resolves #1338)

Closes #1338

See merge request STJr/SRB2!2580
2025-01-08 12:52:49 +00:00
LJ Sonic
a30637a505 Merge branch 'fix-buffer-overflow-gettexturefornum' into 'next'
Fix buffer overflow when reading string from R_TextureNameForNum into Lua

Closes #1341

See merge request STJr/SRB2!2582
2025-01-08 12:46:12 +00:00
Gustaf Alhäll
fb80091ac3 Double slack time for busy-wait 2025-01-06 09:49:04 +01:00
Hanicef
1da55066d4 Slight optimization 2025-01-05 19:18:57 +01:00
Gustaf Alhäll
d20552c49d Adjust slack based on precision 2025-01-05 15:58:18 +01:00
Gustaf Alhäll
c00d139e55 Further improve sleep accuracy on UNIX systems 2025-01-04 20:12:00 +01:00
Gustaf Alhäll
f3f3fafdc4 Fix buffer overflow when reading string from R_TextureNameForNum into Lua 2025-01-04 18:27:11 +01:00
pastel
9eecedf3ae Fix being unable to use CTRL keyboard shortcuts on menu input fields 2024-12-31 14:05:51 -06:00
LJ Sonic
3e6862b1c2 Merge branch 'http-download-threaded' into 'next'
Put HTTP downloading on a background thread

See merge request STJr/SRB2!2322
2024-12-31 16:14:06 +00:00
LJ Sonic
faf87ea250 Merge branch 'fix-segfault-leftover-ztargetfocus' into 'next'
Fix segfault due to leftover ztargetfocus when switching maps

Closes #1333

See merge request STJr/SRB2!2573
2024-12-31 15:55:09 +00:00
LJ Sonic
06eb59c400 Merge branch 'fix-software-renderer-plane-overflow' into 'next'
Fix plane offsets overflow in the software renderer

Closes #1322 and #1227

See merge request STJr/SRB2!2575
2024-12-31 15:54:59 +00:00
LJ Sonic
493ba8c669 Merge branch 'two_toriel' into 'next'
Correctly force Sonic in the tutorial (resolves #1331)

Closes #1331

See merge request STJr/SRB2!2571
2024-12-31 15:54:47 +00:00
LJ Sonic
03824651e2 Merge branch 'fix-switch-perfstats-segfault' into 'next'
Fix segfault when switching perfstats screen before sampling is done

See merge request STJr/SRB2!2576
2024-12-30 16:25:20 +00:00
Hanicef
93d48ca97e Fix segfault when aborting HTTP download 2024-12-30 17:12:56 +01:00
Hanicef
c04dd70a43 Avoid double initialization of CURL 2024-12-30 16:41:10 +01:00
Hanicef
770ee7b53c Put HTTP downloading on a background thread 2024-12-30 16:41:10 +01:00
LJ Sonic
a4f907fea1 Merge branch 'fix-ioopen-crash' into 'next'
Fix io.open() crashing the client sometimes

See merge request STJr/SRB2!2578
2024-12-29 23:22:55 +00:00
LJ Sonic
91d1c11617 Fix io.open() crashing the client sometimes 2024-12-30 00:03:41 +01:00
Gustaf Alhäll
4fdb2f6b08 Fix segfault when switching perfstats screen before sampling is done 2024-12-29 13:42:36 +01:00
Gustaf Alhäll
be7c2d9dd3 Reset target focus in P_LoadLevel instead 2024-12-29 12:57:42 +01:00