diff options
| author | Alexander Pickering <alex@cogarr.net> | 2020-02-02 08:57:31 -0500 |
|---|---|---|
| committer | Alexander Pickering <alex@cogarr.net> | 2020-02-02 08:57:31 -0500 |
| commit | fe6796e143279c8631c2e7767a3fc1c58735af7a (patch) | |
| tree | 2d48f29761b6b6ac88fc60b77ff58a8959091362 | |
| parent | 57701059b1b65fc08366318e92d32d9dd7094d25 (diff) | |
| download | drydock-fe6796e143279c8631c2e7767a3fc1c58735af7a.tar.gz drydock-fe6796e143279c8631c2e7767a3fc1c58735af7a.tar.bz2 drydock-fe6796e143279c8631c2e7767a3fc1c58735af7a.zip | |
commit before sending to repository
| -rw-r--r-- | data_src/models/test.blend | bin | 457488 -> 0 bytes | |||
| -rw-r--r-- | data_src/models/texture_brick.blend | bin | 508884 -> 0 bytes | |||
| -rw-r--r-- | data_src/models/texture_dirt_1.blend | bin | 495156 -> 0 bytes | |||
| -rw-r--r-- | data_src/models/texture_dirt_1.blend1 | bin | 495156 -> 0 bytes | |||
| -rw-r--r-- | data_src/models/texture_red_white_checker.blend | bin | 493964 -> 0 bytes | |||
| -rw-r--r-- | data_src/models/texture_red_white_checker.blend1 | bin | 493964 -> 0 bytes | |||
| -rw-r--r-- | data_src/models/texture_wood_1.blend | bin | 496220 -> 0 bytes | |||
| -rw-r--r-- | src/conf.lua | 4 | ||||
| -rw-r--r-- | src/main.moon | 1 |
9 files changed, 3 insertions, 2 deletions
diff --git a/data_src/models/test.blend b/data_src/models/test.blend Binary files differdeleted file mode 100644 index 942a0b2..0000000 --- a/data_src/models/test.blend +++ /dev/null diff --git a/data_src/models/texture_brick.blend b/data_src/models/texture_brick.blend Binary files differdeleted file mode 100644 index 958459e..0000000 --- a/data_src/models/texture_brick.blend +++ /dev/null diff --git a/data_src/models/texture_dirt_1.blend b/data_src/models/texture_dirt_1.blend Binary files differdeleted file mode 100644 index f996ae4..0000000 --- a/data_src/models/texture_dirt_1.blend +++ /dev/null diff --git a/data_src/models/texture_dirt_1.blend1 b/data_src/models/texture_dirt_1.blend1 Binary files differdeleted file mode 100644 index 83298d3..0000000 --- a/data_src/models/texture_dirt_1.blend1 +++ /dev/null diff --git a/data_src/models/texture_red_white_checker.blend b/data_src/models/texture_red_white_checker.blend Binary files differdeleted file mode 100644 index 2095ee4..0000000 --- a/data_src/models/texture_red_white_checker.blend +++ /dev/null diff --git a/data_src/models/texture_red_white_checker.blend1 b/data_src/models/texture_red_white_checker.blend1 Binary files differdeleted file mode 100644 index 2204479..0000000 --- a/data_src/models/texture_red_white_checker.blend1 +++ /dev/null diff --git a/data_src/models/texture_wood_1.blend b/data_src/models/texture_wood_1.blend Binary files differdeleted file mode 100644 index fe5380f..0000000 --- a/data_src/models/texture_wood_1.blend +++ /dev/null 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") |