Commit graph

14743 commits

Author SHA1 Message Date
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
Alam Ed Arias
78b8f5851b Merge branch 'master' into next 2023-12-14 20:46:41 -05:00
Alam Ed Arias
dc79b25cb9 Merge branch 'srb2ci' into 'master'
GitLabCI: use new builder image, srb2ci

See merge request STJr/SRB2!2237
2023-12-15 01:46:08 +00:00
Alam Ed Arias
bc96645f0b GitLabCI: use new builder image, srb2ci 2023-12-14 20:15:50 -05:00
Alam Ed Arias
99d0310433 Merge branch 'master' into next 2023-12-13 01:21:11 -05: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
Alam Ed Arias
d6bb89fbb2 Merge branch 'master' into next 2023-12-05 23:11:11 -05:00
Logan-A
5867b7355e add compnote support to comptime
add compnote support to comptime
2023-12-05 23:01:44 -05:00
Logan-A
eca16a811e comptime.sh is a bash shell, so it should have eol=lf 2023-12-05 21:03:01 -05: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
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
0309535be9 Merge branch 'fix-sprite-clip-warning' into 'master'
Fix a "maybe-uninitialized" compiler warning

See merge request STJr/SRB2!2145
2023-11-26 20:42:49 +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
Alam Ed Arias
616bf6a7fe Merge branch 'master' into next 2023-11-25 19:39:43 -05: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