Commit graph

15939 commits

Author SHA1 Message Date
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
MIDIMan
f78f1aa73a Merge branch SRB2:next into mobj-alpha 2024-02-25 01:15:12 +00:00
Logan Aerl Arias
eab8df9f35 auto build MacOSX binary for x86_64 2024-02-24 20:13:13 -05:00
Logan Aerl Arias
2ca791a2ad disable libgme by default 2024-02-24 20:13:13 -05:00
Alam Ed Arias
1a8311d8ed 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 20:13:13 -05:00
Alam Ed Arias
4190106f2e Gitlab CI: cmake create config.h, keep that as an artifact 2024-02-24 20:13:13 -05:00
Alam Ed Arias
d168bbaff3 compiling SRB2 with OSXCROSS 2024-02-24 20:13:13 -05:00
MIDIMan
de8464cd2f Add alpha support for mobjs 2024-02-24 20:13:13 -05: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
spherallic
94db9ddf12 Make chat word wrapping consistent with how it was before 2024-02-25 01:48:42 +01: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
spherallic
73b90d13eb Merge branch 'next' into font_drawer 2024-02-25 00:58:04 +01: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
04ac253acf Merge branch 'next' into remove-opengl-chromakey 2024-02-24 14:45:22 -03:00
Lactozilla
f16836bd81 Changes:
- Renamed renderwalls, renderfloors and renderthings
- Removed CV_NOTINNET|CV_CHEAT from renderwalls, renderfloors and renderthings
- Moved some cvars to proper places
2024-02-24 14:43:21 -03:00
Lactozilla
2d3dd624f5 Merge branch 'next' into texture-scaling-fixes 2024-02-24 14:22:41 -03: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
Logan Aerl Arias
52f53f03b7 Merge branch 'next' into instant-setscale 2024-02-24 11:42:27 -05:00
Logan Aerl Arias
9014e911d3 Merge branch SRB2:next into improve-backtrace 2024-02-24 16:20:26 +00:00
Logan Aerl Arias
d7086168b8 Merge branch 'next' into fruits-clipper 2024-02-24 11:18:12 -05:00
Zwip-Zwap Zapony
34afebfc06 Revert P_SuperReady to a boolean transform type 2024-02-24 15:41:51 +01:00
Zwip-Zwap Zapony
90958614f3 Shield button touchups 2024-02-24 15:41:36 +01: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
SSNTails
d43d5fb9e1 Don't change drawangle while riding on a fan 2024-02-23 15:23:39 -05: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
Alam Ed Arias
8c7fe2ae95 Make tokenizer keep a copy of string in normal memory 2024-02-21 21:41:16 -05:00
SSNTails
ea218c2e68 Can't have a radius of 0 here! 2024-02-21 19:25:57 -05:00
Arthur
a407ff8899 Zwip Zwap Zapony's suggestion to use a consvar 2024-02-21 16:22:00 -05:00
Arthur
716b9527bf Add a -allowdesync parameter that will allow individual demos to desync. Warning is still shown, but player position will not be modified. 2024-02-21 14:38:11 -05:00