Commit graph

15258 commits

Author SHA1 Message Date
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
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
Lactozilla
ca4f7cc508 Correct OpenGL wall texture scaling 2023-11-23 21:43:18 -03:00
Lactozilla
f3c98158b6 Fix top texture offsets 2023-11-23 20:08:46 -03:00
Lactozilla
2f20f21eb6 Correct texture scaling, part 3 2023-11-23 20:03:23 -03:00
Lactozilla
10537deacf Correct texture scaling, part 2 2023-11-23 19:16:03 -03:00
Lactozilla
59aa82a83c Correct texture scaling, part 1 2023-11-23 18:21:53 -03:00
Lactozilla
b8cb4498db Merge remote-tracking branch 'stjr/next' into udmf-texture-scaling 2023-11-23 16:12:16 -03:00
Lactozilla
1009c31ad1 Change some instances of sizeu1 to sizeu2 2023-11-23 14:36:02 -03:00
Lactozilla
85f6e37ed0 Update comment 2023-11-23 13:56:42 -03:00
Lactozilla
a3e6b5e0fb Merge remote-tracking branch 'stjr/next' into raise-skin-limit 2023-11-23 13:48:18 -03:00
Lactozilla
46bd7344c5 Rename 'sector.extracolormap' to just 'sector.colormap' 2023-11-23 13:39:24 -03:00
Lactozilla
563ce141ce Fix P_GetSectorColormapAt 2023-11-23 13:38:36 -03:00
Lactozilla
0a3f2ec4f8 Merge remote-tracking branch 'stjr/next' into lua-extracolormap 2023-11-23 13:38:31 -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
Lactozilla
fddcb5cfdc Fix P_GetSectorColormapAt 2023-11-21 21:15:09 -03:00
Lactozilla
0763bc1117 Merge remote-tracking branch 'stjr/next' into lua-colorlib 2023-11-21 21:13:08 -03:00
Lactozilla
6c1b9b8678 Make translation field return the name of the translation 2023-11-21 16:46:32 -03:00
Lactozilla
803fe613d2 Fix possible overflow in PaletteRemap_AddDesaturation 2023-11-21 16:26:01 -03:00
Lactozilla
f3ee20dde0 Merge remote-tracking branch 'stjr/next' into translations 2023-11-21 12:09:48 -03:00