Commit graph

14635 commits

Author SHA1 Message Date
Lactozilla
073e866842 Add teamscores to Lua 2023-11-25 17:19:02 -03:00
Lactozilla
a927a4f56b Manual cherry-pick of b9cab85df0 2023-11-25 17:15:14 -03:00
Lactozilla
bd5542c182 Implement adding new teams 2023-11-25 17:06:30 -03:00
Lactozilla
d497be795e Make teams more customizable 2023-11-25 17:00:24 -03:00
Lactozilla
9d2c344447 Fix flag capturing 2023-11-25 16:59:26 -03:00
Lactozilla
bd55ecc04b Correctly announce team flag name when capturing it 2023-11-25 16:59:18 -03:00
Lactozilla
efcac9aac6 Custom teams WIP 2023-11-25 16:59:02 -03:00
Lactozilla
f98fc888ee Remove another unused prototype 2023-11-25 15:53:56 -03:00
Lactozilla
257872e470 Remove prototype 2023-11-25 15:53:19 -03:00
Lactozilla
0fb15a3f35 Use strlcpy here 2023-11-25 15:49:26 -03:00
Lactozilla
981f515919 Allow replacing gametype data through SOC
Make other fixes
2023-11-25 15:47:21 -03:00
Lactozilla
262bd5599d Add RANKINGS_ constants to INT_CONST 2023-11-25 15:36:56 -03:00
Lactozilla
f9361604b0 Update gametype_cons_t on gametype name changes 2023-11-25 15:36:34 -03:00
Lactozilla
80359c35f0 Make gametype data available to Lua 2023-11-25 15:36:21 -03:00
Lactozilla
aadaf2e007 Make gametype struct and organize gametype data 2023-11-25 15:32:09 -03: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