Commit graph

132 commits

Author SHA1 Message Date
James R
c33d8b3b5d Merge remote-tracking branch 'origin/next' into hudlib-hook-refactor 2021-09-12 18:37:47 -07:00
Tatsuru
db92f31f7d Revert "Merge branch 'draw-act-num' into 'next'"
This reverts merge request !1532
2021-09-12 18:41:36 -04:00
Tatsuru
30567d75df Merge branch 'draw-act-num' into 'next'
Expose act number drawing functions to Lua

See merge request STJr/SRB2!1532
2021-09-12 22:15:43 +00:00
Tatsuru
bcd7468d25 Merge branch 'lua-camera' into 'next'
Allow Lua write access to camera_t variables & expose the cameras globally

See merge request STJr/SRB2!1581
2021-09-12 20:20:49 +00:00
Tatsuru
eec765749b Merge branch 'drawcroppedpatch-improvements' into 'next'
V_DrawCroppedPatch(...) Lua exposure and improvements

See merge request STJr/SRB2!1316
2021-09-10 16:14:38 +00:00
SteelT
2578e01cfb Merge branch 'writable-colormaps' into 'next'
Make the colormap returned by v.getColormap() writable.

See merge request STJr/SRB2!959
2021-09-05 21:07:10 +00:00
lachablock
117e3e2670 Expose P_TryCameraMove and P_TeleportCameraMove, disallow write access to camera.x and camera.y, allow write access to camera.height and camera.radius 2021-07-11 16:23:50 +10:00
lachablock
366b1f65a1 Allow Lua write access to camera_t variables & expose the cameras globally 2021-07-10 18:22:07 +10:00
James R
b4fa98d2fb Refactor hudlib hooks to hooklib
HUD hooks now meet the standard of hooklib. HUD registry
magic numbers are gone.

HUD hooks may also be added using addHook.

    addHook('HUD', fn[, type])

hud.add still exists, but the intention is to remove it
eventually.
2021-07-07 00:23:51 -07:00
Radicalicious
7483a9d049 Switch num and flags so flags is optional 2021-06-03 10:55:42 -04:00
Radicalicious
cb5e433a49 Update lua_hudlib.c 2021-06-03 09:34:18 -04:00
sphere
5a91f3326a Merge branch 'disable-int-emeralds' into 'next'
Some more intermission features for Lua

See merge request STJr/SRB2!1329
2021-06-01 15:38:00 -04:00
LJ Sonic
d325c7e6d3 The year is 2021 2021-05-07 17:45:56 +02:00
Zwip-Zwap Zapony
acff5c1ada Merge branch 'next' into drawcroppedpatch-improvements 2021-04-25 10:15:16 +02:00
GoldenTails
e7156db79d Allow Lua to draw level title strings, and get the width and height of what would be drawn 2021-04-20 23:52:25 -05:00
GoldenTails
43c21edcbd Send IntermissionThinker and intermission hud hooks stagefailed. 2021-04-20 23:52:25 -05:00
GoldenTails
aa54a04c9e Allow Lua to stop the intermission level title strings from drawing 2021-04-20 23:52:25 -05:00
GoldenTails
6c4e7e13e0 Allow Lua to disable the emeralds that appear in the Special Stage intermission. 2021-04-20 23:52:25 -05:00
LJ Sonic
0de3a64b59 Let Lua toggle the crosshair 2020-12-29 21:36:15 +01:00
GoldenTails
81ee4a75e3 Copy colormaps so Lua cannot modify cached colormaps! (And Z_Free them on garbage collection.) 2020-12-18 02:24:20 -06:00
GoldenTails
f91489bcb6 Make the colormap returned by v.getColormap() writable.
I mean it was already readable anyway...
2020-12-18 02:24:20 -06:00
Zwip-Zwap Zapony
029e79024b V_DrawCroppedPatch Lua exposure and improvements
Separated X and Y scale, and added colormap argument
Added V_*SCALEPATCH and V_PERPLAYER flags support
Made sx,sy,w,h into fixed-point values
Exposed to Lua as "v.drawCropped(...)"
(Also fix HWR_DrawStretchyFixedPatch ignoring vscale without pscale)
2020-12-11 23:43:38 +01:00
James R
703631956b Merge branch 'dumb-stuff' into 'next'
Fix TC_DASHMODE not accessible to v.getColormap; add missing skin flags

