Commit graph

16341 commits

Author SHA1 Message Date
Radicalicious
14a6469d66 Merge branch 'jetfume-skin-flag' into 'next'
Implement custom jet fume functionality

Closes #1391

See merge request STJr/SRB2!2636
2025-02-18 04:13:03 +00:00
Radicalicious
860017ad32 Merge branch 'next' into jetfume-skin-flag 2025-02-17 21:56:05 -06:00
Radicalicious
692971d7b9 Merge branch 'fix-1335' into 'next'
Fix wall transfer cap for slopes with angles beyond the first quadrant

Closes #1335

See merge request STJr/SRB2!2579
2025-02-18 01:24:39 +00:00
Lactozilla
192055416b Merge branch 'fix-seename-offline' into 'next'
Reset seenplayer on netgame exit

See merge request STJr/SRB2!2634
2025-02-16 22:42:10 +00:00
Craftyawesome
d2ad04a105 reset seenplayer on netgame exit 2025-02-16 17:01:40 -05:00
Logan Aerl Arias
acc1b829bd Merge branch 'master' into next 2025-02-16 09:16:07 -05:00
Logan Aerl Arias
4f64a5fb3d Merge branch 'gitci-Windows-fix' into 'master'
use Unix Makefiles to build Win

See merge request STJr/SRB2!2641
2025-02-16 13:59:38 +00:00
Logan Aerl Arias
f7ae70201f use Unix Makefiles to build Win 2025-02-16 13:59:38 +00:00
Lactozilla
fd1fd9d4fb Merge branch 'fix-1394' into 'next'
Fix #1394

Closes #1394

See merge request STJr/SRB2!2619
2025-02-16 13:38:05 +00:00
Lactozilla
4f2f360708 Merge branch 'fix-scaled-plane-ripple' into 'next'
Fix ripple effect in scaled planes

See merge request STJr/SRB2!2618
2025-02-16 13:36:58 +00:00
Lactozilla
d6daab06e5 Merge branch 'fix-splitscreen-it-sign' into 'next'
Fix IT sign always displaying for the tagger in splitscreen

See merge request STJr/SRB2!2624
2025-02-16 13:35:57 +00:00
Lactozilla
e6f4362bd0 Merge branch 'fix-hud-render-performance' into 'next'
Improve HUD rendering when drawing stretched patches

Closes #1408

See merge request STJr/SRB2!2635
2025-02-16 13:11:54 +00:00
Lactozilla
3cd84dfcc4 Merge branch 'fix-1393' into 'next'
Fix #1393

Closes #1393

See merge request STJr/SRB2!2620
2025-02-16 13:07:57 +00:00
Logan Aerl Arias
6771d0e88b Merge branch 'vcpkg-miniupnpc-fix' into 'master'
fix issue with static mingw build on Windows

See merge request STJr/SRB2!2640
2025-02-16 12:41:29 +00:00
Logan Aerl Arias
1f66341d59 fix issue with static mingw build on Windows 2025-02-16 12:41:29 +00:00
Alam Ed Arias
ed3514fda4 Merge branch 'master' into jetfume-skin-flag 2025-02-08 22:48:30 -05:00
Lactozilla
0b84b3688a Implement color cycling toggle 2025-02-09 00:25:34 -03:00
Lactozilla
d5f970b31d Implement custom jet fume functionality 2025-02-09 00:06:59 -03:00
Alam Ed Arias
d467f842f7 Merge branch 'master' into fix-hud-render-performance 2025-02-08 17:10:57 -05:00
Alam Ed Arias
17696f8f83 Merge remote-tracking branch 'Alam/next' into next 2025-02-08 17:10:09 -05:00
Gustaf Alhäll
e05eea0175 Improve HUD rendering when drawing stretched patches 2025-02-08 22:08:07 +01:00
Alam Ed Arias
620bb5054f GitlabCI: use lipo to create universal darwin binary 2025-02-07 00:40:21 -05:00
Alam Ed Arias
1e47cb2061 GitlabCI: checks if osxcross arm64 build fails 2025-02-06 18:51:58 -05:00
Alam Ed Arias
ec3edcc6c9 GitlabCI: install static version of curl, libopenmpt,libsdl2-mixer,libpng and libxmp for macs 2025-02-06 15:31:26 -05:00
Alam Ed Arias
10bb905ebd GitlabCI: use cmake --build to compile and not call directly Makefile files 2025-02-06 12:27:22 -05:00
LJ Sonic
366b71136a Merge branch 'lua-debug-library' into 'next'
Expose debug library to Lua

See merge request STJr/SRB2!2404
2025-02-05 19:41:30 +00:00
Alam Ed Arias
666b9b7df4 GitLibCI: installing g++ also installs gcc, one less manually install package 2025-02-01 11:15:38 -05:00
Lactozilla
a172297cfb Fix IT sign always displaying for the tagger in splitscreen 2025-01-30 22:47:26 -03: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
Alam Ed Arias
37ce0043f1 GitLabCI: install g++ 2025-01-27 23:10:30 +00: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
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