Commit graph

14684 commits

Author SHA1 Message Date
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
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
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
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
1009c31ad1 Change some instances of sizeu1 to sizeu2 2023-11-23 14:36:02 -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
Gustaf Alhäll
e6dfeace84
Fix anisotropic and FOV settings not saving 2023-11-19 13:27:48 +01:00
Gustaf Alhäll
fa050cdebf
Redesign search mechanism 2023-11-18 20:44:26 +01:00
Gustaf Alhäll
13aed6ad25
Add apropos console command 2023-11-18 14:44:59 +01:00
LJ Sonic
8cc7a88c5f Make module music volume more accurate 2023-11-16 22:00:23 +01:00
Krabs
7962b243de Merge branch 'interpolate-captions' into 'next'
Interpolate captions, Untie captions from resolution

See merge request STJr/SRB2!1930
2023-11-14 04:47:50 +00:00
Krabs
e327b5fdf2 Merge branch 'quake-fix' into 'next'
Implement epicenter and radius support for quakes.

See merge request STJr/SRB2!1797
2023-11-14 04:22:45 +00:00
Krabs
177bdd6868 Merge branch 'platformpmomz' into 'next'
Do not apply pmomz when jumping/bouncing through a platform

Closes #72

See merge request STJr/SRB2!1955
2023-11-14 04:02:39 +00:00
Alam Ed Arias
f644877bd3 Update .gitlab-ci.yml file
Fixup ARM64 build
2023-11-10 15:42:37 +00:00
Alam Ed Arias
2062553d22 Update i_system.c
Add a check for overflowing the TERIOS buffer
2023-11-09 20:21:04 -05:00
SMS Alfredo
7c986c6d29 Make sure bot has CA_FLY or CA2_SPINDASH for their behaviors 2023-11-09 17:01:27 -06:00
Krabs
55444cf204 Update version num (no, .14 isn't releasing yet) 2023-11-09 10:31:03 -05: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
Krabs
7b1939c346 Merge branch 'lua-input-improvements' into 'next'
A few Lua input improvements

See merge request STJr/SRB2!2185
2023-11-04 16:02:09 +00:00
Gustaf Alhäll
5d18822142
Improve file search performance on Linux and FreeBSD 2023-11-04 14:21:17 +01:00
Alam Ed Arias
9b60fd824a Merge branch 'pickedchar-fix' into 'next'
Fix #1126 and #1127

Closes #1127 and #1126

See merge request STJr/SRB2!2189
2023-11-02 23:53:45 +00:00
Krabs
5ac297475c Merge branch 'expos-sky' into 'next'
Expose P_CheckSkyHit to Lua

See merge request STJr/SRB2!2000
2023-11-01 17:47:42 +00:00
Krabs
39ca3a0582 Merge branch SRB2:next into expos-sky 2023-11-01 17:26:59 +00:00
Krabs
daeb41e73b Merge branch 'expos-dust' into 'next'
Expose P_DoSpinDashDust to Lua

See merge request STJr/SRB2!1998
2023-11-01 16:52:16 +00:00
Krabs
7fd3c0612a Merge branch SRB2:next into expos-dust 2023-11-01 16:29:58 +00:00
Krabs
a97ba3fc87 Merge branch 'expos-follow' into 'next'
Expose FollowMobj-related functions to Lua

See merge request STJr/SRB2!1994
2023-11-01 16:26:39 +00:00
Krabs
d1a6290a69 Merge branch SRB2:next into expos-follow 2023-11-01 16:10:49 +00:00
Krabs
f81b0c78ad Merge branch 'expos-special' into 'next'
Expose P_TouchSpecialThing to Lua

See merge request STJr/SRB2!1993
2023-11-01 16:10:28 +00:00