Commit graph

13692 commits

Author SHA1 Message Date
Alam Ed Arias
00d1cbfd2a Revert "Update dedicated.mk "
This reverts commit a5ef42476fa8b9d96509739be9b16528fce038f5.

Also, undo the DOS EOL
2024-02-15 18:54:24 +01:00
Logan Aerl Arias
a44cb494a7 Update dedicated.mk
remove the need for libPNG in dedicated server build
2024-02-15 18:54:24 +01:00
Logan Aerl Arias
ea66bffc6b made "Alpine 3 GCC Dedicated" build 2024-02-15 18:54:24 +01:00
Logan Aerl Arias
e5637e2946 change name of binary in dedicated server build to lsrb2d 2024-02-15 18:54:24 +01:00
Hanicef
c4b076ea1b Fix compiler warning on Windows 2024-02-15 18:54:24 +01:00
Hanicef
97abc19182 Pass -mconsole on MinGW build 2024-02-15 18:54:24 +01:00
Hanicef
41975f4f40 Force NOGME=1 on dedicated build 2024-02-15 18:54:24 +01:00
Hanicef
3ca9ce2842 Avoid needing SDL=0 when building dedicated 2024-02-15 18:54:24 +01:00
Hanicef
f2a9a81786 Fix Windows build 2024-02-15 18:54:24 +01:00
Gustaf Alhäll
28f196ad3e Fix potential deadlock when using cond 2024-02-15 18:54:24 +01:00
Gustaf Alhäll
77e83ddebb Add dedicated server build 2024-02-15 18:54:24 +01:00
Hanicef
88bdc3e433 Fix MOTD not being sent to players on first join 2024-02-15 18:36:28 +01:00
Logan Aerl Arias
5a16fd138f fix path to x64 curl in VS project file
(edited by hand via WebIDE)
2024-02-14 23:53:13 +00:00
Arthur
0cb4a1397d Remove absolute paths 2024-02-14 18:04:58 -05:00
Arthur
99c91d4bb3 Visual Studio compiles again 2024-02-14 16:36:36 -05:00
Hanicef
493a7db1ee Fix thinker being added twice to mobj 2024-02-14 21:54:28 +01:00
Gustaf Alhäll
b808fde260 Fix broken titlescreen for MT_ALTVIEWMAN mobjs 2024-02-14 21:45:53 +01:00
Gustaf Alhäll
5c2821fb10 Fix faulty references when spawning mobjs 2024-02-14 21:45:52 +01:00
Alam Ed Arias
3a5c5410bf Merge branch SRB2:next into fix-command-line-input 2024-02-14 17:12:05 +00:00
SteelT
a9a1a4bf65 Fix FreeBSD memory reporting if built with cmake 2024-02-14 02:59:26 -05:00
SteelT
97afd18e96 Fix G_SaveGameData crash if quit early
Fixes a crash that can occur if data struct is passed to G_SaveGameData before it is allocated.
2024-02-14 02:27:58 -05:00
sphere
ff851dcb44 Merge branch 'get-sys-name' into 'next'
Add common I_GetSysName function

See merge request STJr/SRB2!2308
2024-02-13 15:42:30 +00:00
sphere
2675441f74 Merge branch 'freeslot-double' into 'next'
Match mobj freeslot count with SRB2Kart

See merge request STJr/SRB2!2298
2024-02-13 15:34:44 +00:00
sphere
245a53b423 Merge branch 'fix-1190' into 'next'
Fix #1190

Closes #1190

