stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-22 20:41:25 +00:00
Code Issues Projects Releases Packages Wiki Activity
15258 commits 171 branches 41 tags 312 MiB
Commit graph

15258 commits

This branch
This branch
All branches
Author SHA1 Message Date
Krabs
e2a0d742ed Merge branch SRB2:next into expos-sky 2023-11-01 14:16:07 +00:00
Krabs
23666ce64e Merge branch SRB2:next into expos-local 2023-11-01 14:15:43 +00:00
Krabs
93c5b34ac0 Merge branch SRB2:next into expos-sphere 2023-11-01 14:14:16 +00:00
Lactozilla
d6b92de691 Revert these 2023-10-31 16:52:12 -03: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
sdasdas
d73ed99703 check for hud_nightsrecords in old special stages 2023-10-31 22:06:22 +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
Krabs
4e9915e1ba Merge branch SRB2:next into bind-multi-arg 2023-10-31 04:46:53 +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
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
Lactozilla
743926e61e Make static 2023-10-29 23:42:50 -03:00
Lactozilla
6de7fc3223 Add 'translation' object property 2023-10-29 23:34:18 -03:00
Lactozilla
4f873d5f8f WIP ZDoom translations 2023-10-29 20:33:49 -03: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
51c3dd3ff5 Merge branch 'master' into constants-global 2023-10-28 23:19:52 -04:00
Alam Ed Arias
97e449bd59 Merge branch 'master' into lua-minmax-plus-bruh-moments 2023-10-28 22:29:19 -04:00
Alam Ed Arias
0c49144c72 Merge branch 'master' into udmf-texture-scaling 2023-10-28 21:35:35 -04:00
Alam Ed Arias
bdc4512565 Merge branch 'master' into quake-fix 2023-10-28 21:02:44 -04:00
Alam Ed Arias
4398d3e104 Merge branch 'master' into ogl-wireframe 2023-10-28 20:43:08 -04:00
Alam Ed Arias
a2e288a4dc Merge branch 'master' into fix-segfault-removemobj-spawn 2023-10-28 20:40:07 -04:00
Alam Ed Arias
49d9619192 Merge branch 'master' into raise-skin-limit 2023-10-28 18:09:42 -04:00