Commit graph

15512 commits

Author SHA1 Message Date
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
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
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
Alam Ed Arias
dcdb4ce492 Update .gitlab-ci.yml file
Do not fallback to Linux Makefile for Mac builds`
Do not build with libgme, it needs to linked with C++ runtime library
2024-02-24 19:15:03 -05:00
Alam Ed Arias
a038315a53 Gitlab CI: cmake create config.h, keep that as an artifact 2024-02-24 19:15:03 -05:00
Alam Ed Arias
6d62319c4c compiling SRB2 with OSXCROSS 2024-02-24 19:15:03 -05:00
Eidolon
2c0622cd4d Include poll.h on UNIXCOMMON in dedicated 2024-02-24 13:23:27 -06:00
Eidolon
5008d866b9 Include poll.h on UNIXCOMMON
Apple was not including poll.h despite needing it.
2024-02-24 13:21:55 -06:00
Eidolon
4c7b2f16e7 Move MIN_SLEEP_DURATION_MS macros for Apple
These were not defined for macOS despite being necessary.
2024-02-24 13:19:22 -06:00
Lactozilla
ba3ea4a5e9 Merge branch 'delete-unused-render-code' into 'next'
Delete old and unused rendering-related code

See merge request STJr/SRB2!2341
2024-02-24 17:12:50 +00:00
Lactozilla
4c9f4e966c Delete pic_mode_t 2024-02-24 14:03:11 -03:00
Lactozilla
0664671c57 Merge branch 'next' into delete-unused-render-code 2024-02-24 14:02:33 -03:00
Lactozilla
a2355fc01e Always use R_DrawRepeatMaskedColumn and R_DrawRepeatFlippedMaskedColumn 2024-02-24 13:56:47 -03:00
Lactozilla
66234d093c Fix a regression where 3D floor sides could not render properly
Normally, when rendering a 'masked column', the variables sprtopscreen (and sometimes sprbotscreen) are used to define the screen space bounds of the column. R_DrawMaskedColumn and R_DrawFlippedMaskedColumn use these variables to determine where to start rendering the column's posts.
Rendering a 3D floor side when a light list is involved requires cutting it vertically. Part of this process involves setting windowtop and windowbottom, which are what R_DrawMaskedColumn and R_DrawFlippedMaskedColumn use instead to define the bounds in screen space of the column. To draw the columns between the 3D floor's vertical boundaries, the functions R_DrawRepeatMaskedColumn or R_DrawRepeatFlippedMaskedColumn are used to repeatedly call R_DrawMaskedColumn or R_DrawFlippedMaskedColumn respectively.
The problem is that R_DrawRepeatMaskedColumn and R_DrawRepeatFlippedMaskedColumn assume that sprtopscreen and sprbotscreen are what define the vertical positions of the column, and the consequence is, after the first time R_DrawRepeatMaskedColumn or R_DrawRepeatFlippedMaskedColumn are called for a column, no more columns are rendered, since sprtopscreen is not reset.
This issue was fixed by making R_RenderThickSideRange use R_DrawMaskedColumn and R_DrawFlippedMaskedColumn if there is a lightlist, or R_DrawRepeatMaskedColumn and R_DrawRepeatFlippedMaskedColumn if there is no lightlist.
2024-02-24 00:43:46 -03:00
Logan Aerl Arias
4d5ed85784 Merge branch 'fix-missing-mobjwasremoved-checks' into 'next'
Fix various segfaults caused by missing P_MobjWasRemoved checks

See merge request STJr/SRB2!2052
2024-02-24 03:37:57 +00:00
Logan Aerl Arias
5be61987ca Merge branch 'rendercvars' into 'next'
Rendering cvars that control rendering walls, floors, and things.

See merge request STJr/SRB2!1526
2024-02-24 03:02:48 +00:00
Logan Aerl Arias
6337a7611c Merge branch 'load-trnslate-in-folders' into 'next'
Load TRNSLATE files from folders

Closes #1206

See merge request STJr/SRB2!2370
2024-02-24 01:11:06 +00:00
sphere
f804ae42c1 Merge branch 'fix-credit-text-disappear' into 'next'
Fix credit sequence not compensating for non-green resolutions

Closes #1184

See merge request STJr/SRB2!2320
2024-02-24 00:28:28 +00:00
sphere
aa5383e7e0 Merge branch 'fix-insane-tty-latency' into 'next'
Fix insane TTY input latency

See merge request STJr/SRB2!2360
2024-02-24 00:27:38 +00:00
sphere
29580282b0 Merge branch 'maxskins-255' into 'next'
Change MAXSKINS from 256 to 255

See merge request STJr/SRB2!2365
2024-02-24 00:27:14 +00:00
Lactozilla
37ce5b669b Load TRNSLATE files from folders 2024-02-23 15:52:18 -03:00
Alam Ed Arias
e0749737d7 Merge branch 'TokenizerMem' into 'next'
Tokenizer mem

See merge request STJr/SRB2!2363
2024-02-22 19:16:25 +00:00
Zwip-Zwap Zapony
56c61a80ff Change MAXSKINS from 256 to 255
A value of -1 is sometimes reserved for "no skin", leaving 255 other values for skin numbers
2024-02-22 12:34:51 +01:00
Alam Ed Arias
b8023aeef9 Tokenizer: pad with 2 NULL bytes 2024-02-21 22:32:32 -05:00
Alam Ed Arias
da1b579cee Tokenizer_Open: pad the string with an NULL byte 2024-02-21 21:53:12 -05:00