See merge request STJr/SRB2!2310
2024-02-13 15:33:59 +00:00
sphere
eaab39bbaf Merge branch 'fix-searchblockmap' into 'next'
Fix Lua 'searchBlockmap' (resolves #1191)

Closes #1191

See merge request STJr/SRB2!2309
2024-02-13 15:32:41 +00:00
Logan Aerl Arias
ae8bfbe763 Merge branch '1168-accessing-an-invalid-variable-in-ticcmd_t-crashes-the-game' into 'next'
check if LUA field exists before accessing it

Closes #1168

See merge request STJr/SRB2!2261
2024-02-12 19:58:56 +00:00
Lactozilla
356e455335 Fix #1190 2024-02-12 16:58:00 -03:00
Lactozilla
a709ff9ecd Fix Lua 'searchBlockmap' 2024-02-12 16:28:32 -03:00
Logan Aerl Arias
3087107175 Merge branch 'shieldrespawn' into 'next'
Respawn Certain Monitors in Co-op

See merge request STJr/SRB2!2152
2024-02-12 05:46:25 +00:00
SMS Alfredo
2e7fa1990a Respawn Certain Monitors in Co-op 2024-02-12 05:46:25 +00:00
Logan Aerl Arias
2df90ec96b Merge branch SRB2:next into emblemexitfix 2024-02-12 05:09:04 +00:00
Logan Aerl Arias
bf9904cfc2 Merge branch 'fireflower-icon' into 'next'
Display power-up icon for Fire Flower

See merge request STJr/SRB2!2097
2024-02-12 05:04:57 +00:00
Logan Aerl Arias
6d0fef8726 Merge branch SRB2:next into nonightsever 2024-02-12 04:53:51 +00:00
Logan Aerl Arias
bf4efe968f Merge branch 'patch-refactor' into 'next'
Patch and texture refactor

See merge request STJr/SRB2!2104
2024-02-12 04:48:36 +00:00
SteelT
ddfb59d185 Add common I_GetSysName function
Replaces the OS defines in Command_Version_f() with a common function to fetch the system name the game is currently running on.
2024-02-11 23:31:34 -05:00
Alam Ed Arias
ae25209cd1 r_draw.c: fix compiling with clang 2024-02-10 19:25:27 -05:00
sphere
58cf8293e3 Merge branch 'fix-nil-mo-spawnmobj-hook' into 'next'
Fix segfault when trying to access mo->player->mo from SpawnMobj hook

Closes #1189

See merge request STJr/SRB2!2300
2024-02-10 23:39:37 +00:00
Logan Aerl Arias
5e175a3438 add Visual Studio 2022 support (via CMAKE) 2024-02-10 14:34:03 -05:00
Logan Aerl Arias
da394a87dd add Visual Studio 2022 support (via CMAKE) 2024-02-10 19:29:48 +00:00
Hanicef
d0277b1799 fixup! Fix segfault when trying to access mo->player->mo from SpawnMobj hook 2024-02-10 20:19:45 +01:00
Hanicef
fe75a21bef Fix segfault when trying to access mo->player->mo from SpawnMobj hook 2024-02-10 19:40:27 +01:00
sphere
279820cd6c Merge branch 'slash-n' into 'next'
add checks for \n in chat messages

See merge request STJr/SRB2!2170
2024-02-10 15:22:33 +00:00
Sally Coolatta
d5c8fcac2b Match freeslot count with SRB2Kart 2024-02-10 08:52:32 -05:00
Gustaf Alhäll
1a53971c39 Fix various segfaults caused by missing P_MobjWasRemoved checks 2024-02-09 19:39:20 +01:00
Hanicef
8155313344 Fix input via command line/terminal not working 2024-02-09 18:49:32 +01:00
sphere
0c59a46d5a Merge branch 'fix-segfault-remove-thinglist' into 'next'
Fix segfault when removing mobjs while iterating thinglist

See merge request STJr/SRB2!2293
2024-02-08 23:17:54 +00:00
sphere
41613d89a1 Merge branch 'blockmap-links' into 'next'
Make objects able to collide with others if they occupy multiple blockmap cells (resolves #592)

Closes #592

See merge request STJr/SRB2!2267
2024-02-08 23:16:59 +00:00
sphere
2cfbcf7fbf Merge branch 'allow-banip-mask' into 'next'
Allow ban masks to be specified for banip

See merge request STJr/SRB2!2272
2024-02-08 23:16:47 +00:00
spherallic
7fc554bd4e Merge branch 'showinput' of git.do.srb2.org:STJr/SRB2 into showinput 2024-02-08 23:12:03 +01:00
spherallic
16b28d177e Merge branch 'next' into showinput 2024-02-08 23:09:09 +01:00
sphere
51f0758c47 Merge branch 'fix-console-double-mapping' into 'next'
Fix console binds incorrectly respecting keyboard layout

See merge request STJr/SRB2!2295
2024-02-08 21:35:05 +00:00
sphere
26c057f6e5 Merge branch 'fix-unlist-request' into 'next'
Fix /unlist request

See merge request STJr/SRB2!2294
2024-02-08 21:34:55 +00:00
sphere
0d526c0ff5 Merge branch 'http-download-port' into 'next'
HTTP downloader port

See merge request STJr/SRB2!2290
2024-02-08 21:34:36 +00:00
Hanicef
914cb167a4 Fix console binds incorrectly respecting layout keys 2024-02-08 21:50:43 +01:00
Felice D'Angelo
bdf13b6957 Fix /unlist request 2024-02-08 17:09:26 +00:00
Zwip-Zwap Zapony
21b8acf75d Change P_MobjWasRemoved to P_RemoveMobj in the error message (thanks Zwip-Zwap Zapony) 2024-02-07 20:30:20 +00:00
Hanicef
e1d15b5ed5 Fix segfault when removing mobjs while iterating thinglist 2024-02-07 18:42:24 +01:00
sphere
1b2b7658a8 Merge branch 'fix-table-key-archiving' into 'next'
Fix archiving with tables that contain tables as keys

See merge request STJr/SRB2!2245
2024-02-07 15:09:38 +00:00
Lactozilla
7724fafa0b Merge branch 'fix-1183' into 'next'
Fix #1183

Closes #1183

See merge request STJr/SRB2!2282
2024-02-06 21:54:27 +00:00
Lactozilla
9b33d5c808 Fix build warnings 2024-02-04 20:22:27 -03:00
Lactozilla
e7e54ef28c Merge remote-tracking branch 'stjr/next' into http-download-port 2024-02-04 20:08:52 -03:00
Lactozilla
321415fd19 Rephrase 2024-02-04 20:08:49 -03:00
Lactozilla
b4beaa9f43 HTTP downloader port 2024-02-04 20:00:51 -03:00
sphere
c91fc082f9 Merge branch 'oldspecnightsrecordsfix' into 'next'
Fix hud_nightsrecords in old (multiplayer) special stages

See merge request STJr/SRB2!2191
2024-02-04 21:35:36 +00:00
sphere
fd92193f7e Merge branch 'fix-slope-plane-distortion' into 'next'
Fix equation plane distortion

See merge request STJr/SRB2!2283
2024-02-04 21:33:17 +00:00
Sally Coolatta
c6a68f69ce Update unlockables before level load executors
Another issue that seems related to #1122
2024-02-04 01:22:11 -05:00
Lactozilla
053a9fc2e2 Fix netgame joining
Regression introduced by !2279.
2024-02-04 02:43:28 -03:00
Lactozilla
235bf724f0 Merge branch 'fix-sw-polyobject-interpolation' into 'next'
Interpolate polyobjects properly for the software renderer (resolves #950)

Closes #950

See merge request STJr/SRB2!2284
2024-02-02 00:08:06 +00:00
MIDIMan
5bbc1e323a Merge branch SRB2:next into disable-powerup-hud 2024-01-31 19:34:05 +00:00
sphere
bae687a1b9 Merge branch 'fix-slope-convex-sectors' into 'next'
Fix physics quirkiness on slopes with convex sectors

See merge request STJr/SRB2!2250
2024-01-30 22:38:56 +00:00
Lactozilla
41d9601018 Interpolate polyobjects properly for the software renderer 2024-01-30 18:57:24 -03:00
Lactozilla
c7c13e3372 Recalculate slope vectors at render time 2024-01-30 14:29:38 -03:00
Lactozilla
b15fca4d66 Fix line slopes 2024-01-30 14:05:01 -03:00
Lactozilla
1088310ae8 Replace FIXED_TO_DOUBLE and DOUBLE_TO_FIXED with FixedToDouble and DoubleToFixed 2024-01-30 00:00:35 -03:00
Lactozilla
8847cf77b4 Minor changes 2024-01-29 23:55:12 -03:00
Lactozilla
6180ddde32 Fix slope plane distortion 2024-01-29 22:08:22 -03:00
sphere
4649f3a46b Merge branch '1173-next-moved-upnp-to-it-s-own-thread' into 'next'
Resolve "[NEXT] moved UPnP to it's own thread"

Closes #1173

See merge request STJr/SRB2!2263
2024-01-29 13:59:00 +00:00
sphere
225f085937 Merge branch 'optimize-batch-sorting' into 'next'
Optimize polygon sorting on batch renderer

See merge request STJr/SRB2!2253
2024-01-29 13:58:13 +00:00
sphere
4407b70fbb Merge branch 'fix-ban-corruption' into 'next'
Fix bans by remote admins corrupting banlist

See merge request STJr/SRB2!2266
2024-01-29 13:57:09 +00:00
sphere
770bc934b1 Merge branch 'visit-unlockables-fix' into 'next'
Update & save unlockables when visiting a new map

Closes #1122

See merge request STJr/SRB2!2279
2024-01-29 13:55:43 +00:00
sphere
9e8020276f Merge branch 'fix-3d-floor-skewtd' into 'next'
Fix 3D floor texture skewing

See merge request STJr/SRB2!2281
2024-01-29 13:55:40 +00:00
sphere
5a00859baa Merge branch 'bouncy-nights-fixes' into 'next'
General NiGHTS Fixes

See merge request STJr/SRB2!2199
2024-01-29 13:55:25 +00:00
sphere
f6cd5ab13e Merge branch 'fix-removed-viewmobj-segfault' into 'next'
Fix segfault when setting up view frame for a removed mobj

See merge request STJr/SRB2!2270
2024-01-29 13:53:59 +00:00
Lactozilla
1a63e72f5c Fix #1183
- Fixed an incorrect access of skincolor_remaps[] in R_GetTranslationRemap
- Fixed R_GetTranslationForThing not being able to apply a translation over TC_RAINBOW or TC_DASHMODE
- OpenGL: Fixed MF2_LINKDRAW sprites possibly not using the correct translation
2024-01-29 04:32:52 -03:00
Lactozilla
61701c3c53 Fix 3D floor texture skewing 2024-01-29 03:54:15 -03:00
MIDIMan
ccb2785c44 Merge branch SRB2:next into disable-powerup-hud 2024-01-28 17:27:32 +00:00
Sally Coolatta
1e04896d3f Update & save unlockables when visiting a new map
Resolves #1122
2024-01-26 15:37:38 -05:00
Lactozilla
36e64cb683 Merge branch 'fix-1177' into 'next'
Fix #1177

Closes #1177

See merge request STJr/SRB2!2268
2024-01-21 23:57:33 +00:00
Lactozilla
0739c310b3 Merge branch 'fixes-for-2190' into 'next'
Fixes for !2190

See merge request STJr/SRB2!2273
2024-01-21 23:54:22 +00:00
Lactozilla
7cabf43e85 Merge branch 'lua-colorlib-get-sector-translation' into 'next'
Add v.getSectorColormap and P_GetSectorLightLevelAt

See merge request STJr/SRB2!2230
2024-01-21 23:54:08 +00:00
Lactozilla
5ef55cc6af Merge branch 'improve-download-refuse-message' into 'next'
Improve addon download refusal messages

See merge request STJr/SRB2!2153
2024-01-21 23:53:57 +00:00
Lactozilla
8cff33e681 Changes:
Ported skincolor cache management from the secondcolor branch
Adjusted R_GetTranslationRemap to use a similar caching scheme
Made sure that if a skincolor was updated, then related translations would be rebuilt
2024-01-20 01:47:03 -03:00
Lactozilla
9851ec56cf Correct comment 2024-01-19 21:16:20 -03:00
Lactozilla
712c274988 Add third argument to getColormap that accepts a translation name
Delete 'translations' Lua global
2024-01-19 20:50:36 -03:00
Lactozilla
4e818b87fd Support combinations of skincolors and translations 2024-01-19 20:39:28 -03:00
Hanicef
092ae9bf4d Allow ban masks to be specified for banip 2024-01-20 00:22:26 +01:00
Lactozilla
4b057f84ec Support compound translations 2024-01-19 19:35:29 -03:00
Lactozilla
6d1908c93e Changes:
Moved string conversion helpers into m_misc.c
Adapted parser to check for '"'
Check if tokenizer returned NULL
2024-01-19 17:01:27 -03:00
Lactozilla
8bbc512b14 Tokenizer changes:
Capture '"' characters
Capture ';' tokens
Implement tracking of the current line
2024-01-19 16:40:32 -03:00
Hanicef
820a70b854 Fix segfault when setting up view frame for a removed mobj 2024-01-19 00:00:53 +01:00
Lactozilla
1d2ea9b046 Fix #1177 2024-01-17 20:02:50 -03:00
Lactozilla
756e9d0d48 Link objects into multiple blockmap sectors
Ported from ZDoom
2024-01-17 19:10:19 -03:00
Logan Aerl Arias
3176abe2e4 Merge branch 'cv-can-change' into 'next'
Add can_change for console variables

See merge request STJr/SRB2!2196
2024-01-17 03:39:39 +00:00
Logan Aerl Arias
a3b79056e9 Merge branch 'translations' into 'next'
ZDoom translations

See merge request STJr/SRB2!2190
2024-01-17 03:24:54 +00:00
Lactozilla
9ac88031e1 Add 'Invert' translation 2024-01-16 20:36:31 -03:00
Lactozilla
f8d75ee077 Refactor 2024-01-16 20:35:30 -03:00
Lactozilla
2019e7df18 Throw warning on invalid translations 2024-01-16 20:17:01 -03:00
Lactozilla
76c7dccd00 Delete old pic_t format from Doom Legacy 2024-01-16 15:54:29 -03:00
Lactozilla
62db9f17d2 More refactoring 2024-01-16 15:17:58 -03:00
Lactozilla
e73f33a677 Fix build warnings 2024-01-16 14:34:38 -03:00
Lactozilla
70d8c66637 Use https URL in comment instead of http 2024-01-16 14:27:19 -03:00
Lactozilla
91a37b1018 Only read first 8 bytes of a PNG image for detection 2024-01-16 14:26:05 -03:00
Lactozilla
ee7198cb01 Update URL in Picture_IsLumpPNG
garethrees.org went down sometime December 2023 (or at least, it appears to have been wiped out.)
So I replaced the URL with an archived version of the same page
2024-01-16 14:14:08 -03:00
Lactozilla
e576aefb52 Change type from INT32 to unsigned 2024-01-16 14:05:43 -03:00
Lactozilla
4ee0960090 Refactor texture definition 2024-01-16 14:04:12 -03:00
Lactozilla
1ccc04c53f Delete global lengthcol 2024-01-16 13:50:08 -03:00
Hanicef
4d589300f4 Fix bans by remote admins corrupting banlist 2024-01-15 21:01:36 +01:00
Lactozilla
feffdb373b Load textures and flats from PK3 files more reliably 2024-01-15 14:44:19 -03:00
Lactozilla
dcf5c4d3bf Cleanup R_GetFlatForTexture 2024-01-15 02:47:03 -03:00
Lactozilla
b901bc039d Delete leftover animated flat handling 2024-01-15 02:40:43 -03:00
Lactozilla
4cf9d38fb6 Delete leftover composite texture handling 2024-01-15 02:05:25 -03:00
Lactozilla
861d22fd44 Always generate composite textures with post data 2024-01-15 00:29:21 -03:00
Lactozilla
72b63a1305 Merge branch 'next' into patch-refactor 2024-01-14 22:16:32 -03:00
Hanicef
dff390e197 Fix final edge cases in sector points
Co-authored-by: Zwip-Zwap Zapony <zwipzwapzapony@gmail.com>
2024-01-14 21:07:45 +01:00
Hanicef
4eb514ce71 Fix IPv6 bans incorrectly banning IPv4 address 2024-01-14 19:20:25 +01:00
Hanicef
e8706fa9e8 Check hash instead of each field when batching 2024-01-13 17:53:00 +01:00
Hanicef
ef4f2e71ad Revert "Avoid batching skybox and horizon lines"
This reverts commit fc1e8fb52f88e56c6a32b3e7e643bc1356b507c8.
2024-01-13 17:53:00 +01:00
Gustaf Alhäll
71f326a152 Avoid batching skybox and horizon lines 2024-01-13 17:37:20 +01:00
Gustaf Alhäll
d5fe5586a0 Retain skybox and horizon line order 2024-01-13 17:37:20 +01:00
Gustaf Alhäll
636b3ab954 Optimize polygon sorting on batch renderer 2024-01-13 17:37:20 +01:00
spherallic
35b6b21562 Clean up NiGHTS attack character code, fix compile issues 2024-01-11 13:18:32 +01:00
sphere
4ae2482283 Merge branch 'character-nightsattack' into 'next'
Draw Character in NiGHTS Attack

See merge request STJr/SRB2!2175
2024-01-11 12:11:54 +00:00
Mari0shi
5a2a24b868 Draw Character in NiGHTS Attack 2024-01-11 12:11:54 +00:00
Logan Aerl Arias
8073ac6520 add mutex locks to UPnP Client code
add mutex locks to UPnP Client code
2024-01-10 16:44:27 -05:00
Zwip-Zwap Zapony
9d718bc639 Fix single-sided sloped midtextures in OpenGL 2024-01-10 21:26:04 +01:00
Logan Aerl Arias
c9232f4a07 Update i_tcp.c
set upnpc_started to 1 a the end
wrap upnpc_started into a struct
2024-01-10 13:10:39 -05:00
Logan Aerl Arias
ca0b899a54 Moved UPnP startup code to a thread
Moved UPnP startup code to a thread
2024-01-10 12:45:53 -05:00
Lactozilla
3e34c96165 Fix 3D floor sides not using the correct set of line flags 2024-01-09 14:14:49 -03:00
Lactozilla
28c30a9294 Optimize for when wall_scalex == 1.0 2024-01-08 22:08:50 -03:00
Lactozilla
159307c552 Fix 3D floor side texture scale when there are multiple on the same line 2024-01-08 22:03:31 -03:00
Logan Aerl Arias
1f0c9619dd Merge branch SRB2:next into propercheats 2024-01-08 23:40:56 +00:00
Logan Aerl Arias
4edebbe67f Merge branch 'blockedexposed' into 'next'
Expose P_LineIsBlocking to Lua

See merge request STJr/SRB2!2150
2024-01-08 23:38:11 +00:00
Logan Aerl Arias
f5c3c200b5 Merge branch 'lua-colorlib' into 'next'
Lua colorlib

See merge request STJr/SRB2!2094
2024-01-08 19:40:20 +00:00
Logan Aerl Arias
0781adc3ca Merge branch 'pandoradev' into 'next'
Enable Pandora and Level Select with Devmode / Always allow Level Select if unlocked

See merge request STJr/SRB2!2066
2024-01-08 19:20:23 +00:00
Logan Aerl Arias
03e5edb6f0 Merge branch 'chat_on' into 'next'
Expose chat_on to Lua as chatactive

See merge request STJr/SRB2!2023
2024-01-08 19:13:30 +00:00
Jisk
efb1b491aa Expose chat_on to Lua as chatactive 2024-01-08 19:13:30 +00:00
Logan Aerl Arias
845df8f1df Merge branch 'sector-portals' into 'next'
Sector portals

See merge request STJr/SRB2!2139
2024-01-08 03:28:43 +00:00
Logan Aerl Arias
154af01348 Merge branch 'theyseemerollingtheybraking' into 'next'
Fix roll braking assuming player angle is camera angle (resolves #1055)

Closes #1055

See merge request STJr/SRB2!2053
2024-01-08 03:13:57 +00:00
Logan Aerl Arias
be5ca1a4fb lua_infolib.c: replace lua_objlen with luaL_getn in setRamp() 2024-01-07 22:13:09 +00:00
Logan Aerl Arias
4ae7a0e093 LUA mapthing_t checks
add check that LUA can't access fields that don't exist in mapthing_t
2024-01-07 16:21:09 -05:00