Alam Ed Arias
|
4258e898ff
|
whitespace cleanup
|
2025-01-21 23:26:47 -05:00 |
|
Alam Ed Arias
|
62e8da196d
|
Merge branch 'add-cmake-to-gitlab-ci-jobs' into 'master'
add cmake to the gitlab ci jobs
See merge request STJr/SRB2!2608
|
2025-01-21 22:13:26 +00:00 |
|
Logan Aerl Arias
|
f691d35ee9
|
add cmake to the gitlab ci jobs
|
2025-01-21 22:13:26 +00:00 |
|
Alam Ed Arias
|
89daa40fb0
|
CireceCI: ignore unused results with CFLAGS
|
2025-01-21 17:10:40 -05:00 |
|
Alam Ed Arias
|
953dbad848
|
CireceCI: ignore unused results
|
2025-01-21 17:06:50 -05:00 |
|
Alam Ed Arias
|
ef9aa81b06
|
CircleCI: make deps folder
|
2025-01-21 16:59:36 -05:00 |
|
Alam Ed Arias
|
5fa0f7b8d1
|
CircleCI: fixup linux64 build
|
2025-01-21 16:54:33 -05:00 |
|
Logan Aerl Arias
|
04c67be84a
|
Merge branch 'parenthesaurus' into 'master'
Fix pipeline broken on clang
See merge request STJr/SRB2!2593
|
2025-01-18 05:04:16 +00:00 |
|
pastel
|
1e58ccb8aa
|
Fix pipeline broken on clang
|
2025-01-18 05:04:16 +00:00 |
|
Radicalicious
|
7b6bf97664
|
2.2.14 - final asset updates
|
2025-01-16 19:09:33 -06:00 |
|
Radicalicious
|
60bd1527de
|
Update m_menu.c
|
2025-01-16 18:26:54 -06:00 |
|
Lactozilla
|
2dd5f664ac
|
Merge remote-tracking branch 'public/next' into 2214
|
2025-01-16 15:04:32 -03:00 |
|
Lactozilla
|
92022bd509
|
Reapply "Merge branch 'slopecontrast-fix' into 'next'"
This reverts commit 1bb51b0ed3.
|
2025-01-16 15:03:36 -03:00 |
|
Lactozilla
|
b58ad6492b
|
Revert "Remove OpenGL-only fake contrast cvars"
This reverts commit 64aefe7322.
|
2025-01-16 14:57:21 -03:00 |
|
Lactozilla
|
8fbbf802e6
|
Update copyrights to 2025
|
2025-01-16 14:13:30 -03:00 |
|
Alam Ed Arias
|
4378b29627
|
Merge branch 'public_next' into 2214
|
2025-01-16 09:19:30 -05:00 |
|
Radicalicious
|
8664705cda
|
2.2.14
|
2025-01-15 20:30:40 -06:00 |
|
Radicalicious
|
e1cd2ecda7
|
Update p_mobj.c
|
2025-01-15 16:30:41 -06: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
|
1c2c4d43a6
|
Merge branch 'public_next' into 2214
|
2025-01-11 08:24:51 -05: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 |
|