Commit graph

125 commits

Author SHA1 Message Date
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
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
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
Alam Ed Arias
626ac069f2 Merge branch 'master' into next 2024-01-07 14:22:43 -05: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
4853eded8e Merge branch 'master' into next 2024-01-01 20:35:33 -05:00
Logan Aerl Arias
487b0d22ed Merge branch 'next' into raise-skin-limit 2024-01-01 16:55:04 -05: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
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
8c3d590730 Merge branch SRB2:next into exitfix 2023-12-31 17:03:12 +00:00
Logan Aerl Arias
28f982fdce Merge branch SRB2:next into pandoradev 2023-12-31 16:48: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
b1f1889a07 Merge branch SRB2:next into perfstats-thinkframes 2023-12-31 16:32:54 +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
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
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
Gustaf Alhäll
849455bba7
Fix one too many player count on dedicated servers 2023-12-28 21:52:48 +01:00
Lactozilla
fa0c5cfd04 Revert 3ae6a99ac7 2023-12-26 17:24:46 -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
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
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
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
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
Gustaf Alhäll
d79d22de63
(Hopefully) Fix chatbug 2023-12-23 11:05:14 +01:00
Zwip-Zwap Zapony
54ba225164 Update player->quittime while a server is idling 2023-12-14 21:42:43 +01:00
Gustaf Alhäll
fe87760c8c
Fix buffer overflow in SV_SendPlayerInfo 2023-12-14 17:15:07 +01:00
Gustaf Alhäll
59aa6fdad4
Fix ban mask being ignored on IPv6 addresses 2023-12-14 17:00:20 +01:00
Gustaf Alhäll
0131cdb03d
Fix IPv6 bans being ignored when loading banlist 2023-12-14 16:30:04 +01:00
Alam Ed Arias
4f8513f504 Merge remote-tracking branch 'LoganAir/masterserverdualstack' into IPv6 2023-12-12 20:43:52 -05:00
Alam Ed Arias
015dbc5efa Merge remote-tracking branch 'Hanicef/register-dual-stack-servers' into IPv6 2023-12-12 20:38:41 -05:00
Gustaf Alhäll
e1562ad4c5
Fix crash when trying to send to an unreachable client 2023-12-06 17:00:27 +01:00
Gustaf Alhäll
ff492cbdcc
Register both IPv4 and IPv6 on the master server 2023-11-30 16:44:49 +01:00
Gustaf Alhäll
2e885d4e6f
Add NO_IPV6 check 2023-11-30 16:03:44 +01:00
Lactozilla
0498c16cb6 Merge branch 'next' into raise-skin-limit 2023-11-26 23:08:13 -03:00
Gustaf Alhäll
40f57de187
Add indicator for IPv6-enabled servers 2023-11-26 21:30:54 +01:00
Lactozilla
a3e6b5e0fb Merge remote-tracking branch 'stjr/next' into raise-skin-limit 2023-11-23 13:48:18 -03:00
Gustaf Alhäll
3c921044a3
Fix Windows build 2023-11-22 20:26:55 +01:00
Gustaf Alhäll
977cd0db24
Fix LAN discovery for SRB2 servers 2023-11-22 20:17:44 +01:00
Gustaf Alhäll
2450a0df70
Do not send disconnected players' statuses to the MS 2023-11-11 19:09:39 +01:00
Gustaf Alhäll
b10b9c35ed
Add support for multiple admin passwords 2023-11-06 19:09:43 +01:00
Krabs
5fc7a5c2da Merge branch 'add-auto-kick-idle-players' into 'next'
Add auto-kick for inactive players

See merge request STJr/SRB2!2148
2023-11-04 16:34:46 +00:00
katsy
340d515754 Fix for "Leader of the Chaotix" name change bug (credit Zwip Zwap Zapony) 2023-10-29 17:43:40 +00:00
Alam Ed Arias
c440788c92 Merge branch 'next' into menu-unresponsiveness-fix 2023-10-28 16:45:33 -04:00
Alam Ed Arias
79aaf3e613 Merge branch SRB2:next into perfstats-thinkframes 2023-10-25 18:34:06 +00:00
Alam Ed Arias
e368f95f3a Merge branch SRB2:next into custom-2.2.10 2023-10-25 18:31:28 +00:00
Alam Ed Arias
47833469d1 Merge branch SRB2:next into pandoradev 2023-10-25 18:08:33 +00:00