Commit graph

15283 commits

Author SHA1 Message Date
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-A
106a98ce5c Merge branch 'master' into next 2023-12-31 11:05:20 -05:00
Logan Aerl Arias
8d179825d9 switch to using sanitized subject for compnote 2023-12-31 15:56:37 +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 Aerl Arias
40d43dfa13 Update .gitlab-ci.yml file
disable uPnP in Debian stable musl
2023-12-31 05:06:38 +00: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 Aerl Arias
144cbd5385 Update .gitlab-ci.yml file
add libminiupnpc-dev to the build
2023-12-30 23:32:54 +00: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
Logan-A
cdacb95846 update MiniUPnPc from 1.6 to 2.2.5 2023-12-30 12:15:07 -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
Logan Aerl Arias
8c1cd73859 Merge branch 'fix-extra-player-dedicated-server' into 'next'
Fix one too many player count on dedicated servers

See merge request STJr/SRB2!2247
2023-12-28 22:59:09 +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
Logan Aerl Arias
911b462212 Merge branch 'fix-taglist-methods' into 'next'
Fix Lua taglists methods not working

See merge request STJr/SRB2!2244
2023-12-28 14:55:49 +00:00
LJ Sonic
646d1b0ea6 Fix Lua taglists methods not working 2023-12-28 15:17:14 +01:00
Lactozilla
fd64fdfa34 Merge branch 'next' into sector-portals 2023-12-27 23:46:16 -03:00
Alam Ed Arias
454a43f0d4 Merge branch 'fix-dummy-build-sleepduration' into 'next'
Fix dummy build

See merge request STJr/SRB2!2242
2023-12-27 21:49:07 +00: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