Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lua #2043

Draft
wants to merge 111 commits into
base: master
Choose a base branch
from
Draft

Lua #2043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
ccb1457
initial
PieterVdc Dec 11, 2022
4a0a971
add lua_get_creature_near and fix MoveThingTo
PieterVdc Dec 12, 2022
5c93316
add KillCreature
PieterVdc Dec 12, 2022
0580a11
add winlose, reenable loop
PieterVdc Dec 12, 2022
d9f172d
add luau dep
PieterVdc Dec 13, 2022
40d117a
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc Dec 17, 2022
fa42590
Merge branch 'master' into lua
PieterVdc Dec 30, 2022
f66e3cc
switch to luau
PieterVdc Jan 13, 2023
cd628aa
slightly better makefile
PieterVdc Jan 14, 2023
a1f0544
update
PieterVdc Jan 18, 2023
aa9805d
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc Jan 22, 2023
0be286b
Update main_game.c
PieterVdc Jan 22, 2023
b0521ec
Update lua_base.c
PieterVdc Jan 22, 2023
7bd9271
Update lua_base.h
PieterVdc Jan 23, 2023
cd2b5f0
switch to luajit
PieterVdc Jan 23, 2023
c72e8d4
Revert "switch to luajit"
PieterVdc Jan 23, 2023
21b42ad
go back to mainstream lua
PieterVdc Jan 23, 2023
cb65771
use 5.1 to closer resemble luau
PieterVdc Jan 25, 2023
8d528d4
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc Jan 25, 2023
5c9ce8a
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc Jan 27, 2023
c271253
upadte
PieterVdc Jan 29, 2023
876eb17
Merge branch 'master' into lua
PieterVdc Feb 2, 2023
34bb9f5
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc Feb 11, 2023
450e388
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc Feb 18, 2023
abc44e7
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc Feb 19, 2023
206c27b
add native.lua
PieterVdc Feb 23, 2023
2145f47
Update native.lua
PieterVdc Feb 23, 2023
408cb6c
update
PieterVdc Feb 23, 2023
9668bf2
Update native.lua
PieterVdc Feb 24, 2023
771b8dd
update
PieterVdc Feb 24, 2023
d3c1fb3
Update native.lua
PieterVdc Feb 26, 2023
0cca7f1
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc Feb 27, 2023
e516fe0
update
PieterVdc Mar 3, 2023
f0cd6df
fix
PieterVdc Mar 4, 2023
f1243d8
update
PieterVdc Mar 10, 2023
5b30d7c
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc Mar 15, 2023
09accde
update
PieterVdc Mar 20, 2023
bf49d40
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc May 27, 2023
e6ce47a
fix conflict
PieterVdc May 27, 2023
e655812
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc May 29, 2023
7c08dd9
update
PieterVdc May 29, 2023
64063b2
remove flag stuff
PieterVdc Jun 4, 2023
0244d67
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc Jul 7, 2023
8cf8f8e
update
PieterVdc Jul 23, 2023
964e07e
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc Jul 23, 2023
6af6b12
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc Oct 3, 2023
d588295
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc Nov 15, 2023
a888473
Update native.lua
PieterVdc May 7, 2024
8ae0d2a
Add files via upload
PieterVdc May 8, 2024
976ada0
Update native.lua
PieterVdc May 14, 2024
b759f18
Update native.lua
PieterVdc May 16, 2024
aa09b7f
Update native.lua
PieterVdc May 16, 2024
aff7509
go with luajit instead
PieterVdc May 16, 2024
03e712f
jit
PieterVdc May 16, 2024
4e9fce6
Delete luau
PieterVdc May 16, 2024
bba4a78
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc May 16, 2024
845e345
update
PieterVdc May 17, 2024
d62ff88
Delete luau.mk
PieterVdc May 17, 2024
28fd2c7
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc May 18, 2024
47fd7d2
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc May 18, 2024
6e498ae
.
PieterVdc May 18, 2024
9091edd
.
PieterVdc May 19, 2024
e3217ea
.
PieterVdc May 20, 2024
10a62c8
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc May 20, 2024
bb5eb9e
add triggers to api
PieterVdc May 21, 2024
25e4967
update
PieterVdc May 22, 2024
cc5288d
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc May 24, 2024
769f5fe
update
PieterVdc May 24, 2024
59cdf7c
Update triggers.lua
PieterVdc May 24, 2024
39dfeac
Update triggers.lua
PieterVdc May 24, 2024
c869b91
.
PieterVdc May 24, 2024
e99ff55
Update triggers.lua
PieterVdc May 24, 2024
473f4b0
update
PieterVdc May 24, 2024
7891916
Update lua_triggers.c
PieterVdc May 24, 2024
2c07186
.
PieterVdc May 26, 2024
a5bef3d
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc May 26, 2024
0f47d80
make multiple events per trigger possibel
PieterVdc May 26, 2024
97203eb
update
PieterVdc May 26, 2024
967af2e
Update native.lua
PieterVdc May 26, 2024
7092b9b
Update native.lua
PieterVdc May 26, 2024
52aed34
Update native.lua
PieterVdc May 27, 2024
76e049f
update
PieterVdc May 28, 2024
09dfb4e
serialize part1
PieterVdc Jun 2, 2024
298a6c2
.
PieterVdc Jun 2, 2024
85d5879
reorder stuff in api.c
PieterVdc Jun 5, 2024
6472fcd
Update lua_api.c
PieterVdc Jun 5, 2024
a09eb61
cfgfuncs part1
PieterVdc Jun 7, 2024
b1b0adf
update api
PieterVdc Jun 7, 2024
f18b3bd
update
PieterVdc Jun 7, 2024
a6fd89a
update
PieterVdc Jun 7, 2024
a986a3e
.
PieterVdc Jun 7, 2024
8debf6a
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc Jun 7, 2024
e57d5c8
update
PieterVdc Jun 7, 2024
0cf9b54
.
PieterVdc Jun 7, 2024
e597ce8
update
PieterVdc Jun 11, 2024
e929c61
.
PieterVdc Jun 13, 2024
1930e3b
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc Jul 3, 2024
1c71c8a
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc Jul 5, 2024
4036b20
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc Jul 19, 2024
e90563d
Merge branch 'master' into lua
PieterVdc Sep 13, 2024
e1c3368
Merge remote-tracking branch 'upstream/master' into lua
PieterVdc Oct 13, 2024
486aab4
fix merge master
PieterVdc Oct 13, 2024
511d317
Merge branch 'lua' of https://github.com/PieterVdc/keeperfx into lua
PieterVdc Oct 13, 2024
3f995d8
more merge fix
PieterVdc Oct 13, 2024
befa024
fix up lua_COMPUTER_PLAYER
PieterVdc Oct 13, 2024
cd52576
.
PieterVdc Oct 18, 2024
f6215dd
Update lua_api.c
PieterVdc Oct 18, 2024
88d7f8c
,
PieterVdc Oct 21, 2024
45b1465
Merge branch 'master' into lua
PieterVdc Oct 22, 2024
58cd8a9
fix compile error
PieterVdc Oct 22, 2024
f6494a6
Update luajit
PieterVdc Oct 22, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@
[submodule "deps/enet"]
path = deps/enet
url = https://github.com/lsalzman/enet.git
[submodule "deps/luajit"]
path = deps/luajit
url = https://github.com/LuaJIT/LuaJIT.git
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,11 @@ obj/config_effects.o \
obj/lens_flyeye.o \
obj/lens_mist.o \
obj/light_data.o \
obj/lua_api.o \
obj/lua_base.o \
obj/lua_cfg_funcs.o \
obj/lua_params.o \
obj/lua_triggers.o \
obj/lvl_filesdk1.o \
obj/lvl_script.o \
obj/lvl_script_commands.o \
Expand Down Expand Up @@ -352,7 +357,7 @@ CU_OBJS = \
obj/cu/Util.o

# include and library directories
LINKLIB = -L"sdl/lib" -mwindows obj/enet.a \
LINKLIB = -L"sdl/lib" -mwindows obj/enet.a deps/luajit/src/lua51.lib deps/luajit/src/minilua.lib deps/luajit/src/luajit.lib deps/luajit/src/buildvm.lib\
-lwinmm -lmingw32 -limagehlp -lSDL2main -lSDL2 -lSDL2_mixer -lSDL2_net -lSDL2_image \
-L"deps/zlib" -lz -lws2_32 -ldbghelp
INCS = -I"sdl/include" -I"sdl/include/SDL2" -I"deps/enet/include" -I"deps/centijson/src" -I"deps/centitoml" -I"deps/astronomy"
Expand Down
Loading