Commit graph

450 commits

Author SHA1 Message Date
Blur
60eb9fdb44 Prevent bots from taking slot 0 with lua. 2024-06-09 16:33:24 -05:00
sphere
b2fa2cfbd8 Merge branch 'fix-1263' into 'next'
Fix #1263

Closes #1263

See merge request STJr/SRB2!2472
2024-06-07 13:38:19 +00:00
sphere
5de350e028 Merge branch 'fix-segfault-player-spawnmobj' into 'next'
Fix segfault when trying to spawn an MT_PLAYER from Lua

See merge request STJr/SRB2!2276
2024-06-04 10:41:00 +00:00
Lactozilla
bd641c3857 Fix #1263 2024-06-02 21:40:14 -03:00
Hanicef
c208921c4a Add tofixed lua function 2024-05-01 17:26:02 +02:00
LJ Sonic
f406e9bbb5 Throw a Lua error when R_Frame2Char is called with a frame number without character representation 2024-04-03 20:39:53 +02:00
sphere
ee96ed12a4 Merge branch 'more-sprite2' into 'next'
Add 'sprite2' field to states

See merge request STJr/SRB2!2211
2024-03-07 12:06:48 +00:00
Hanicef
259997d121 Remove varargs from P_SpawnMobjFromMobj 2024-03-05 18:23:22 +01:00
Hanicef
02811b72f6 Fix segfault when trying to spawn an MT_PLAYER from Lua 2024-03-05 18:22:27 +01:00
Logan Aerl Arias
add091bac4 Merge branch 'substitute-null-with-ray' into 'next'
Substitute MT_NULL with MT_RAY in Lua

See merge request STJr/SRB2!2302
2024-03-03 23:39:49 +00:00
Logan Aerl Arias
89620dbd9e Merge branch 'shield-button-touchups' into 'next'
Shield Button Touchups

See merge request STJr/SRB2!2257
2024-03-03 23:37:05 +00:00
Logan Aerl Arias
7f68a72755 Merge branch SRB2:next into substitute-null-with-ray 2024-03-03 17:19:37 +00:00
spherallic
dbc1fe8c0e Merge branch 'next' into more-sprite2 2024-02-27 12:23:14 +01:00
Zwip-Zwap Zapony
34afebfc06 Revert P_SuperReady to a boolean transform type 2024-02-24 15:41:51 +01:00
Zwip-Zwap Zapony
90958614f3 Shield button touchups 2024-02-24 15:41:36 +01:00
Logan Aerl Arias
cf5520b275 Merge branch SRB2:next into instant-setscale 2024-02-17 03:25:41 +00:00
Logan Aerl Arias
2df90ec96b Merge branch SRB2:next into emblemexitfix 2024-02-12 05:09:04 +00:00
Zwip-Zwap Zapony
bdeec56270 Substitute MT_NULL with MT_RAY in Lua 2024-02-11 13:30:15 +01:00
Lactozilla
7cabf43e85 Merge branch 'lua-colorlib-get-sector-translation' into 'next'
Add v.getSectorColormap and P_GetSectorLightLevelAt

See merge request STJr/SRB2!2230
2024-01-21 23:54:08 +00:00
Lactozilla
970a9d65dd Merge branch 'next' into more-sprite2 2024-01-13 03:43:34 -03:00
Logan Aerl Arias
4edebbe67f Merge branch 'blockedexposed' into 'next'
Expose P_LineIsBlocking to Lua

See merge request STJr/SRB2!2150
2024-01-08 23:38:11 +00:00
Lactozilla
0ffcf89c85 Merge branch 'next' into more-sprite2 2024-01-08 02:55:19 -03:00
Logan Aerl Arias
3de4547f74 Merge branch 'expos-camreset' into 'next'
Expose P_ResetCamera / camera->reset to Lua

See merge request STJr/SRB2!2009
2024-01-03 15:36:16 +00:00
Zwip-Zwap Zapony
564d18b1ea Add and use an "instant" parameter for P_SetScale 2024-01-03 14:04:40 +01:00
Lactozilla
7fbd8f7025 Merge branch 'next' into more-sprite2 2024-01-02 22:09:17 -03:00
Logan Aerl Arias
474d112ae4 Merge branch 'setflip' into 'next'
Add "allowflip" Parameter to P_DoJump

See merge request STJr/SRB2!2158
2024-01-02 02:38:19 +00:00
Logan Aerl Arias
487b0d22ed Merge branch 'next' into raise-skin-limit 2024-01-01 16:55:04 -05:00
Logan Aerl Arias
82f37ccadd Merge branch SRB2:next into emblemexitfix 2023-12-31 17:03:43 +00:00
Logan Aerl Arias
c159987a30 Merge branch SRB2:next into blockedexposed 2023-12-31 16:57:01 +00:00
Logan Aerl Arias
cd5bc8b6eb Merge branch SRB2:next into expos-camreset 2023-12-31 16:45:58 +00:00
Logan Aerl Arias
25c24bb9d8 Merge branch SRB2:next into expos-local 2023-12-31 16:44:47 +00:00
SMS Alfredo
e680277428 Merge branch 'next' into 'setflip'
# Conflicts:
#   src/p_local.h
2023-12-29 03:30:15 +00:00
Lactozilla
70e9e2bdb0 Merge branch 'next' into more-sprite2 2023-12-27 23:48:20 -03:00
Lactozilla
eb3129490f Add P_GetSectorLightLevelAt 2023-11-30 19:50:22 -03:00
Lactozilla
5203133f72 Remove Lua lighttable 2023-11-30 19:13:26 -03:00
Lactozilla
1122373304 Merge branch 'next' into raise-skin-limit 2023-11-30 18:58:24 -03:00
sphere
c7cae406b8 Merge branch 'lua-extracolormap' into 'next'
Lua colorlib: extracolormap support

See merge request STJr/SRB2!2093
2023-11-29 11:47:06 +00:00
Lactozilla
0498c16cb6 Merge branch 'next' into raise-skin-limit 2023-11-26 23:08:13 -03:00
Lactozilla
badc122286 Merge branch 'next' into more-sprite2 2023-11-26 22:36:01 -03:00
SMS Alfredo
e50993861e Dedicated Shield / Super Transformation Button 2023-11-26 20:38:49 +00:00
Lactozilla
a3e6b5e0fb Merge remote-tracking branch 'stjr/next' into raise-skin-limit 2023-11-23 13:48:18 -03:00
Lactozilla
563ce141ce Fix P_GetSectorColormapAt 2023-11-23 13:38:36 -03:00
Lactozilla
0a3f2ec4f8 Merge remote-tracking branch 'stjr/next' into lua-extracolormap 2023-11-23 13:38:31 -03:00
Lactozilla
f0bb1a4ab6 Add some comments 2023-11-13 14:08:08 -03:00
Lactozilla
1576f02d6c Add P_GetSuperSprite2 2023-11-13 12:19:03 -03:00
Lactozilla
ecabadba94 Add P_GetStateSprite2, P_GetSprite2StateFrame, P_IsStateSprite2Super to Lua 2023-11-13 12:13:44 -03:00
Lactozilla
4408f4462e Add 'sprite2' field to states 2023-11-12 21:46:49 -03:00
SMS Alfredo
c2c157603b Merge branch 'next' into 'setflip'
# Conflicts:
#   src/p_local.h
2023-11-06 00:47:51 +00: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