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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Krabs
|
bceadc02f3
|
Merge branch SRB2:next into expos-special
|
2023-11-01 15:58:06 +00:00 |
|
Alam Ed Arias
|
dfd05c6172
|
Merge branch 'master' into next
|
2023-11-01 11:37:28 -04:00 |
|
Krabs
|
c74163b313
|
Merge branch SRB2:next into expos-special
|
2023-11-01 15:34:09 +00:00 |
|
Krabs
|
6812a41b6d
|
Merge branch 'expos-sphere' into 'next'
Expose P_GivePlayerSpheres to Lua
See merge request STJr/SRB2!1996
|
2023-11-01 15:31:23 +00:00 |
|
Alam Ed Arias
|
7643ffadbc
|
Update .gitlab-ci.yml file
Limit builds to just "Windows x86" and "Debian stable:amd64", all other builds can be started manually
|
2023-11-01 15:13:40 +00:00 |
|
Krabs
|
8a1ebf2f7c
|
Merge branch SRB2:next into expos-dust
|
2023-11-01 14:31:42 +00:00 |
|
Krabs
|
44c11cccbf
|
Merge branch SRB2:next into expos-follow
|
2023-11-01 14:19:45 +00:00 |
|
Krabs
|
23b0f67900
|
Merge branch SRB2:next into expos-special
|
2023-11-01 14:18:25 +00:00 |
|
Krabs
|
e2a0d742ed
|
Merge branch SRB2:next into expos-sky
|
2023-11-01 14:16:07 +00:00 |
|
Krabs
|
93c5b34ac0
|
Merge branch SRB2:next into expos-sphere
|
2023-11-01 14:14:16 +00:00 |
|
Lactozilla
|
e9637322f9
|
Simplify fix
pickedchar doesn't need to be set in these two places, since G_DeferedInitNew already does that.
|
2023-10-31 16:45:47 -03:00 |
|
Zwip-Zwap Zapony
|
8cf6e8252c
|
Interpolate captions
|
2023-10-31 13:30:16 +01:00 |
|
Zwip-Zwap Zapony
|
c2aa6d4c74
|
Fix captions being over-affected by GUI scale
Captions' pop-in animation now starts 8 GUI pixels above the resting position, instead of (2 x GUI scale) GUI above it
|
2023-10-31 13:14:36 +01:00 |
|
Zwip-Zwap Zapony
|
36e20ac619
|
Tiny caption loop optimisation
|
2023-10-31 13:10:39 +01:00 |
|
Lactozilla
|
4e446d22d6
|
Fix pickedchar not being set when it should have been
|
2023-10-31 04:04:01 -03:00 |
|
Krabs
|
cec5338f7c
|
Merge branch 'lua-minmax-plus-bruh-moments' into 'next'
Fix bugs with preset values in lua cvars
See merge request STJr/SRB2!1484
|
2023-10-31 05:36:56 +00:00 |
|
Alam Ed Arias
|
419925036b
|
Merge remote-tracking branch 'origin/next' into lua-minmax-plus-bruh-moments
|
2023-10-30 22:44:44 -04:00 |
|
Monster Iestyn
|
6976f8524d
|
Merge branch 'expose-thrust-funcs-to-lua' into 'next'
Expose more thrust functions to Lua
See merge request STJr/SRB2!1493
|
2023-10-30 21:23:38 +00:00 |
|
Monster Iestyn
|
165a925220
|
Merge branch SRB2:next into expose-thrust-funcs-to-lua
|
2023-10-30 18:10:21 +00:00 |
|
Krabs
|
d6a0006b75
|
Merge branch 'combine-dupx-and-dupy' into 'next'
Combine vid.dupx and vid.dupy
See merge request STJr/SRB2!1118
|
2023-10-30 04:38:52 +00:00 |
|
Zwip-Zwap Zapony
|
cd6cd53959
|
Combine vid.dupx and vid.dupy
|
2023-10-30 04:38:51 +00:00 |
|
Krabs
|
d37a0a944d
|
Merge branch 'blue-spring-balls' into 'next'
Blue spring balls
See merge request STJr/SRB2!1282
|
2023-10-30 04:37:00 +00:00 |
|
Logan Arias
|
2dcf845c7c
|
Merge branch SRB2:next into blue-spring-balls
|
2023-10-29 18:23:50 +00:00 |
|
Krabs
|
f3c2fb50d7
|
Merge branch 'leaderofthechaotix' into 'next'
Possible fix for Leader of the Chaotix bug (credit Zwip Zwap Zapony)
Closes #1135
See merge request STJr/SRB2!2183
|
2023-10-29 17:43:40 +00:00 |
|
katsy
|
340d515754
|
Fix for "Leader of the Chaotix" name change bug (credit Zwip Zwap Zapony)
|
2023-10-29 17:43:40 +00:00 |
|
Monster Iestyn
|
512839453b
|
Merge branch 'fix-opengl-saturation' into 'next'
Fix saturation not being applied on colormaps in OpenGL
Closes #920
See merge request STJr/SRB2!2151
|
2023-10-29 16:37:35 +00:00 |
|
Monster Iestyn
|
962b1cb29e
|
Merge branch 'fix-opengl-saturation-console' into 'next'
Fix saturation not being applied on console on OpenGL
See merge request STJr/SRB2!2149
|
2023-10-29 16:37:24 +00:00 |
|
Monster Iestyn
|
e825a93add
|
Merge branch 'nononet' into 'next'
Revert "Merge branch 'master' into next"
See merge request STJr/SRB2!2187
|
2023-10-29 16:19:16 +00:00 |
|
Alam Ed Arias
|
b4ba90b29d
|
Merge branch 'master' into next
|
2023-10-29 08:47:28 -04:00 |
|
Alam Ed Arias
|
bea48012c4
|
Merge branch 'musl' into 'master'
Update .gitlab-ci.yml file
See merge request STJr/SRB2!2186
|
2023-10-29 05:16:34 +00:00 |
|
Alam Ed Arias
|
18f61ab90c
|
Update .gitlab-ci.yml file
Add ARM64=1 for arm build
|
2023-10-29 05:14:48 +00:00 |
|
Alam Ed Arias
|
97e449bd59
|
Merge branch 'master' into lua-minmax-plus-bruh-moments
|
2023-10-28 22:29:19 -04:00 |
|