Skip to content

Commit b09c50c

Browse files
committed
Merge branch 'rc-1.0' into stable
2 parents 8e9dfe2 + 6fb5e66 commit b09c50c

File tree

166 files changed

+34813
-20484
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+34813
-20484
lines changed

.github/workflows/build.yml

Lines changed: 585 additions & 393 deletions
Large diffs are not rendered by default.

.gitignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ build/uwp/code8/AppPackages/
2626
build/uwp/code8/_pkginfo.txt
2727
build/uwp/tic/tic.VC.db
2828
build/uwp/tic/_pkginfo.txt
29+
build/mruby_vendor-prefix
2930
tests/history.exe
3031
build/uwp/lua/x64/
3132
build/uwp/lua/ARM/
@@ -170,3 +171,9 @@ build/x64/
170171
build/linux/tic80.desktop
171172
build/compile_commands.json
172173
CMakeSettings.json
174+
tic_mruby_build_config.rb.lock
175+
tic_mruby_wasm_build_config.rb.lock
176+
build/mruby_vendor-prefix/
177+
**/zig-cache
178+
**/zig-out
179+
.cache

.gitmodules

Lines changed: 78 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,81 @@
1-
[submodule "vendor/blip-buf"]
2-
path = vendor/blip-buf
3-
url = https://github.com/nesbox/blip-buf.git
4-
shallow = true
5-
[submodule "vendor/curl"]
6-
path = vendor/curl
7-
url = https://github.com/curl/curl.git
8-
shallow = true
9-
[submodule "vendor/dirent"]
10-
path = vendor/dirent
11-
url = https://github.com/tronkko/dirent.git
12-
shallow = true
13-
[submodule "vendor/duktape"]
14-
path = vendor/duktape
15-
url = https://github.com/svaarala/duktape-releases.git
16-
shallow = true
17-
[submodule "vendor/giflib"]
18-
path = vendor/giflib
19-
url = https://github.com/nesbox/giflib.git
20-
shallow = true
21-
[submodule "vendor/lpeg"]
22-
path = vendor/lpeg
23-
url = https://github.com/nesbox/lpeg.git
24-
shallow = true
25-
[submodule "vendor/lua"]
26-
path = vendor/lua
27-
url = https://github.com/lua/lua.git
28-
shallow = true
29-
[submodule "vendor/sdl-gpu"]
30-
path = vendor/sdl-gpu
31-
url = https://github.com/grimfang4/sdl-gpu.git
32-
shallow = true
33-
[submodule "vendor/sokol"]
34-
path = vendor/sokol
35-
url = https://github.com/floooh/sokol.git
36-
shallow = true
37-
[submodule "vendor/squirrel"]
38-
path = vendor/squirrel
39-
url = https://github.com/albertodemichelis/squirrel.git
40-
shallow = true
41-
[submodule "vendor/wren"]
42-
path = vendor/wren
43-
url = https://github.com/wren-lang/wren.git
44-
shallow = true
45-
[submodule "vendor/zlib"]
46-
path = vendor/zlib
47-
url = https://github.com/madler/zlib.git
48-
shallow = true
49-
[submodule "vendor/zip"]
50-
path = vendor/zip
51-
url = https://github.com/kuba--/zip.git
52-
shallow = true
53-
[submodule "vendor/moonscript"]
54-
path = vendor/moonscript
55-
url = https://github.com/nesbox/moonscript.git
56-
shallow = true
57-
[submodule "vendor/argparse"]
58-
path = vendor/argparse
59-
url = https://github.com/cofyc/argparse.git
60-
shallow = true
61-
[submodule "vendor/circle-stdlib"]
62-
path = vendor/circle-stdlib
63-
url = https://github.com/smuehlst/circle-stdlib.git
64-
shallow = true
65-
[submodule "vendor/libuv"]
66-
path = vendor/libuv
67-
url = https://github.com/libuv/libuv.git
68-
shallow = true
69-
[submodule "vendor/http-parser"]
70-
path = vendor/http-parser
71-
url = https://github.com/nodejs/http-parser.git
72-
shallow = true
73-
[submodule "vendor/libpng"]
74-
path = vendor/libpng
75-
url = https://github.com/glennrp/libpng.git
76-
shallow = true
1+
[submodule "vendor/blip-buf"]
2+
path = vendor/blip-buf
3+
url = https://github.com/nesbox/blip-buf.git
4+
shallow = true
5+
[submodule "vendor/dirent"]
6+
path = vendor/dirent
7+
url = https://github.com/tronkko/dirent.git
8+
shallow = true
9+
[submodule "vendor/duktape"]
10+
path = vendor/duktape
11+
url = https://github.com/svaarala/duktape-releases.git
12+
shallow = true
13+
[submodule "vendor/giflib"]
14+
path = vendor/giflib
15+
url = https://github.com/nesbox/giflib.git
16+
shallow = true
17+
[submodule "vendor/lpeg"]
18+
path = vendor/lpeg
19+
url = https://github.com/nesbox/lpeg.git
20+
shallow = true
21+
[submodule "vendor/lua"]
22+
path = vendor/lua
23+
url = https://github.com/lua/lua.git
24+
shallow = true
25+
[submodule "vendor/sdl-gpu"]
26+
path = vendor/sdl-gpu
27+
url = https://github.com/grimfang4/sdl-gpu.git
28+
shallow = true
29+
[submodule "vendor/sokol"]
30+
path = vendor/sokol
31+
url = https://github.com/floooh/sokol.git
32+
shallow = true
33+
[submodule "vendor/squirrel"]
34+
path = vendor/squirrel
35+
url = https://github.com/albertodemichelis/squirrel.git
36+
shallow = true
37+
[submodule "vendor/wren"]
38+
path = vendor/wren
39+
url = https://github.com/wren-lang/wren.git
40+
shallow = true
41+
[submodule "vendor/zlib"]
42+
path = vendor/zlib
43+
url = https://github.com/madler/zlib.git
44+
shallow = true
45+
[submodule "vendor/zip"]
46+
path = vendor/zip
47+
url = https://github.com/kuba--/zip.git
48+
shallow = true
49+
[submodule "vendor/moonscript"]
50+
path = vendor/moonscript
51+
url = https://github.com/nesbox/moonscript.git
52+
shallow = true
53+
[submodule "vendor/argparse"]
54+
path = vendor/argparse
55+
url = https://github.com/cofyc/argparse.git
56+
shallow = true
57+
[submodule "vendor/circle-stdlib"]
58+
path = vendor/circle-stdlib
59+
url = https://github.com/smuehlst/circle-stdlib.git
60+
shallow = true
61+
[submodule "vendor/libuv"]
62+
path = vendor/libuv
63+
url = https://github.com/libuv/libuv.git
64+
shallow = true
65+
[submodule "vendor/http-parser"]
66+
path = vendor/http-parser
67+
url = https://github.com/nodejs/http-parser.git
68+
shallow = true
69+
[submodule "vendor/libpng"]
70+
path = vendor/libpng
71+
url = https://github.com/glennrp/libpng.git
72+
shallow = true
7773
[submodule "vendor/sdl2"]
7874
path = vendor/sdl2
7975
url = https://github.com/libsdl-org/SDL.git
76+
[submodule "mruby"]
77+
path = vendor/mruby
78+
url = https://github.com/mruby/mruby.git
79+
[submodule "vendor/wasm3"]
80+
path = vendor/wasm3
81+
url = https://github.com/wasm3/wasm3.git

0 commit comments

Comments
 (0)