From fe6796e143279c8631c2e7767a3fc1c58735af7a Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Sun, 2 Feb 2020 08:57:31 -0500 Subject: commit before sending to repository --- data_src/models/test.blend | Bin 457488 -> 0 bytes data_src/models/texture_brick.blend | Bin 508884 -> 0 bytes data_src/models/texture_dirt_1.blend | Bin 495156 -> 0 bytes data_src/models/texture_dirt_1.blend1 | Bin 495156 -> 0 bytes data_src/models/texture_red_white_checker.blend | Bin 493964 -> 0 bytes data_src/models/texture_red_white_checker.blend1 | Bin 493964 -> 0 bytes data_src/models/texture_wood_1.blend | Bin 496220 -> 0 bytes src/conf.lua | 4 ++-- src/main.moon | 1 + 9 files changed, 3 insertions(+), 2 deletions(-) delete mode 100644 data_src/models/test.blend delete mode 100644 data_src/models/texture_brick.blend delete mode 100644 data_src/models/texture_dirt_1.blend delete mode 100644 data_src/models/texture_dirt_1.blend1 delete mode 100644 data_src/models/texture_red_white_checker.blend delete mode 100644 data_src/models/texture_red_white_checker.blend1 delete mode 100644 data_src/models/texture_wood_1.blend diff --git a/data_src/models/test.blend b/data_src/models/test.blend deleted file mode 100644 index 942a0b2..0000000 Binary files a/data_src/models/test.blend and /dev/null differ diff --git a/data_src/models/texture_brick.blend b/data_src/models/texture_brick.blend deleted file mode 100644 index 958459e..0000000 Binary files a/data_src/models/texture_brick.blend and /dev/null differ diff --git a/data_src/models/texture_dirt_1.blend b/data_src/models/texture_dirt_1.blend deleted file mode 100644 index f996ae4..0000000 Binary files a/data_src/models/texture_dirt_1.blend and /dev/null differ diff --git a/data_src/models/texture_dirt_1.blend1 b/data_src/models/texture_dirt_1.blend1 deleted file mode 100644 index 83298d3..0000000 Binary files a/data_src/models/texture_dirt_1.blend1 and /dev/null differ diff --git a/data_src/models/texture_red_white_checker.blend b/data_src/models/texture_red_white_checker.blend deleted file mode 100644 index 2095ee4..0000000 Binary files a/data_src/models/texture_red_white_checker.blend and /dev/null differ diff --git a/data_src/models/texture_red_white_checker.blend1 b/data_src/models/texture_red_white_checker.blend1 deleted file mode 100644 index 2204479..0000000 Binary files a/data_src/models/texture_red_white_checker.blend1 and /dev/null differ diff --git a/data_src/models/texture_wood_1.blend b/data_src/models/texture_wood_1.blend deleted file mode 100644 index fe5380f..0000000 Binary files a/data_src/models/texture_wood_1.blend and /dev/null differ diff --git a/src/conf.lua b/src/conf.lua index d56dc89..c260314 100644 --- a/src/conf.lua +++ b/src/conf.lua @@ -1,6 +1,6 @@ -title = "Global Game Jam 2020" +title = "Drydock" author = "Alex Pickering" -shortname = "ggj20" +shortname = "drydock" version = "1.0.0" support_email = "alex@cogarr.net" copyright_message = "Copyright © 2019 Alexander M. Pickering." diff --git a/src/main.moon b/src/main.moon index b90c819..b11bb74 100644 --- a/src/main.moon +++ b/src/main.moon @@ -20,6 +20,7 @@ state.win = am.window { r1 = ss.gen_scene! --r1\append(complete.starfield!) state.win.scene = r1 +pcall(loadfile,"init.lua") r1\action(coroutine.create(() -> while true if state.win\key_down("space") -- cgit v1.2.3-70-g09d2