Logan Aerl Arias
8dcc609144
Merge branch SRB2:next into custom-2.2.10
2023-12-31 20:17:32 +00:00
Logan Aerl Arias
5388d197dc
Merge branch 'constants-global' into 'next'
...
Expose a `constants` dictionary to Lua.
See merge request STJr/SRB2!1646
2023-12-31 17:20:56 +00:00
Logan Aerl Arias
b6ef6e23b4
Merge branch 'master' into MiniUPnPc_2.2.5_update
2023-12-31 12:14:19 -05: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
07b0df0fba
Merge branch 'next' into sector-portals
2023-12-31 11:56:34 -05: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
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-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
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
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
