Alam Ed Arias
|
0976bf9f79
|
Merge commit '525edab73c0a203aa85bfcc4eda3c977afdc5682' (branch avoid-update-failed-ms) into add-noipv4-flag
|
2025-02-01 14:58:26 -05:00 |
|
Alam Ed Arias
|
ea3204b5d4
|
Merge commit '0f479f602e2bc740c54b75facafe1c8ae36034da' (avoid-update-failed-ms~1) into add-noipv4-flag
|
2025-02-01 14:30:36 -05:00 |
|
pastel
|
4b281821b1
|
Use state function argument for SF_FASTWAIT code instead of checking mobj->state-states
|
2025-01-31 14:57:11 -06:00 |
|
Gustaf Alhäll
|
571f77e334
|
Fix server never sending TOOLARGE to clients
|
2025-01-31 18:24:34 +01:00 |
|
Lactozilla
|
a172297cfb
|
Fix IT sign always displaying for the tagger in splitscreen
|
2025-01-30 22:47:26 -03:00 |
|
Gustaf Alhäll
|
aee50849ad
|
Fix port collision on IPv6 connections
|
2025-01-29 18:51:53 +01:00 |
|
Lactozilla
|
68588a4a46
|
Fix #1393
|
2025-01-28 16:53:30 -03:00 |
|
Lactozilla
|
2da8aea899
|
Fix #1394
|
2025-01-28 16:07:29 -03:00 |
|
Lactozilla
|
bfadb03333
|
Fix ripple effect in scaled planes
|
2025-01-27 16:27:16 -03:00 |
|
Alam Ed Arias
|
5162772db1
|
Merge branch SRB2:next into fix-1335
|
2025-01-27 13:17:37 +00:00 |
|
Alam Ed Arias
|
0e22c79242
|
Merge branch SRB2:next into fix-blockmap-bugs
|
2025-01-27 11:17:16 +00:00 |
|
Alam Ed Arias
|
499ccdb8a2
|
Merge branch SRB2:next into push-back-acktosend
|
2025-01-27 09:11:28 +00:00 |
|
Hanicef
|
8cbcbf8cf9
|
Fix address resolution failure in certain circumstances
|
2025-01-26 12:28:16 +01:00 |
|
Lactozilla
|
cbbe0439b5
|
Update asset hashes
|
2025-01-24 23:37:00 -03:00 |
|
Lactozilla
|
e9abba8748
|
Merge remote-tracking branch 'public/next' into 2215
|
2025-01-24 23:11:13 -03:00 |
|
Alam Ed Arias
|
596c10561f
|
Merge branch 'inline-mobjwasremoved' into 'next'
Inline P_MobjWasRemoved
See merge request STJr/SRB2!2616
|
2025-01-24 19:53:04 +00:00 |
|
Lugent
|
3b36c10d2a
|
Inline P_MobjWasRemoved
|
2025-01-24 19:53:04 +00:00 |
|
Alam Ed Arias
|
63e92b5046
|
Merge branch 'public_next' into 2215
|
2025-01-23 13:47:31 -05:00 |
|
Lactozilla
|
13df48b116
|
Merge branch 'soc-strlcpy-fix' into 'next'
Use deh_strlcpy instead of strncpy or strlcpy in SOC parser
See merge request STJr/SRB2!2614
|
2025-01-23 18:43:07 +00:00 |
|
Lactozilla
|
d314a977b8
|
Consistency
|
2025-01-23 03:23:01 -03:00 |
|
Lactozilla
|
f2a4e76295
|
Use deh_strlcpy instead of strncpy or strlcpy in SOC parser
|
2025-01-23 03:15:29 -03:00 |
|
Lactozilla
|
24a2d88eb2
|
Fix skin.sprites[i] when used with FF_SPR2SUPER
|
2025-01-22 21:40:00 -03:00 |
|
Lactozilla
|
746a014ad1
|
Re-add P_DoSuperDetransformation
|
2025-01-22 21:11:06 -03:00 |
|
Lactozilla
|
a9cff13a1c
|
Fix building
|
2025-01-22 21:03:58 -03:00 |
|
Lactozilla
|
ee6ce2a1fb
|
Revert "Merge branch 'superbutton' into 'next'"
This reverts commit 4706e80df1 , reversing
changes made to 5f98f7696e .
|
2025-01-22 21:01:45 -03:00 |
|
Lactozilla
|
a884abb6c8
|
Revert "Merge branch 'shield-gamepad-defaults' into 'next'"
This reverts commit 14d640a385 , reversing
changes made to d405305740 .
|
2025-01-22 20:54:08 -03:00 |
|
Lactozilla
|
a6a5767335
|
Revert "Merge branch 'shield-button-touchups' into 'next'"
This reverts commit 89620dbd9e , reversing
changes made to 55a7afde52 .
|
2025-01-22 20:53:37 -03:00 |
|
Lactozilla
|
c09bdf5407
|
Revert "Merge branch 'shield-button-prompt' into 'next'"
This reverts commit 3849ba65aa , reversing
changes made to 2ac80138a8 .
|
2025-01-22 20:47:39 -03:00 |
|
Alam Ed Arias
|
1e1a5c23bd
|
Merge branch 'public_next' into 2215
|
2025-01-22 00:51:16 -05:00 |
|
Alam Ed Arias
|
eecb961282
|
Merge branch 'public_next' into 2215
|
2025-01-22 00:48:49 -05:00 |
|
Alam Ed Arias
|
a286790510
|
whitespace cleanup in next
|
2025-01-22 00:43:22 -05:00 |
|
Alam Ed Arias
|
05bef7f7b0
|
Merge branch 'master' into next
|
2025-01-22 00:41:00 -05:00 |
|
Alam Ed Arias
|
4258e898ff
|
whitespace cleanup
|
2025-01-21 23:26:47 -05:00 |
|
Lactozilla
|
019fe32a41
|
Update asset hashes
|
2025-01-21 19:14:55 -03:00 |
|
Logan Aerl Arias
|
f691d35ee9
|
add cmake to the gitlab ci jobs
|
2025-01-21 22:13:26 +00:00 |
|
Lactozilla
|
250928f6df
|
Merge remote-tracking branch 'public/next' into 2215
|
2025-01-21 18:55:26 -03:00 |
|
Lactozilla
|
b7f16d64bc
|
Merge branch 'deerinheadlights' into 'next'
Revert "Revert invcolor tweaks for Red/Rosy/Lavender"
See merge request STJr/SRB2!2595
|
2025-01-21 21:53:19 +00:00 |
|
Lactozilla
|
5f66e675c9
|
Merge branch 'fix-masterserver-listing' into 'next'
Fix in-game masterserver listing
See merge request STJr/SRB2!2603
|
2025-01-21 21:49:04 +00:00 |
|
Lactozilla
|
fe79717d99
|
Merge branch 'firefire' into 'next'
Hide shield overlays and not just the shield while shieldscale zero (resolves #1340)
Closes #1340
See merge request STJr/SRB2!2581
|
2025-01-21 21:37:55 +00:00 |
|
Lactozilla
|
914b50dcb2
|
Merge branch 'fix-torchflower-scaling' into 'next'
Fix #1370
Closes #1370
See merge request STJr/SRB2!2610
|
2025-01-21 21:36:24 +00:00 |
|
Lactozilla
|
74777eeb81
|
Only show level select option if started a session from a level select
|
2025-01-21 17:56:02 -03:00 |
|
Neon
|
f1006ece34
|
Spawn Torchflower's flame after the original object is scaled from a mapthing
|
2025-01-21 01:31:57 +00:00 |
|
MIDIMan
|
fe0fd35bbc
|
Merge branch SRB2:next into fix-blockmap-bugs
|
2025-01-20 21:07:44 +00:00 |
|
pastel
|
18e39ee42e
|
Fix single player level select conditions
|
2025-01-20 14:32:56 -06:00 |
|
Gustaf Alhäll
|
83de7c93a4
|
Fix in-game masterserver listing
|
2025-01-20 16:52:58 +01:00 |
|
Lactozilla
|
507e72a4a8
|
Merge remote-tracking branch 'public/next' into 2215
|
2025-01-20 01:39:55 -03:00 |
|
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 |
|
Lactozilla
|
d0096ff89d
|
Fix order of spr2defaults
|
2025-01-19 18:05:00 -03:00 |
|
Gustaf Alhäll
|
8f388ef9ae
|
Remove redundant P_CyclePlayerMobjState function
|
2025-01-19 18:21:16 +01:00 |
|
Lactozilla
|
9142bfbf7d
|
Don't make Metal Sonic or Amy grayscale when spawning them using objectplace
|
2025-01-19 02:29:33 -03:00 |
|
Lactozilla
|
8ca2b44ccd
|
Fix map thing type check in OP_CreateNewMapThing
|
2025-01-19 02:27:50 -03:00 |
|
Krabs
|
f86a7382a6
|
Use SPR_PLAY for all npc player boss/cameo objects
|
2025-01-19 02:26:15 -03:00 |
|
Lactozilla
|
398c51dac0
|
Merge remote-tracking branch 'public/next' into 2215
|
2025-01-19 01:39:34 -03:00 |
|
Lactozilla
|
60764362e3
|
Merge remote-tracking branch 'public/next' into 2215
|
2025-01-19 01:38:16 -03:00 |
|
Lactozilla
|
00c928d930
|
Fix #1378
|
2025-01-18 21:50:30 -03: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 |
|
Eidolon
|
668a6f7541
|
Re-add inadvertently removed orbitalviolet credit
|
2025-01-18 14:30:48 -06:00 |
|
Eidolon
|
7062fe394c
|
Revert "Most Pipe Towers stuff, I'm tired"
This reverts commit db5d9053f2 .
|
2025-01-18 13:55:53 -06:00 |
|
Eidolon
|
70df636bb6
|
Revert "Add Evertone to credits and adjust some objs"
This reverts commit b91854fa25 .
|
2025-01-18 13:54:32 -06:00 |
|
Eidolon
|
5cc68e23d5
|
Revert "Trampolines!"
This reverts commit ae0886e279 .
|
2025-01-18 13:54:31 -06:00 |
|
Eidolon
|
6a453d11fd
|
Revert "Mario power up hardcoding"
This reverts commit fd60588262 .
|
2025-01-18 13:54:20 -06:00 |
|
Eidolon
|
7eaa7ca85b
|
Begin version 2.2.15 cycle
|
2025-01-18 13:52:26 -06: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 |
|
pastel
|
d263182981
|
Revert "Revert invcolor tweaks for Red/Rosy/Lavender"
This reverts commit 50fc1abf9a .
Conflicts:
src/info.c
|
2025-01-18 09:18:40 -06:00 |
|
Logan Aerl Arias
|
977ce7b34c
|
Merge branch SRB2:next into push-back-acktosend
|
2025-01-18 10:44:31 +00:00 |
|
Logan Aerl Arias
|
c9257f003d
|
Merge branch 'master' into fix-ugly-knux
|
2025-01-18 05:36:11 -05:00 |
|
Gustaf Alhäll
|
094dfe9fba
|
Fix crash when listing servers in the MS
|
2025-01-18 10:18:32 +01:00 |
|
Gustaf Alhäll
|
3578f17373
|
Fix short freeze when disconnecting from a server
|
2025-01-18 10:14:07 +01:00 |
|
Gustaf Alhäll
|
07738b61d2
|
Remove acktosend
|
2025-01-18 10:14:07 +01:00 |
|
Gustaf Alhäll
|
14020edacf
|
Clear acktosend when initializing node
|
2025-01-18 10:14:07 +01:00 |
|
Gustaf Alhäll
|
369c327e7c
|
Clean up d_net.c and push back missed acks to acktosend
|
2025-01-18 10:14:07 +01: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 |
|
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
|
95bdd7729b
|
Merge branch SRB2:next into slopecontrast-fix
|
2025-01-10 06:56:42 +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
|
96cc0f35a5
|
Merge branch SRB2:next into haiku-update-support
|
2025-01-10 06:15:14 +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
|
1db9679f01
|
Merge branch SRB2:next into add-room-id-cvar
|
2025-01-10 05:00:21 +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
|
e355cf832e
|
Merge branch SRB2:next into tsourdt3rdport3
|
2025-01-10 03:51:04 +00:00 |
|
Alam Ed Arias
|
89d11cf146
|
Merge branch SRB2:next into refactor-tty-input
|
2025-01-10 03:40:03 +00:00 |
|