Logan Aerl Arias
bb1292a8de
Merge branch 'next' into any-resolution
2024-03-10 10:10:48 -04:00
sphere
df18cc0960
Merge branch 'font_drawer' into 'next'
...
Refactor string drawing functions
See merge request STJr/SRB2!1726
2024-03-10 12:48:59 +00:00
Logan Aerl Arias
9335b0082f
fixup try
...
screen.h: viddef_s: remove duplicate member fdup and bpp
i_video.c: Impl_InitOpenGL: fix list of functions to find in Impl_InitOpenGL
hw_main.c : remove FOV?
d_main.c: put back in viewnumber parm in same funcs
hw_main.c : put back in viewnumber parm in same funcs
r_opengl.c: remove MakeScreenFinalTexture()
2024-03-10 01:24:29 -05:00
Logan Aerl Arias
7a2bc2752c
Merge branch 'next' into any-resolution
2024-03-10 00:01:17 -05:00
spherallic
31e58f1156
Rewrite aligned string drawing, using a modified version of strtok
2024-03-09 18:08:02 +01:00
spherallic
444cfc180f
Use alignment enum for drawing aligned font strings
2024-03-08 00:39:53 +01:00
spherallic
02f31a4922
Add character width to font definitions
...
Used for V_MONOSPACE and V_OLDSPACING instead of spacewidth*2
2024-03-07 21:36:59 +01:00
sphere
33a1776f97
Merge branch 'issue1211' into 'next'
...
Fixes Issue #1211 - cut the amplitude on OpenGL water wave effect
See merge request STJr/SRB2!2381
2024-03-07 12:50:14 +00:00
sphere
6adfe7a829
Merge branch 'forceshieldhp' into 'next'
...
Show extra Force Shield hits using text instead of stacking more icons
See merge request STJr/SRB2!2378
2024-03-07 12:22:35 +00:00
sphere
4faa429f43
Merge branch 'issue1040' into 'next'
...
Fixes Issue #1040
See merge request STJr/SRB2!2377
2024-03-07 12:09:12 +00:00
sphere
3c0761f8fe
Merge branch 'fix-players-idle-kick-cutscene' into 'next'
...
Fix players getting kicked by auto-kick during cutscenes
See merge request STJr/SRB2!2384
2024-03-07 12:08:13 +00:00
sphere
ee96ed12a4
Merge branch 'more-sprite2' into 'next'
...
Add 'sprite2' field to states
See merge request STJr/SRB2!2211
2024-03-07 12:06:48 +00:00
Logan Aerl Arias
d2a068d158
Merge branch SRB2:next into issue1040
2024-03-04 17:21:35 +00: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
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
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
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
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
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
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
