Commits · a884abb6c8f72ce53e23f51f9c1d43a8338adc0c · STJr / SRB2 · GitLab

Snippets Groups Projects

Jan 22, 2025
- Revert "Merge branch 'shield-gamepad-defaults' into 'next'" · a884abb6
  Lactozilla authored 3 months ago
  
  This reverts commit 14d640a3, reversing changes made to d4053057.
  a884abb6
- Revert "Merge branch 'shield-button-touchups' into 'next'" · a6a57673
  Lactozilla authored 3 months ago
  
  This reverts commit 89620dbd, reversing changes made to 55a7afde.
  a6a57673
- Revert "Merge branch 'shield-button-prompt' into 'next'" · c09bdf54
  Lactozilla authored 3 months ago
  
  This reverts commit 3849ba65, reversing changes made to 2ac80138.
  c09bdf54
- Merge branch 'public_next' into 2215 · 1e1a5c23
  Alam Ed Arias authored 3 months ago
  
  1e1a5c23
- Merge branch 'public_next' into 2215 · eecb9612
  Alam Ed Arias authored 3 months ago
  
  eecb9612
- whitespace cleanup in next · a2867905
  Alam Ed Arias authored 3 months ago
  
  a2867905
- Merge branch 'master' into next · 05bef7f7
  Alam Ed Arias authored 3 months ago
  
  05bef7f7
- whitespace cleanup · 4258e898
  Alam Ed Arias authored 3 months ago
  
  4258e898
Jan 21, 2025
- Merge branch 'public_next' into 2215 · c279b814
  Alam Ed Arias authored 3 months ago
  
  c279b814
- Merge branch 'master' into next · e496758f
  Alam Ed Arias authored 3 months ago
  
  e496758f
- Update asset hashes · 019fe32a
  Lactozilla authored 3 months ago
  
  019fe32a
- Merge branch 'add-cmake-to-gitlab-ci-jobs' into 'master' · 62e8da19
  Alam Ed Arias authored 3 months ago
  
  add cmake to the gitlab ci jobs See merge request !2608
  62e8da19
- add cmake to the gitlab ci jobs · f691d35e
  Logan Aerl Arias authored 3 months ago and Alam Ed Arias committed 3 months ago
  
  f691d35e
- CireceCI: ignore unused results with CFLAGS · 89daa40f
  Alam Ed Arias authored 3 months ago
  
  89daa40f
- CireceCI: ignore unused results · 953dbad8
  Alam Ed Arias authored 3 months ago
  
  953dbad8
- CircleCI: make deps folder · ef9aa81b
  Alam Ed Arias authored 3 months ago
  
  ef9aa81b
- Merge remote-tracking branch 'public/next' into 2215 · 250928f6
  Lactozilla authored 3 months ago
  
  250928f6
- CircleCI: fixup linux64 build · 5fa0f7b8
  Alam Ed Arias authored 3 months ago
  
  5fa0f7b8
- Merge branch 'deerinheadlights' into 'next' · b7f16d64
  Lactozilla authored 3 months ago
  
  Revert "Revert invcolor tweaks for Red/Rosy/Lavender" See merge request STJr/SRB2!2595
  b7f16d64
- Merge branch 'fix-masterserver-listing' into 'next' · 5f66e675
  Lactozilla authored 3 months ago
  
  Fix in-game masterserver listing See merge request !2603
  5f66e675
- Merge branch 'firefire' into 'next' · fe79717d
  Lactozilla authored 3 months ago
  
  Hide shield overlays and not just the shield while shieldscale zero (resolves #1340) Closes #1340 See merge request !2581
  fe79717d
- Merge branch 'fix-torchflower-scaling' into 'next' · 914b50dc
  Lactozilla authored 3 months ago
  
  Fix #1370 Closes #1370 See merge request !2610
  914b50dc
- Merge branch 'level-select-fix' into 'next' · 94c536e1
  Lactozilla authored 3 months ago
  
  Only show level select option if started a session from a level select See merge request STJr/SRB2!2611
  94c536e1
- Only show level select option if started a session from a level select · 74777eeb
  Lactozilla authored 3 months ago
  
  74777eeb
- Merge branch 'selectcuts' into 'next' · 20a72e2e
  Lactozilla authored 3 months ago
  
  Fix single player level select conditions (resolves #1385) Closes #1385 See merge request STJr/SRB2!2609
  20a72e2e
- Spawn Torchflower's flame after the original object is scaled from a mapthing · f1006ece
  Neon authored 3 months ago
  
  f1006ece
Jan 20, 2025
- Fix single player level select conditions · 18e39ee4
  candelavla authored 3 months ago
  
  18e39ee4
- Fix in-game masterserver listing · 83de7c93
  Hanicef authored 3 months ago
  
  83de7c93
- Merge remote-tracking branch 'public/next' into 2215 · 507e72a4
  Lactozilla authored 3 months ago
  
  507e72a4
- Merge branch 'fix-miscolored-chat' into 'next' · e7970fc5
  Lactozilla authored 3 months ago
  
  Make chat aware of team colors on normal chat plus custom team colors See merge request STJr/SRB2!2588
  e7970fc5
- Merge branch 'remove-redundant-mobj-state' into 'next' · f5308689
  Lactozilla authored 3 months ago
  
  Remove redundant P_CyclePlayerMobjState function See merge request STJr/SRB2!2601
  f5308689
- Merge branch 'getsprite2patch-fallback' into 'next' · c935d0a5
  Lactozilla authored 3 months ago
  
  Make v.getSprite2Patch able to fallback to non-super sprites See merge request STJr/SRB2!2597
  c935d0a5
Jan 19, 2025
- Fix order of spr2defaults · d0096ff8
  Lactozilla authored 3 months ago
  
  d0096ff8
- Remove redundant P_CyclePlayerMobjState function · 8f388ef9
  Hanicef authored 3 months ago
  
  8f388ef9
- Don't make Metal Sonic or Amy grayscale when spawning them using objectplace · 9142bfbf
  Lactozilla authored 3 months ago
  
  9142bfbf
- Fix map thing type check in OP_CreateNewMapThing · 8ca2b44c
  Lactozilla authored 3 months ago
  
  8ca2b44c
- Use SPR_PLAY for all npc player boss/cameo objects · f86a7382
  Krabs authored 1 year ago and Lactozilla committed 3 months ago
  
  f86a7382
- Merge remote-tracking branch 'public/next' into 2215 · 398c51da
  Lactozilla authored 3 months ago
  
  398c51da
- Merge branch... · 5d79cf67
  Lactozilla authored 3 months ago
  
  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
  5d79cf67
- Merge remote-tracking branch 'public/next' into 2215 · 60764362
  Lactozilla authored 3 months ago
  
  60764362