Commit graph

15713 commits

Author SHA1 Message Date
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
5dd82cb7db Merge branch 'next' into more-sprite2 2024-03-03 11:16:35 -05:00
Logan Aerl Arias
93a191efa9 Merge branch SRB2:next into instant-setscale 2024-03-03 16:15:59 +00:00
Logan Aerl Arias
68599b7bfb Merge branch 'next' into fruits-clipper 2024-03-03 11:14:30 -05:00
Hanicef
8ea215bf2f Fix compiler error in clang 2024-03-03 11:36:29 +01:00
Hanicef
2804f29053 Fix players getting kicked by auto-kick during cutscenes 2024-03-02 18:57:09 +01:00
Hanicef
853afa30df Fix missing HUD item for Lua 2024-03-02 18:51:56 +01:00
MIDIMan
509adc3454 Change all remaining instances (hopefully) of UINT32 to fixed_t for alpha 2024-03-02 09:51:28 -05:00
MIDIMan
5668e02857 Merge branch SRB2:next into mobj-alpha 2024-03-01 21:34:40 +00:00
MIDIMan
a76544a376 Make alpha use fixed_t and add alpha field to precipmobj_t 2024-03-01 16:29:39 -05: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
MIDIMan
d18a4cca1e Clean up comments 2024-03-01 13:09:25 -05:00
MIDIMan
17e7aea311 Fix clang build error (hopefully) 2024-02-28 14:41:17 -05:00
MIDIMan
543004b5b6 Merge branch SRB2:next into mobj-alpha 2024-02-28 19:00:35 +00:00
Alam Ed Arias
a0c27b22c3 Merge branch 'next' into stringop 2024-02-28 13:14:11 -05:00
SSNTails
3db69342d9 Merge branch SRB2:next into issue1211 2024-02-28 02:36:38 +00:00
Arthur
45a8770deb Cut the amplitude on the underwater wave in GL 2024-02-27 21:35:51 -05:00
Logan Aerl Arias
7d26b173e5 Merge branch SRB2:next into fix-mixerx-1144 2024-02-27 18:13:52 +00:00
spherallic
7f51bb3001 Fix build errors & fix F_DrawContinueCharacter somehow becoming unused 2024-02-27 14:22:57 +01:00
Arthur
2da539ed9f Merge branch 'issue1195' of https://git.do.srb2.org/SSNTails/SRB2 into issue1195 2024-02-27 07:12:26 -05:00
Arthur
e19b9e7d24 A little bit of semantic cleanup 2024-02-27 07:12:22 -05: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
spherallic
9fb4b4cfbb Merge branch 'next' into playersetup-and-continue-lua 2024-02-27 12:31:12 +01:00
spherallic
dbc1fe8c0e Merge branch 'next' into more-sprite2 2024-02-27 12:23:14 +01: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
spherallic
e03b4c3e7e Cleanup as per ZZZ's suggestion 2024-02-26 17:15:52 +01:00
spherallic
a8a8103ab2 Show extra Force Shield hits using text instead of stacking more icons 2024-02-26 14:43:16 +01:00
SSNTails
15eaa3e8da Merge branch SRB2:next into issue1040 2024-02-26 04:12:26 +00:00
Arthur
9ef194fed4 min/max for cam_dist and cam_height 2024-02-25 23:08:18 -05: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