Commit graph

13424 commits

Author SHA1 Message Date
Logan Aerl Arias
b438392d63 Merge branch SRB2:next into fix-slope-convex-sectors 2023-12-31 17:13:23 +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
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
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 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
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
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
sphere
d2d03a2e54 Merge branch 'fix-ungrabbed-keydown' into 'next'
Fix mouse events not being fired when the mouse is ungrabbed

Closes #879

See merge request STJr/SRB2!2178
2023-12-22 10:52:53 +00:00
spherallic
1756fabef0 Convert UDMF colormap light/fade alpha to new 0-255 range 2023-12-22 11:24:56 +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
Logan Aerl Arias
3cb384b10e Merge branch 'masterserverdualstack' into 'master'
Master Server API v1 URL change

See merge request STJr/SRB2!2226
2023-12-13 06:20:22 +00:00
Alam Ed Arias
1a80befb49 Merge remote-tracking branch 'origin/next' into IPv6 2023-12-13 01:15:33 -05: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
Alam Ed Arias
fdb7c7c847 Merge remote-tracking branch 'Hanicef/add-ipv6-indicator' into IPv6 2023-12-12 20:38:19 -05:00
Alam Ed Arias
bd1348f75f Merge remote-tracking branch 'Hanicef/allow-percent-ipv6-address' into IPv6 2023-12-12 20:37:50 -05:00
sphere
55d257266d Merge branch 'udmf-floor-ceiling-texture-scaling' into 'next'
Floor and ceiling texture scaling

See merge request STJr/SRB2!2221
2023-12-11 22:15:36 +00:00
sphere
c4526bc777 Merge branch 'udmf-texture-scaling' into 'next'
Wall texture scaling

See merge request STJr/SRB2!2031
2023-12-11 22:14:41 +00:00
Gustaf Alhäll
e1562ad4c5
Fix crash when trying to send to an unreachable client 2023-12-06 17:00:27 +01:00
Lactozilla
5257b498ea Remove useless check 2023-12-03 01:21:39 -03:00
Lactozilla
244ad5b892 Remove CPUID code 2023-12-03 00:22:58 -03:00
Lactozilla
5bbcffe6f9 Ensure extracolormap_t is valid and that extra_colormap is invalidated 2023-11-30 20:08:09 -03:00
Lactozilla
eb3129490f Add P_GetSectorLightLevelAt 2023-11-30 19:50:22 -03:00
Lactozilla
91395fcfc9 Add v.getSectorColormap 2023-11-30 19:41:15 -03:00
Lactozilla
5203133f72 Remove Lua lighttable 2023-11-30 19:13:26 -03:00
Lactozilla
8e331f86bd Merge branch 'next' into sector-portals 2023-11-30 19:01:54 -03:00
Lactozilla
1122373304 Merge branch 'next' into raise-skin-limit 2023-11-30 18:58:24 -03:00
Lactozilla
5f21befb09 Merge branch 'next' into translations 2023-11-30 18:54:36 -03: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
Monster Iestyn
473597dd02 Merge branch 'master' into next 2023-11-29 16:49:18 +00:00
sphere
c7cae406b8 Merge branch 'lua-extracolormap' into 'next'
Lua colorlib: extracolormap support

See merge request STJr/SRB2!2093
2023-11-29 11:47:06 +00:00
sphere
04911b95b6 Merge branch 'raise-side-limits' into 'next'
Raise sidedef limits

See merge request STJr/SRB2!2163
2023-11-29 11:45:52 +00:00
sphere
5b6657a11e Merge branch 'add-apropos-command' into 'next'
Add apropos console command

See merge request STJr/SRB2!2217
2023-11-29 11:25:02 +00:00
sphere
d1ce8deed9 Merge branch 'fix-line-415-buffer-overflow' into 'next'
Fix buffer overflow when linedef type 415 executes

See merge request STJr/SRB2!2006
2023-11-29 11:23:11 +00:00
sphere
f32dfb4bc3 Merge branch 'fix-spawnpoint-dangling-mobj' into 'next'
Fix dangling pointer in mapthing after removing mobj

See merge request STJr/SRB2!2007
2023-11-29 11:22:55 +00:00
sphere
553c4b9ce9 Merge branch 'fix-module-volume' into 'next'
Make module music volume more accurate

See merge request STJr/SRB2!2215
2023-11-29 11:21:07 +00:00
sphere
bd3abec394 Merge branch 'fix-fov-aniso-not-saving' into 'next'
Fix anisotropic and FOV settings not saving

See merge request STJr/SRB2!2218
2023-11-29 11:20:02 +00:00
sphere
55fd958ee0 Merge branch 'i_setsongtrack-should-be-int32' into 'master'
I_SetSongTrack(int) should be I_SetSongTrack(INT32)

