Commit graph

13851 commits

Author SHA1 Message Date
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
Lactozilla
0f14d32bf0 Merge branch 'next' into any-resolution 2024-01-13 04:04:26 -03:00
Lactozilla
970a9d65dd Merge branch 'next' into more-sprite2 2024-01-13 03:43:34 -03: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
Lactozilla
0ffcf89c85 Merge branch 'next' into more-sprite2 2024-01-08 02:55:19 -03: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
Logan Aerl Arias
cb3deaaaac Update lauxlib.h
lauxlib.h: mark luaL_error as a REPORT function
2024-01-07 15:20:32 -05:00
Alam Ed Arias
626ac069f2 Merge branch 'master' into next 2024-01-07 14:22:43 -05:00
Alam Ed Arias
caaeaef6cc fixup Valgrind warning:
Conditional jump or move depends on uninitialised value(s)
strncpy (vg_replace_strmem.c:599)
MIT_SetCurBackground (m_menu.c:2650)
M_IterateMenuTree (m_menu.c:2581)
M_SetMenuCurBackground (m_menu.c:2790)
F_InitMenuPresValues (f_finale.c:2276)
D_StartTitle (d_main.c:998)
G_Responder (g_game.c:2117)
D_ProcessEvents (d_main.c:282)
Local_Maketic (d_clisrv.c:5297)
NetUpdate (d_clisrv.c:5701)
TryRunTics (d_clisrv.c:5371)
D_SRB2Loop (d_main.c:820)
2024-01-07 13:09:47 -05:00
Alam Ed Arias
5b6c24281d Fixup DEBUGMODE builds
doomdef.h: check if the build system already define our DEBUG code
version.mk: do not fail on our inline functions in DEBUGMODE
features.mk: we do not need the VALGRIND libraies, just the headers
mserv.c: start registered with false in Update_parameters()
2024-01-07 13:07:28 -05:00
Gustaf Alhäll
0211492d96
Change point-in-polygon algorithm 2024-01-04 20:12:20 +01:00
Logan Aerl Arias
7cb2fcd058 Merge branch 'fix-inline-warning' into 'next'
Fix a -Winline warning

See merge request STJr/SRB2!2255
2024-01-04 16:40:34 +00:00
Zwip-Zwap Zapony
c46f861034 New gamepad defaults, with Shield on B 2024-01-04 08:29:30 +01:00
Gustaf Alhäll
bc5a0098ea
fixup! Use angle instead of range when checking identical points 2024-01-03 21:10:11 +01:00
Gustaf Alhäll
4cdd638a07
Use angle instead of range when checking identical points 2024-01-03 20:49:17 +01:00
Gustaf Alhäll
cf7c6585eb
Merge remote-tracking branch 'fork/fix-slope-convex-sectors' into fix-slope-convex-sectors 2024-01-03 18:49:58 +01:00
Gustaf Alhäll
5edc828aaf
Fix physical weirdness on concave sectors, too 2024-01-03 18:48:41 +01:00
Logan Aerl Arias
3de4547f74 Merge branch 'expos-camreset' into 'next'
Expose P_ResetCamera / camera->reset to Lua

See merge request STJr/SRB2!2009
2024-01-03 15:36:16 +00:00
Zwip-Zwap Zapony
a4cb3960ce Set old sprite scales and offsets for ghost mobjs 2024-01-03 14:04:40 +01:00
Zwip-Zwap Zapony
564d18b1ea Add and use an "instant" parameter for P_SetScale 2024-01-03 14:04:40 +01:00
Logan Aerl Arias
3992e83e8f Revert "Merge branch 'thokking-hell' into 'next'"
This reverts merge request !1551
2024-01-03 03:46:26 +00:00
Lactozilla
7fbd8f7025 Merge branch 'next' into more-sprite2 2024-01-02 22:09:17 -03:00
Lactozilla
b6e4771085 Merge branch 'next' into translations 2024-01-02 22:06:14 -03:00
Lactozilla
31f7616d3a Fix #1166 2024-01-02 20:58:55 -03:00
Zwip-Zwap Zapony
29c7a0bfd8 Fix a -Winline warning 2024-01-02 20:38:18 +01:00
Zwip-Zwap Zapony
e717731ea3 Update player->quittime when a server idles, again 2024-01-02 19:00:18 +01:00
Logan Aerl Arias
4dd2415262 Merge branch 'exitfix' into 'next'
Only Consider ExitLevel a Cheat When Used to Cheat

