stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-31 15:01:12 +00:00
Code Issues Projects Releases Packages Wiki Activity
15083 commits 175 branches 42 tags 326 MiB
Commit graph

13362 commits

Author SHA1 Message Date
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
b700c3a8bf Merge branch 'next' into cv-can-change 2023-12-31 12:06:27 -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
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
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
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