stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-02 06:23:03 +00:00
Code Issues Projects Releases Packages Wiki Activity
14640 commits 180 branches 42 tags 323 MiB
Commit graph

14640 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Lactozilla
879ac8dcd5 Merge remote-tracking branch 'stjr/next' into translations 2023-11-06 22:58:25 -03: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
Lactozilla
62f3454268 Reduce code duplication 2023-10-31 16:26:51 -03:00
Lactozilla
b65d8d1010 Update copyrights 2023-10-31 15:52:10 -03:00
Lactozilla
19f2535403 OpenGL: Ensure linked objects inherit translation in certain situations 2023-10-31 15:50:25 -03:00
Lactozilla
db47eb512c Fix objects that don't have a color not being translated 2023-10-31 15:42:24 -03:00
Lactozilla
61673fe615 Add built-in translations 'AllWhite', 'AllBlack', and 'DashMode' 2023-10-31 15:30:20 -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
Lactozilla
2064c220a0 Fix warnings 2023-10-31 03:44:20 -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
Lactozilla
55a6f0c394 Fix parsing of TRANSLATION_ 2023-10-30 20:57:54 -03:00
Lactozilla
0731272fab Add A_SetTranslation and load TRNSLATE before SOC and Lua scripts 2023-10-30 20:52:28 -03: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
Lactozilla
d479917bb7 Update comment 2023-10-30 17:49:46 -03:00
Lactozilla
4545f954e7 Add translations[] to Lua 2023-10-30 17:45:29 -03:00
Lactozilla
799bbe62ee Copy translation in P_SpawnGhostMobj 2023-10-30 15:12:09 -03:00
Monster Iestyn
165a925220 Merge branch SRB2:next into expose-thrust-funcs-to-lua 2023-10-30 18:10:21 +00:00
Lactozilla
9dbf30e20d Refactor tokenizer 2023-10-30 14:54:32 -03:00
Lactozilla
dcae99a9fb Add 'Grayscale' translation 2023-10-30 14:08:23 -03:00