Commit graph

15419 commits

Author SHA1 Message Date
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
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
Alam Ed Arias
8c7fe2ae95 Make tokenizer keep a copy of string in normal memory 2024-02-21 21:41:16 -05:00
Hanicef
0d598150b3 Fix insane TTY input latency 2024-02-21 20:22:23 +01:00
Lactozilla
6cdaf24a27 Delete the last remnants of Doom Legacy's pic_t format 2024-02-19 21:57:10 -03:00
Logan Aerl Arias
a8a92a57a7 Merge branch '1200-next-cannot-load-game-when-using-srb2-launcher' into 'next'
Do not alllow error codepaths of UPnP to leave the mutex locked

Closes #1200

See merge request STJr/SRB2!2349
2024-02-20 00:36:39 +00:00
Logan Aerl Arias
393b46a924 Merge branch 'issue1150b' into 'next'
Issue #1150 - Fix it the right way!

See merge request STJr/SRB2!2350
2024-02-20 00:27:35 +00:00
Arthur
cf0834d917 Fix it the right way! 2024-02-19 19:16:38 -05:00
sphere
fed08744ba Revert "Merge branch 'issue1150' into 'next'"
This reverts merge request !2334
2024-02-19 23:50:56 +00:00
Alam Ed Arias
15b1842a6d Merge remote-tracking branch 'origin/1200-next-cannot-load-game-when-using-srb2-launcher' into 1200-next-cannot-load-game-when-using-srb2-launcher 2024-02-19 18:19:58 -05:00
Alam Ed Arias
11edc020ce i_tcp.c: do not alllow error codepaths of UPnP to leave the mutex locked 2024-02-19 18:19:28 -05:00
sphere
69757fb956 Merge branch 'fix-gl-shaders-colormap' into 'next'
Fix tint equation shader

See merge request STJr/SRB2!2348
2024-02-19 23:14:03 +00:00
sphere
00d057c1c2 Merge branch 'upnp-status-log-only' into 'next'
Print UPnP status to log file/external console only

See merge request STJr/SRB2!2347
2024-02-19 23:13:58 +00:00
sphere
0f6a77849f Merge branch 'delete-docs' into 'next'
Delete outdated docs

See merge request STJr/SRB2!2346
2024-02-19 23:13:45 +00:00
sphere
13d64f4cc5 Merge branch 'udmf-spec' into 'next'
Add UDMF specification document

See merge request STJr/SRB2!2345
2024-02-19 23:13:40 +00:00
sphere
2065cc1191 Merge branch 'issue1034' into 'next'
Cutscene timing fixed

See merge request STJr/SRB2!2344
2024-02-19 23:13:35 +00:00
Alam Ed Arias
9c5d470bef Merge branch 'master' into next 2024-02-19 18:07:54 -05:00
Alam Ed Arias
dd54f749f2 Merge branch 'freebsd-memfix-cmake' into 'master'
Fix FreeBSD memory reporting if built with cmake

See merge request STJr/SRB2!2314
2024-02-19 23:07:23 +00:00
Lactozilla
7433137e98 Fix tint equation shader 2024-02-19 19:23:40 -03:00
Lactozilla
5a46f12c62 Merge branch 'next' into delete-unused-render-code 2024-02-19 19:20:48 -03:00
Lactozilla
a3a120e57e Delete outdated docs 2024-02-19 19:13:09 -03:00
Lactozilla
2d31e0169d Update copyright text 2024-02-19 19:11:08 -03:00
SteelT
802a1de11b Print UPnP status to log file/external console only
I don't think It's not really important enough that it's worth always notifying the user about it.
2024-02-19 17:11:05 -05:00
Lactozilla
ba81f5749f Add UDMF specification document 2024-02-19 19:07:11 -03:00
SSNTails
d4074e5d4e Merge branch SRB2:next into issue1034 2024-02-19 21:59:46 +00:00
Arthur
a9b003d35c If somebody's gonna watch the intro 50+ times, it's gonna be me. :) 2024-02-19 16:59:20 -05:00
SteelT
6bcbf658de Merge branch 'ogl-palette-rendering' into 'next'
OpenGL palette rendering and related things

See merge request STJr/SRB2!1516
2024-02-19 21:42:20 +00:00
SteelT
91980907b9 Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into ogl-palette-rendering 2024-02-19 16:04:47 -05:00
sphere
7a3d88fcc6 Merge branch 'fix-translucent-pixels-on-transparent-pixels' into 'next'
Fix translucent pixels being visible on empty pixels

See merge request STJr/SRB2!2335
2024-02-19 13:35:13 +00:00