See merge request STJr/SRB2!2213
2023-11-29 11:19:53 +00:00
bitten2up
30e48fd555 I_SetSongTrack(int) should be I_SetSongTrack(INT32) 2023-11-29 11:19:53 +00:00
Lactozilla
0498c16cb6 Merge branch 'next' into raise-skin-limit 2023-11-26 23:08:13 -03:00
LoganAir
b5c8db00f8 Update mserv.c
https://mb.srb2.org is now behind CloudFlare, and the Master Server API v1 can not be accessed for some users due to this change. so I setup a new dual stack DNS record for accessing to the API
2023-11-26 17:44:03 -05:00
Monster Iestyn
8e7d8281bd Merge branch 'master' into next 2023-11-26 20:44:52 +00:00
Monster Iestyn
47b3c25be6 Merge branch 'renderhitbox-nightsitems' into 'next'
Group NiGHTS star/chip hitboxes with rings

See merge request STJr/SRB2!2162
2023-11-26 20:41:38 +00:00
Monster Iestyn
4706e80df1 Merge branch 'superbutton' into 'next'
Dedicated Shield / Super Transformation Button

See merge request STJr/SRB2!2096
2023-11-26 20:38:49 +00:00
SMS Alfredo
e50993861e Dedicated Shield / Super Transformation Button 2023-11-26 20:38:49 +00:00
Gustaf Alhäll
40f57de187
Add indicator for IPv6-enabled servers 2023-11-26 21:30:54 +01:00
Monster Iestyn
5f98f7696e Merge branch 'botlessdumb' into 'next'
Prevent Bots from using Tails' abilities when they don't have them

See merge request STJr/SRB2!2205
2023-11-26 20:15:54 +00:00
Monster Iestyn
5fc9c1a65b Merge branch 'improve-file-search-perf-nix' into 'next'
Improve file search performance on Linux and FreeBSD

See merge request STJr/SRB2!2198
2023-11-26 20:12:09 +00:00
Monster Iestyn
10ca749991 Merge branch 'Termios_fix' into 'next'
TERM IO fixup

Closes #1141

See merge request STJr/SRB2!2206
2023-11-26 19:25:21 +00:00
Monster Iestyn
8d55cadbcf Merge branch 'kill-hud-feetoffset' into 'next'
Fix offsetting of rotated sprites drawn in the HUD by Lua

See merge request STJr/SRB2!2171
2023-11-26 19:23:13 +00:00
Lactozilla
ef9b2b7ef8 Merge branch 'udmf-texture-scaling' into udmf-floor-ceiling-texture-scaling 2023-11-26 03:57:51 -03:00
Lactozilla
87d99fe84c Fix scaling of walls that are skewed by a slope, part 2 2023-11-26 03:57:36 -03:00
Monster Iestyn
5232540d02 Merge branch 'fix-lan-discovery' into 'next'
Fix LAN discovery for SRB2 servers

See merge request STJr/SRB2!2219
2023-11-26 00:21:40 +00:00
Monster Iestyn
9989cbe3e3 Merge branch 'fix-segfault-polyvertex-null' into 'next'
Fix segfaults on some systems due to polyvertex being NULL

See merge request STJr/SRB2!2065
2023-11-26 00:17:33 +00:00
Lactozilla
3f98755c11 Actually remove 'scalex_bot' and 'scaley_bot' 2023-11-25 15:19:48 -03:00
Lactozilla
147d5948fc Remove 'scalex_bot' and 'scaley_bot' 2023-11-24 13:56:56 -03:00
Lactozilla
6596fc97ac Accept '_bottom' instead of just '_bot' to match the UDMF names 2023-11-24 13:54:09 -03:00
Lactozilla
6948537e9e Initialize xscale and yscale 2023-11-24 13:49:44 -03:00
Lactozilla
89770d9821 Make sector texture offsets not scale 2023-11-24 13:44:20 -03:00
Lactozilla
b411b9e523 Fix potential misalignment with scaled slope textures 2023-11-24 12:28:53 -03:00
Lactozilla
c5de9bdb7d Add ffloor xoffs, yoffs, xscale, yscale to Lua 2023-11-24 08:47:59 -03:00
Lactozilla
b1d7f59fea Delete cachedheight, cacheddistance, cachedxstep and cachedystep 2023-11-24 08:34:51 -03:00
Lactozilla
3764ba3de0 Sector texture scaling, part 2 2023-11-24 02:17:59 -03:00
Lactozilla
45f98b6d22 Merge branch 'udmf-texture-scaling' into udmf-floor-ceiling-texture-scaling 2023-11-24 02:13:00 -03:00
Lactozilla
6f4d1b43ea Fix scaling of walls that are skewed by a slope 2023-11-24 02:11:59 -03:00
Lactozilla
da68f4c669 Sector texture scaling, part 1 2023-11-24 02:05:08 -03:00
Lactozilla
468b448316 Add sector texture scale fields 2023-11-24 01:52:57 -03:00
Lactozilla
2e4fab3f1a Remove unneeded code from HWR_RenderPlane and HWR_RenderPolyObjectPlane 2023-11-24 01:29:43 -03:00
Lactozilla
c53fd6de16 Fix minor issues with 3D floor sides in OpenGL 2023-11-24 01:27:02 -03:00
Lactozilla
41cacd783b Serialize new side fields 2023-11-23 21:56:18 -03:00