Lactozilla
|
e7970fc59a
|
Merge branch 'fix-miscolored-chat' into 'next'
Make chat aware of team colors on normal chat plus custom team colors
See merge request STJr/SRB2!2588
|
2025-01-20 02:12:30 +00:00 |
|
Lactozilla
|
f53086896c
|
Merge branch 'remove-redundant-mobj-state' into 'next'
Remove redundant P_CyclePlayerMobjState function
See merge request STJr/SRB2!2601
|
2025-01-20 02:09:26 +00:00 |
|
Lactozilla
|
c935d0a5a2
|
Merge branch 'getsprite2patch-fallback' into 'next'
Make v.getSprite2Patch able to fallback to non-super sprites
See merge request STJr/SRB2!2597
|
2025-01-20 02:08:24 +00:00 |
|
Gustaf Alhäll
|
8f388ef9ae
|
Remove redundant P_CyclePlayerMobjState function
|
2025-01-19 18:21:16 +01:00 |
|
Lactozilla
|
5d79cf674c
|
Merge branch '1378-2-2-14-character-continue-icon-xtrac0-doesn-t-properly-show-for-all-characters-both-vanilla' into 'next'
Fix #1378
Closes #1378
See merge request STJr/SRB2!2599
|
2025-01-19 04:39:09 +00:00 |
|
Lactozilla
|
00c928d930
|
Fix #1378
|
2025-01-18 21:50:30 -03:00 |
|
Lactozilla
|
9506ec138a
|
Merge branch 'fix-team-scoreboard-again' into 'next'
Fix team scoreboards: The sequel
See merge request STJr/SRB2!2598
|
2025-01-18 21:40:35 +00:00 |
|
Lugent
|
3e4df506d0
|
Better formatting
|
2025-01-18 17:22:37 -04:00 |
|
Lugent
|
be9adc3883
|
Fix it team scoreboard properly
|
2025-01-18 17:05:17 -04:00 |
|
Lactozilla
|
d92e293385
|
Merge branch 'wrongfiles' into 'next'
Fix file downloader checking the old asset file names
See merge request STJr/SRB2!2596
|
2025-01-18 18:05:54 +00:00 |
|
Lactozilla
|
52b88d63fe
|
Make v.getSprite2Patch able to fallback to non-super sprites
|
2025-01-18 14:57:09 -03:00 |
|
pastel
|
6f1a11567c
|
Fix file download checking the old asset file names
|
2025-01-18 09:34:20 -06:00 |
|
Radicalicious
|
a67a6ca3b8
|
Merge branch 'fix-ugly-knux' into 'next'
Fix freeslots + add DeltaSanic to the credits
See merge request STJr/SRB2!2592
|
2025-01-18 13:05:48 +00:00 |
|
Logan Aerl Arias
|
c9257f003d
|
Merge branch 'master' into fix-ugly-knux
|
2025-01-18 05:36:11 -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
|
d1013fdd66
|
Update m_menu.c
|
2025-01-17 21:08:35 -06:00 |
|
Radicalicious
|
b22c89ed22
|
Fix freeslots + add DeltaSanic to the credits
|
2025-01-17 20:32:00 -06: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
|
db606d0111
|
Fix bruh moment
|
2025-01-12 11:42:11 -04:00 |
|
Lugent
|
201d0fd023
|
Make chat aware of team colors on normal chat plus custom team colors
|
2025-01-12 11:23:33 -04: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 |
|