Lactozilla
|
8701ef41f6
|
Remove Facebook URL from the README
|
2025-01-25 19:35:40 -03: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
|
117e59a3d8
|
Merge branch 'fix-lua-skin-sprites-compat' into 'next'
Fix skin.sprites[i] when used with FF_SPR2SUPER
See merge request STJr/SRB2!2613
|
2025-01-23 18:17:19 +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 |
|
Alam Ed Arias
|
c279b8140c
|
Merge branch 'public_next' into 2215
|
2025-01-21 18:47:16 -05:00 |
|
Alam Ed Arias
|
e496758f27
|
Merge branch 'master' into next
|
2025-01-21 17:37:09 -05:00 |
|
Lactozilla
|
019fe32a41
|
Update asset hashes
|
2025-01-21 19:14:55 -03: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 |
|
Lactozilla
|
250928f6df
|
Merge remote-tracking branch 'public/next' into 2215
|
2025-01-21 18:55:26 -03:00 |
|
Alam Ed Arias
|
5fa0f7b8d1
|
CircleCI: fixup linux64 build
|
2025-01-21 16:54:33 -05: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
|
94c536e1b1
|
Merge branch 'level-select-fix' into 'next'
Only show level select option if started a session from a level select
See merge request STJr/SRB2!2611
|
2025-01-21 21:23:38 +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 |
|
Lactozilla
|
20a72e2ece
|
Merge branch 'selectcuts' into 'next'
Fix single player level select conditions (resolves #1385)
Closes #1385
See merge request STJr/SRB2!2609
|
2025-01-21 20:55:26 +00:00 |
|
Neon
|
f1006ece34
|
Spawn Torchflower's flame after the original object is scaled from a mapthing
|
2025-01-21 01:31:57 +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 |
|