Commit graph

15509 commits

Author SHA1 Message Date
Hanicef
02811b72f6 Fix segfault when trying to spawn an MT_PLAYER from Lua 2024-03-05 18:22:27 +01:00
sphere
cf7adfc8ac Merge branch 'fix-missing-hud-entry' into 'next'
Fix missing HUD item for Lua

See merge request STJr/SRB2!2383
2024-03-04 13:49:28 +00:00
Logan Aerl Arias
33940e46bf Merge branch 'remove-opengl-chromakey' into 'next'
Make the display of palette index 255 consistent between renderers

Closes #405

See merge request STJr/SRB2!2351
2024-03-04 13:31:23 +00:00
Logan Aerl Arias
f4b862068c Merge branch 'texture-scaling-fixes' into 'next'
Fix various issues related to texture scaling

See merge request STJr/SRB2!2329
2024-03-04 13:30:11 +00:00
Logan Aerl Arias
4aee720bce Merge branch 'issue1188' into 'next'
Fix #1188

Closes #1188

See merge request STJr/SRB2!2354
2024-03-03 23:55:18 +00:00
Logan Aerl Arias
add091bac4 Merge branch 'substitute-null-with-ray' into 'next'
Substitute MT_NULL with MT_RAY in Lua

See merge request STJr/SRB2!2302
2024-03-03 23:39:49 +00:00
Logan Aerl Arias
bcc0eb39ea Merge branch 'remove-NOPNG' into 'next'
if PNG graphics support is removed, it is not netplay compatible

See merge request STJr/SRB2!2260
2024-03-03 23:37:53 +00:00
Logan Aerl Arias
89620dbd9e Merge branch 'shield-button-touchups' into 'next'
Shield Button Touchups

See merge request STJr/SRB2!2257
2024-03-03 23:37:05 +00:00
Logan Aerl Arias
55a7afde52 Merge branch 'instant-setscale' into 'next'
Add and use an "instant" parameter for P_SetScale

Closes #1120

See merge request STJr/SRB2!2167
2024-03-03 23:04:55 +00:00
Logan Aerl Arias
48ead1ae81 Merge branch 'fix-it-cv-string-console-block' into 'next'
Fix console not being blocked by IT_CV_STRING

See merge request STJr/SRB2!2304
2024-03-03 22:46:54 +00:00
Logan Aerl Arias
14d640a385 Merge branch 'shield-gamepad-defaults' into 'next'
New Post-Shield-Button Gamepad Defaults

See merge request STJr/SRB2!2258
2024-03-03 17:42:22 +00:00
Logan Aerl Arias
e147ca30b9 Merge branch SRB2:next into issue1188 2024-03-03 17:22:51 +00:00
Logan Aerl Arias
2fe684351e Merge branch 'next' into remove-opengl-chromakey 2024-03-03 12:22:08 -05:00
Logan Aerl Arias
7fbdd02087 Merge branch 'next' into texture-scaling-fixes 2024-03-03 12:21:20 -05:00
Logan Aerl Arias
e5cb182662 Merge branch SRB2:next into fix-it-cv-string-console-block 2024-03-03 17:20:04 +00:00
Logan Aerl Arias
7f68a72755 Merge branch SRB2:next into substitute-null-with-ray 2024-03-03 17:19:37 +00:00
Logan Aerl Arias
f372f07bf4 libpng for everyone
zlib and libpng are now always needed
2024-03-03 12:15:12 -05:00
Logan Aerl Arias
1905116d18 Merge branch SRB2:next into shield-gamepad-defaults 2024-03-03 16:17:44 +00:00
Logan Aerl Arias
ba35849b5a Merge branch SRB2:next into shield-button-touchups 2024-03-03 16:17:08 +00:00
Logan Aerl Arias
93a191efa9 Merge branch SRB2:next into instant-setscale 2024-03-03 16:15:59 +00:00
Hanicef
8ea215bf2f Fix compiler error in clang 2024-03-03 11:36:29 +01:00
Hanicef
853afa30df Fix missing HUD item for Lua 2024-03-02 18:51:56 +01:00
Alam Ed Arias
d405305740 Merge branch 'stringop' into 'next'
Clean up stirngop warnings

See merge request STJr/SRB2!2356
2024-03-01 21:05:32 +00:00
Alam Ed Arias
1e61ab3472 Merge branch 'next' into stringop 2024-03-01 15:50:57 -05:00
Alam Ed Arias
e30a116556 Merge branch 'printfwarnings' into 'next'
Add printf formating

