Commit graph

14644 commits

Author SHA1 Message Date
Lactozilla
048e135c49 Implement:
R_DrawFloorSprite_8_RGBA, R_DrawTranslucentFloorSprite_8_RGBA, R_DrawTiltedFloorSprite_8_RGBA, R_DrawTiltedTranslucentFloorSprite_8_RGBA
R_DrawFloorSprite_NPO2_8_RGBA, R_DrawTranslucentFloorSprite_NPO2_8_RGBA, R_DrawTiltedFloorSprite_NPO2_8_RGBA, R_DrawTiltedTranslucentFloorSprite_NPO2_8_RGBA
2023-11-06 19:27:38 -03:00
Lactozilla
7121bc717c Initialize these variables 2023-11-06 19:03:57 -03:00
Lactozilla
b29a474dee Merge branch 'lua-gfx-2' into lua-gfx-sprites 2023-11-06 18:47:58 -03:00
Lactozilla
d8d2371d0c Delete Patch_GetColumn 2023-11-06 18:43:41 -03:00
Lactozilla
6d9e396b16 Merge remote-tracking branch 'stjr/next' into lua-gfx-2 2023-11-06 18:37:28 -03:00
Lactozilla
4f1cf79e87 Copy some changes from the lua-gfx-sprites branch 2023-11-06 18:29:33 -03:00
Lactozilla
0ecbdf6831 Remove calls to Patch_GetColumn, remove ylookup checks 2023-11-06 18:11:48 -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
Lactozilla
b98f77bcdb Image in sprite part 2 2023-11-02 20:24:40 -03:00
Lactozilla
dff710c9bc Add 'image' field to objects 2023-11-02 19:13:11 -03:00
Lactozilla
073a90a6ce Cleanup 2023-11-01 22:39:40 -03:00
Lactozilla
eeba0e63a4 Merge branch 'next' into lua-gfx-2 2023-11-01 22:32:10 -03:00
Lactozilla
d6700a7584 Add use_pixel_alpha parameter 2023-11-01 20:46:09 -03:00
Lactozilla
5a89823cc6 Implement V_DrawIntoPatchRGBA 2023-11-01 20:39:02 -03: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
4e446d22d6 Fix pickedchar not being set when it should have been 2023-10-31 04:04:01 -03:00
Lactozilla
9d6cb93127 Cleanup R_DrawPrecipitationVisSprite and fix a warning 2023-10-31 03:46:30 -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
Lactozilla
379c163bef Implement RGBA image creation (WIP) 2023-10-31 01:04:31 -03: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
6d5f5a5247 Merge remote-tracking branch 'stjr/next' into lua-gfx-2 2023-10-30 21:13:42 -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
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