See merge request STJr/SRB2!2159
2024-01-02 03:05:24 +00:00
Logan Aerl Arias
474d112ae4 Merge branch 'setflip' into 'next'
Add "allowflip" Parameter to P_DoJump

See merge request STJr/SRB2!2158
2024-01-02 02:38:19 +00:00
Logan Aerl Arias
920f375f4a Update features.mk
fix miniupnpc typo in features.mk
2024-01-01 20:40:11 -05:00
Logan Aerl Arias
4853eded8e Merge branch 'master' into next 2024-01-01 20:35:33 -05:00
Logan Aerl Arias
10b3c58a3d Merge branch SRB2:next into ogl-palette-rendering 2024-01-02 00:00:11 +00:00
Logan Aerl Arias
4523364a40 Merge branch 'next' into ogl-palette-rendering 2024-01-01 18:22:35 -05:00
Logan Aerl Arias
3ea28d22b4 Merge branch 'master' into ogl-palette-rendering 2024-01-01 17:16:07 -05:00
Logan Aerl Arias
487b0d22ed Merge branch 'next' into raise-skin-limit 2024-01-01 16:55:04 -05:00
ChaoLoveIceMDBoy
e29085580c OpenGL: Fix linedef type 10 not culling FOFs (Closes #438) 2024-01-01 19:48:47 +00:00
Logan Aerl Arias
b55b91bc24 Merge branch 'pit-savior' into 'next'
Make Dead / NoClipHeight Objects Immune to Death Pits (Resolves #553)

Closes #553

See merge request STJr/SRB2!2001
2024-01-01 16:28:37 +00:00
Logan Aerl Arias
0182973b4d Merge branch 'interpolate-shield-spawning' into 'next'
Copy Interpolation to Shields and Overlays, Splitscreen Overlays

Closes #997

See merge request STJr/SRB2!1992
2024-01-01 15:10:24 +00:00
Logan Aerl Arias
484a9c5620 Merge branch 'expos-local' into 'next'
Expose P_IsLocalPlayer to Lua

See merge request STJr/SRB2!1997
2024-01-01 05:06:47 +00:00
Logan Aerl Arias
096efe422d Merge branch 'static-void-drawstaticbox' into 'next'
Rewrite M_DrawStaticBox

Closes #1014

See merge request STJr/SRB2!1990
2024-01-01 05:00:36 +00:00
Logan Aerl Arias
9972dd0d5b Merge branch 'devmode-hudlines' into 'next'
Always Allow con_hudlines when Using devmode

See merge request STJr/SRB2!1987
2024-01-01 04:55:43 +00:00
Logan Aerl Arias
520d1c16da Merge branch 'custom-2.2.10' into 'next'
Made filesearch aware of symbolic links

See merge request STJr/SRB2!1976
2024-01-01 04:51:09 +00:00
Logan Aerl Arias
050da08c15 Merge branch 'bustablemobjzfix' into 'next'
Update mobj floorz/ceilingz after a bustable FOF is destroyed

See merge request STJr/SRB2!1945
2024-01-01 04:44:09 +00:00
Logan Aerl Arias
37a917df49 Merge branch 'perfstats-thinkframes' into 'next'
Implement perfstats options for LUAh_PreThinkFrame and LUAh_PostThinkFrame

See merge request STJr/SRB2!1932
2024-01-01 04:05:16 +00:00
Logan Aerl Arias
341159fdc9 Merge branch 'drawfill-transparency' into 'next'
Add transparency flag support to drawFill

See merge request STJr/SRB2!1881
2024-01-01 03:59:56 +00:00
Logan Aerl Arias
2223cdd756 Merge branch 'icefix' into 'next'
Move player friction reset after movement code for lua qol

See merge request STJr/SRB2!1824
2024-01-01 03:10:11 +00:00
katsy
b52836e5f1 Move player friction reset after movement code for lua qol 2024-01-01 03:10:09 +00:00
Monster Iestyn
1284ec6494 correct sidenum_get to use UINT32 instead of UINT16 2024-01-01 02:44:07 +00:00
Logan Aerl Arias
06b5c9d5f4 Merge branch 'menu-unresponsiveness-fix' into 'next'
Fix rare but possible menu/console unresponsiveness bug (Resolves #700)

Closes #700

See merge request STJr/SRB2!1677
2023-12-31 23:36:30 +00:00
Logan Aerl Arias
8dcc609144 Merge branch SRB2:next into custom-2.2.10 2023-12-31 20:17:32 +00:00
Logan Aerl Arias
b438392d63 Merge branch SRB2:next into fix-slope-convex-sectors 2023-12-31 17:13:23 +00:00
Logan Aerl Arias
aa6faba24a Merge branch 'next' into fix-table-key-archiving 2023-12-31 12:12:13 -05:00
Logan Aerl Arias
f6b201173f Merge branch SRB2:next into disable-powerup-hud 2023-12-31 17:11:37 +00:00
Logan Aerl Arias
51bb5d41e0 Merge branch 'next' into lua-colorlib-get-sector-translation 2023-12-31 12:11:12 -05:00
Logan Aerl Arias
a0bd81d09a Merge branch SRB2:next into bouncy-nights-fixes 2023-12-31 17:07:22 +00:00
Logan Aerl Arias
b700c3a8bf Merge branch 'next' into cv-can-change 2023-12-31 12:06:27 -05:00
Logan Aerl Arias
b6ffd8ce01 Merge branch SRB2:next into oldspecnightsrecordsfix 2023-12-31 17:05:51 +00:00
Logan Aerl Arias
3331e073ea Merge branch SRB2:next into slash-n 2023-12-31 17:05:06 +00:00
Logan Aerl Arias
82f37ccadd Merge branch SRB2:next into emblemexitfix 2023-12-31 17:03:43 +00:00
Logan Aerl Arias
fb5bf2555f Merge branch SRB2:next into propercheats 2023-12-31 17:03:31 +00:00
Logan Aerl Arias
8c3d590730 Merge branch SRB2:next into exitfix 2023-12-31 17:03:12 +00:00
Logan Aerl Arias
530c93c1e7 Merge branch SRB2:next into setflip 2023-12-31 17:02:58 +00:00
Logan Aerl Arias
e24a9c2fe4 Merge branch 'next' into improve-download-refuse-message 2023-12-31 11:58:10 -05:00
Logan Aerl Arias
c159987a30 Merge branch SRB2:next into blockedexposed 2023-12-31 16:57:01 +00:00
Logan Aerl Arias
07b0df0fba Merge branch 'next' into sector-portals 2023-12-31 11:56:34 -05:00
Logan Aerl Arias
c409b69dec Merge branch SRB2:next into fireflower-icon 2023-12-31 16:53:11 +00:00
Logan Aerl Arias
28f982fdce Merge branch SRB2:next into pandoradev 2023-12-31 16:48:54 +00:00
Logan Aerl Arias
987f6fbe2b Merge branch SRB2:next into theyseemerollingtheybraking 2023-12-31 16:48:15 +00:00
Logan Aerl Arias
6d7549476b Merge branch 'next' into showinput 2023-12-31 11:47:14 -05:00
Logan Aerl Arias
cd5bc8b6eb Merge branch SRB2:next into expos-camreset 2023-12-31 16:45:58 +00:00
Logan Aerl Arias
5a7171a814 Merge branch SRB2:next into pit-savior 2023-12-31 16:45:01 +00:00
Logan Aerl Arias
25c24bb9d8 Merge branch SRB2:next into expos-local 2023-12-31 16:44:47 +00:00
Logan Aerl Arias
38dec322ba Merge branch SRB2:next into interpolate-shield-spawning 2023-12-31 16:44:23 +00:00
Logan Aerl Arias
a343abed01 Merge branch SRB2:next into static-void-drawstaticbox 2023-12-31 16:44:10 +00:00
Logan Aerl Arias
456f7ef9a6 Merge branch SRB2:next into devmode-hudlines 2023-12-31 16:43:54 +00:00
Logan Aerl Arias
12418623a5 Merge branch SRB2:next into custom-2.2.10 2023-12-31 16:43:06 +00:00
Logan Aerl Arias
be6b7ca1b3 Merge branch 'next' into bustablemobjzfix 2023-12-31 11:40:36 -05:00
Logan Aerl Arias
b1f1889a07 Merge branch SRB2:next into perfstats-thinkframes 2023-12-31 16:32:54 +00:00
Logan Aerl Arias
48d06337be Merge branch SRB2:next into drawfill-transparency 2023-12-31 16:28:26 +00:00
Logan Aerl Arias
b67b0d3ac2 Merge branch SRB2:next into menu-unresponsiveness-fix 2023-12-31 16:19:50 +00:00
Logan Aerl Arias
47b34b3454 Merge branch SRB2:next into constants-global 2023-12-31 16:18:48 +00:00
Logan Aerl Arias
e7d972757b Revert "Merge branch 'update-quittime-while-idling' into 'next'"
This reverts merge request !2210
2023-12-31 14:32:06 +00:00
Logan Aerl Arias
9b39493b42 Merge branch 'ogl-wireframe' into 'next'
Wireframe mode for OpenGL

See merge request STJr/SRB2!1644
2023-12-31 14:30:04 +00:00
Logan Aerl Arias
f5ac585338 Merge branch 'bind-multi-arg' into 'next'
Allow `bind` to accept more arguments for a command.

See merge request STJr/SRB2!1596
2023-12-31 14:24:39 +00:00
Logan Aerl Arias
091a874514 Merge branch 'thokking-hell' into 'next'
New CA_THOK effect

See merge request STJr/SRB2!1551
2023-12-31 14:16:27 +00:00
Logan Aerl Arias
7c13f6e9fd Merge branch 'update-quittime-while-idling' into 'next'
Update player->quittime while a Server is Idling

Closes #1143 and #1119

See merge request STJr/SRB2!2210
2023-12-31 13:58:29 +00:00
Logan-A
9dea09a7cc Update features.mk
change HAVE_MINIUPNPC to NOUPNP
2023-12-31 00:13:13 -05:00
Logan-A
acc78d0ee5 Update i_tcp.c
made UPnP port mapping enabled by default
lowered UPnP Discover delay from 2000 ms to 500 ms
only look for first InternetGatewayDevice found
remove UPnP port mapping on shutdown
2023-12-30 23:41:34 -05:00
Alam Ed Arias
9c3ac6c86f Fix compiling on Linux/GNU systems with miniupnpc 2023-12-30 18:46:20 -05:00
Logan-A
322dfac85f update SRB2 to use miniUPnPc API version 17
update miniUPnPc function calls to API version 17
update include statements for miniUPnPcc
use PKGCONFIG to find lib and inc forminiUPnPc
2023-12-30 18:00:21 -05:00
Logan-A
95803eca16 Update win32.mk
remove miniupnc block
2023-12-30 13:29:22 -05:00
Gustaf Alhäll
2919133ea4
fixup! fixup! fixup! Fix physics quirkiness on slopes with convex sectors 2023-12-30 11:55:09 +01:00
Gustaf Alhäll
faaf379c37
fixup! fixup! Fix physics quirkiness on slopes with convex sectors 2023-12-29 21:42:01 +01:00
Gustaf Alhäll
76becac078
fixup! Fix physics quirkiness on slopes with convex sectors 2023-12-29 20:07:25 +01:00
Gustaf Alhäll
d6c53b0438
Fix physics quirkiness on slopes with convex sectors 2023-12-29 19:28:38 +01:00
Zwip-Zwap Zapony
c361b732db General NiGHTS fixes 2023-12-29 16:04:03 +01:00
SMS Alfredo
e680277428 Merge branch 'next' into 'setflip'
# Conflicts:
#   src/p_local.h
2023-12-29 03:30:15 +00:00
Gustaf Alhäll
849455bba7
Fix one too many player count on dedicated servers 2023-12-28 21:52:48 +01:00
LJ Sonic
c2a8d1f7ea Merge branch 'loadfile' into 'next'
`loadfile` in Lua

See merge request STJr/SRB2!1615
2023-12-28 17:08:10 +00:00
LJ Sonic
b3ef2b3344 Support loadfile in folder add-ons too 2023-12-28 17:32:36 +01:00
LJ Sonic
cb26e55260 Fix archiving with tables that contain tables as keys 2023-12-28 16:43:33 +01:00
LJ Sonic
646d1b0ea6 Fix Lua taglists methods not working 2023-12-28 15:17:14 +01:00
Lactozilla
70e9e2bdb0 Merge branch 'next' into more-sprite2 2023-12-27 23:48:20 -03:00
Lactozilla
fd64fdfa34 Merge branch 'next' into sector-portals 2023-12-27 23:46:16 -03:00
Gustaf Alhäll
8329b21b81
Fix dummy build 2023-12-27 22:35:00 +01:00
Alam Ed Arias
933a96013d Merge branch 'master' into next 2023-12-26 17:50:21 -05:00
Alam Ed Arias
5d7ee3974f Build: error on array bounds 2023-12-26 17:49:34 -05:00
Lactozilla
2ef5ea86f3 Don't toggle the console if shift is held 2023-12-26 18:31:11 -03:00
Lactozilla
1f65c55074 Don't add text to the console on the same frame it's being toggled
Resolves #1161
2023-12-26 18:29:41 -03:00
Lactozilla
a266fbb6a0 Revert 6c701a9312 2023-12-26 17:53:38 -03:00
Lactozilla
fa0c5cfd04 Revert 3ae6a99ac7 2023-12-26 17:24:46 -03:00
Lactozilla
80af2a27d4 Fix -Warray-bounds warning in lua_hooklib.c 2023-12-26 17:14:30 -03:00
Logan Aerl Arias
3ae6a99ac7 Revert "Merge branch 'allow-multiple-admin-passwords' into 'next'"
This reverts merge request !2201
2023-12-26 19:32:40 +00:00
Logan Aerl Arias
6c701a9312 Revert "Merge branch 'native-keyboard-layout-support' into 'next'"
This reverts merge request !1952
2023-12-26 19:21:09 +00:00
sphere
188e40688a Merge branch 'fix-1158' into 'next'
Fix #1158

Closes #1158

See merge request STJr/SRB2!2240
2023-12-26 18:28:32 +00:00
Logan-A
8374a1628c added NOEXECINFO to cMake
added NOEXECINFO to cMake
2023-12-25 19:52:32 -05:00
Logan Aerl Arias
cbd6e397e3 Merge branch 'fix-leftover-players-idle' into 'next'
Do not send disconnected players' statuses to the MS

See merge request STJr/SRB2!2209
2023-12-26 00:02:48 +00:00
Logan Aerl Arias
64da1fada1 Merge branch 'handle-player-mobjsetstate' into 'next'
Handle player state is P_SetMobjState

See merge request STJr/SRB2!2239
2023-12-26 00:00:39 +00:00
Logan Aerl Arias
cae7161b2e Merge branch 'optimize-slope-z-positioning' into 'next'
Optimize Z position functions on sloped sectors

See merge request STJr/SRB2!2214
2023-12-26 00:00:11 +00:00
Logan Aerl Arias
0d36d88f86 Merge branch 'allow-multiple-admin-passwords' into 'next'
Add support for multiple admin passwords

See merge request STJr/SRB2!2201
2023-12-25 23:59:39 +00:00
Logan Aerl Arias
96e459c171 Merge branch 'optimize-mobj-allocations' into 'next'
Cache and reuse removed mobjs when spawning mobjs

See merge request STJr/SRB2!2200
2023-12-25 23:59:34 +00:00
Logan Aerl Arias
2cf26236df Merge branch 'use-fwrapv-gcc-flag' into 'next'
Pass -fwrapv to GCC compilation flags

See merge request STJr/SRB2!2195
2023-12-25 23:59:30 +00:00
Logan Aerl Arias
381ad90bff Merge branch 'fix-mtag-buffer-overflow' into 'next'
Fix buffer overflow when tag bits are set

See merge request STJr/SRB2!2194
2023-12-25 23:59:27 +00:00
Logan Aerl Arias
3ed2221e4c Merge branch 'fix-buffer-overflow-mobj-typename' into 'next'
Fix buffer overflow when when fetching typenames on freeslots

See merge request STJr/SRB2!2193
2023-12-25 23:59:22 +00:00
Logan Aerl Arias
3ba48ba43f Merge branch 'use-unix-nanosleep' into 'next'
Use nanosleep for I_SleepDuration on *nix

See merge request STJr/SRB2!2184
2023-12-25 23:59:17 +00:00
Logan Aerl Arias
8e86cf6a5c Merge branch 'configurable-spam-protection' into 'next'
Make chat spam protection more configurable

See merge request STJr/SRB2!2127
2023-12-25 23:59:07 +00:00
Logan Aerl Arias
b5a4f227f6 Merge branch 'fix-segfault-removemobj-spawn' into 'next'
Fix segfaults when P_RemoveMobj is called from MobjSpawn hook

See merge request STJr/SRB2!1973
2023-12-25 23:58:26 +00:00
Logan Aerl Arias
03626bccfe Merge branch 'fix-pointtodist-negative-abs' into 'next'
Fix crash in R_PointToDist2 when passing -2147483648

See merge request STJr/SRB2!1964
2023-12-25 23:58:03 +00:00
Logan Aerl Arias
63a5361d3a Merge branch 'native-keyboard-layout-support' into 'next'
Implement support for native keyboard layout

See merge request STJr/SRB2!1952
2023-12-25 23:57:51 +00:00
Logan Aerl Arias
a7883729ec Merge branch 'remove-cpuid' into 'next'
Remove CPUID code

See merge request STJr/SRB2!2231
2023-12-25 23:55:33 +00:00
Logan Aerl Arias
5c12707250 Merge branch 'fix-host-unreach-crash' into 'next'
Fix crash when trying to send to an unreachable client

See merge request STJr/SRB2!2232
2023-12-25 23:55:20 +00:00
Logan Aerl Arias
5250ddca52 Merge branch 'fix-parse-ipv6-ban' into 'next'
Fix IPv6 bans being ignored when loading banlist

See merge request STJr/SRB2!2235
2023-12-25 23:55:00 +00:00
Logan Aerl Arias
e70a430216 Merge branch 'fix-ipv6-ban-mask' into 'next'
Fix ban mask being ignored on IPv6 addresses

See merge request STJr/SRB2!2236
2023-12-25 23:54:51 +00:00
Logan Aerl Arias
b26ef175e8 Merge branch 'fix-chatbug' into 'next'
(Hopefully) Fix chatbug

See merge request STJr/SRB2!2238
2023-12-25 23:54:21 +00:00
Alam Ed Arias
1c89d60b26 Merge branch 'master' into next 2023-12-25 17:45:49 -05:00
Hanicef
13cfc5ef59 Make execinfo.h optional (fixes musl libc build) 2023-12-25 16:38:11 -05:00
Lactozilla
6a4b26a04c Fix #1158 2023-12-23 16:30:45 -03:00
Zwip-Zwap Zapony
ac34fdf129 Apply 1 suggestion(s) to 1 file(s) 2023-12-23 13:14:47 +00:00
Gustaf Alhäll
ddba6e80f7
Handle player state is P_MobjSetState 2023-12-23 13:45:16 +01:00
Gustaf Alhäll
d79d22de63
(Hopefully) Fix chatbug 2023-12-23 11:05:14 +01:00
spherallic
7893d08407 Fix realmapnamep not being set with map * and + 2023-12-22 14:23:24 +01:00
sphere
37ecb6b48e Merge branch 'mapcommand' into 'next'
Add shortcuts for current/next map to map command

See merge request STJr/SRB2!2169
2023-12-22 10:54:01 +00:00