See merge request STJr/SRB2!2364
2024-03-01 20:49:59 +00:00
Alam Ed Arias
e0819b5a25 Add printf formating 2024-03-01 20:49:59 +00:00
Alam Ed Arias
9d15dfe036 Merge branch 'conditional-uninitialized' into 'next'
Clang: clean up conditional-uninitialized warnings

See merge request STJr/SRB2!2352
2024-03-01 19:35:04 +00:00
Alam Ed Arias
a9ef21aa50 Clang: clean up conditional-uninitialized warnings 2024-03-01 19:35:04 +00:00
Alam Ed Arias
a0c27b22c3 Merge branch 'next' into stringop 2024-02-28 13:14:11 -05:00
Logan Aerl Arias
7d26b173e5 Merge branch SRB2:next into fix-mixerx-1144 2024-02-27 18:13:52 +00:00
sphere
9b809fec6b Merge branch 'disable-powerup-hud' into 'next'
Make powerups HUD toggleable via Lua (again)

See merge request STJr/SRB2!2234
2024-02-27 12:05:36 +00:00
sphere
72a6ad80ba Merge branch 'add-per-player-mute' into 'next'
Add per-player mute

See merge request STJr/SRB2!2259
2024-02-27 10:58:59 +00:00
Hanicef
bfd6dbefe6 Add per-player mute 2024-02-27 10:58:59 +00:00
sphere
afe85ced6d Merge branch 'fix-banlist-cleared-startup-error' into 'next'
Fix banlist being cleared if server fails to start

See merge request STJr/SRB2!2379
2024-02-27 10:51:42 +00:00
Hanicef
74673b8e1b Fix banlist being cleared if server fails to start 2024-02-26 22:11:52 +01:00
sphere
908f096200 Merge branch 'fix_VSreleaseproj' into 'next'
Fix VS release project settings

See merge request STJr/SRB2!2340
2024-02-26 16:29:58 +00:00
sphere
8ccc4d60ab Merge branch 'fix-1207' into 'next'
Fix 3D floor sides not rendering properly if a light list was involved

Closes #1207 and #1204

See merge request STJr/SRB2!2373
2024-02-25 23:41:29 +00:00
sphere
6d02f1823e Merge branch 'issue1199' into 'next'
Bring back WRITETHINGS, with custom filename and UDMF support!

See merge request STJr/SRB2!2339
2024-02-25 23:36:20 +00:00
sphere
553240f7c2 Merge branch 'showinput' into 'next'
Allow input view outside of record attack

See merge request STJr/SRB2!2020
2024-02-25 14:16:44 +00:00
sphere
1cc9e17efa Merge branch 'nonightsever' into 'next'
Make NiGHTS super consistent with regular super (Closes #520 for real this time)

Closes #520

See merge request STJr/SRB2!1666
2024-02-25 13:55:44 +00:00
sphere
50bdc5f1a5 Merge branch 'whirlybird' into 'next'
Use PF_NOJUMPDAMAGE for whirlwind jump instead of removing jump flags (resolves #771)

Closes #771

See merge request STJr/SRB2!1740
2024-02-25 13:39:17 +00:00
katsy
6604f47931 Use PF_NOJUMPDAMAGE for whirlwind jump instead of removing jump flags (resolves #771) 2024-02-25 13:39:17 +00:00
Logan Aerl Arias
f07a7618eb Merge branch SRB2:next into fix-mixerx-1144 2024-02-25 05:23:59 +00:00
Logan Aerl Arias
7d66f5cdfc Merge branch SRB2:next into instant-setscale 2024-02-25 05:13:45 +00:00
Logan Aerl Arias
a73f9476f3 fixed call to P_SetScale() within A_MinusDigging() that I missed 2024-02-24 23:57:09 -05:00
Logan Aerl Arias
5ab1fc2102 Merge branch 'SDL2-downgrade-to-v2.28.5' into 'next'
Downgrade SDL2 to v2.28.5

See merge request STJr/SRB2!2369
2024-02-25 04:32:46 +00:00
Logan Aerl Arias
0dbd012029 Downgrade SDL2 to v2.28.5 2024-02-25 04:32:46 +00:00
Alam Ed Arias
f7ee9e64c9 Merge branch 'macosx-next' into 'next'
compiling SRB2 with OSXCROSS for Mac Port

See merge request STJr/SRB2!2374
2024-02-25 01:03:58 +00:00
Logan Aerl Arias
3537193b20 auto build MacOSX binary for x86_64 2024-02-25 00:52:40 +00:00
Logan Aerl Arias
235afdff72 disable libgme by default 2024-02-24 19:37:38 -05:00