See merge request STJr/SRB2!1273
2020-12-10 15:17:28 -05:00
LJ Sonic
eef3028110 Merge branch 'fix-stacktrace' of https://git.do.srb2.org/STJr/SRB2.git into next
# Conflicts:
#	src/dehacked.c
#	src/dehacked.h
2020-11-29 21:54:15 +01:00
James R
b9f6069cd0 Replace TC macros with an enum that automatically counts up
Also fixes TC_DASHMODE not being accessible to Lua.
2020-11-28 02:19:52 -08:00
Jaime Ita Passos
abe35fd008 Some interface fixes 2020-11-22 17:22:18 -03:00
Louis-Antoine
01124f2076 Fix Lua stacktrace not showing in various situations 2020-11-13 19:12:25 +01:00
Louis-Antoine
04826d2615 Replace lua_pop(-1) with lua_settop(0) 2020-11-13 15:31:11 +01:00
Jaime Passos
cc97e22e2f Changes to sprite rendering:
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
2020-10-12 00:13:22 -03:00
Jaime Passos
6e5f71dd45 Refactor patch rotation 2020-10-10 18:43:26 -03:00
Jaime Passos
b15bbd505c Merge branch 'next' into patch-stuff-again-2 2020-10-10 17:01:10 -03:00
Jaime Passos
dcaad758f4 Improved memory management for patches 2020-09-07 02:23:07 -03:00
GoldenTails
4173b15c8e Expose V_GetStringColormap to Lua via v.getStringColormap(). 2020-09-01 10:47:02 -05:00
Jaime Passos
2a0e47e28f Remove LUA_PATCH_SAFETY 2020-08-08 14:56:04 -03:00
SwitchKaze
b37c73b008 Make colors UINT16, increase color freeslots to 1024 2020-05-23 19:35:36 -05:00
SwitchKaze
46191cade7 Update to 2.2.4 2020-05-22 16:47:51 -05:00
Louis-Antoine
212358dbba Restore old entry searching functions and add alternate versions for long names 2020-04-26 00:39:52 +02:00
Louis-Antoine
e3cbdf8fab Use HAVE_BLUA as fuel for my fireplace 2020-03-19 18:36:14 +01:00
SwitchKaze
6415e10216 Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors 2020-02-23 11:50:13 -05:00
James Hale
56b67a3b4f Custom skincolors 2020-02-21 21:56:39 -05:00
Steel Titanium
76f26cda24 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R
62d943b609 Merge branch 'thin-fixed' into 'next'
Add more strings (and respective functions) for v.drawString().

See merge request STJr/SRB2!770
2020-02-20 19:27:01 -05:00
James R
7060083db5 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
James R
11a1ce6df9 Merge branch 'lua-hud-get-rotsprites' into 'next'
Get rotated sprites with v.getSprite(2)Patch

See merge request STJr/SRB2!773
2020-02-16 23:51:49 -05:00
James R
ba92db412a Merge branch 'patch-valid' into 'next'
Don't error when checking patch.valid on invalid patches

See merge request STJr/SRB2!780
2020-02-12 21:19:19 -05:00
colette
d3e5cbffba comment 2020-02-12 08:54:20 -05:00
fickleheart
b7a6773ff5 Don't error when checking patch.valid on invalid patches 2020-02-11 23:25:01 -06:00
fickleheart
76b397bece Get rotated sprites with v.getSprite(2)Patch
NOTE: since rotated sprites are offset upward by 4px from non-rotated
sprites, these functions will now return a third boolean (true) if a
rotated sprite was returned, so that scripters can offset accordingly.
2020-02-10 01:02:06 -06:00
colette
01433c3648 Fix title/card hud hooks grabbing the wrong functions 2020-02-03 23:09:18 -05:00
GoldenTails
fe17933156 Make V_DrawCenteredSmallThinString() a less precise wrapper for V_DrawCenteredSmallThinStringAtFixed() for new "small-thin-center" option in v.drawString() 2020-02-01 11:01:39 -06:00