diff --git a/.env b/.env index d1009d8..7823e65 100644 --- a/.env +++ b/.env @@ -7,5 +7,5 @@ GODOT_VERSION=4.2.1-stable # Game GAME_NAME=HazyRoad -GAME_VERSION=1.0.2 +GAME_VERSION=1.0.3 GAME_ITCHIO_KEY=hazy-road diff --git a/.github/renovate.json b/.github/renovate.json index 9d107f8..2ac8048 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -3,7 +3,7 @@ { "fileMatch": ["^plug\\.gd$"], "matchStrings": [ - "\\s+plug\\(\"(?.*?)\",\\ \\{\\s*\"commit\":\\ \"(?)(?.*)\"" + "\\s+plug\\(\"(?.*?)\",\\ \\{\\s*\"commit\":\\ \"(?.*)\",\\s*\"renovate-branch\":\\ \"(?.*)\"" ], "depNameTemplate": "{{{gitUrl}}}", "packageNameTemplate": "https://github.com/{{{gitUrl}}}", diff --git a/.github/workflows/links.yml b/.github/workflows/links.yml index d1bbb40..58db5f9 100644 --- a/.github/workflows/links.yml +++ b/.github/workflows/links.yml @@ -1,6 +1,8 @@ name: Link Checker + on: - push: + pull_request: + types: [opened, edited, review_requested, synchronize, reopened, ready_for_review, labeled, unlabeled] jobs: linkchecker: diff --git a/.gitignore b/.gitignore index ad96e65..a10632f 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ data_*/ .plugged/ addons/* !addons/gd-plug/ +!addons/export-build-info/ # Python-specific ignores venv/ diff --git a/.godot/imported/0.ogg-3179700fe088088db8ceda12eeb30e3c.md5 b/.godot/imported/0.ogg-3179700fe088088db8ceda12eeb30e3c.md5 index be3f3a6..7692933 100644 --- a/.godot/imported/0.ogg-3179700fe088088db8ceda12eeb30e3c.md5 +++ b/.godot/imported/0.ogg-3179700fe088088db8ceda12eeb30e3c.md5 @@ -1,2 +1,2 @@ source_md5="9e3a37a589c1e3a82521d3a6d036cec1" -dest_md5="9218b62aeea60bd58c91feda86ba3941" +dest_md5="1d9437d18eff2c9f79b269fe33cea60c" diff --git a/.godot/imported/0.ogg-3179700fe088088db8ceda12eeb30e3c.oggvorbisstr b/.godot/imported/0.ogg-3179700fe088088db8ceda12eeb30e3c.oggvorbisstr index 8bbc8d6..e657771 100644 Binary files a/.godot/imported/0.ogg-3179700fe088088db8ceda12eeb30e3c.oggvorbisstr and b/.godot/imported/0.ogg-3179700fe088088db8ceda12eeb30e3c.oggvorbisstr differ diff --git a/.godot/imported/0.ogg-e9e8cff724f6d52a9cd379f89de7366d.md5 b/.godot/imported/0.ogg-e9e8cff724f6d52a9cd379f89de7366d.md5 index ab6830e..142720d 100644 --- a/.godot/imported/0.ogg-e9e8cff724f6d52a9cd379f89de7366d.md5 +++ b/.godot/imported/0.ogg-e9e8cff724f6d52a9cd379f89de7366d.md5 @@ -1,2 +1,2 @@ source_md5="603b69b0ae3dee4a3d634191d1dd6624" -dest_md5="8596feb7a78c9a32e90081d5b6c0f09e" +dest_md5="b84203ad204221cdcb4c617333f432cf" diff --git a/.godot/imported/0.ogg-e9e8cff724f6d52a9cd379f89de7366d.oggvorbisstr b/.godot/imported/0.ogg-e9e8cff724f6d52a9cd379f89de7366d.oggvorbisstr index 897da9d..5c2050b 100644 Binary files a/.godot/imported/0.ogg-e9e8cff724f6d52a9cd379f89de7366d.oggvorbisstr and b/.godot/imported/0.ogg-e9e8cff724f6d52a9cd379f89de7366d.oggvorbisstr differ diff --git a/.godot/imported/1.ogg-505a94773df7b04b33321082eb1c0d28.md5 b/.godot/imported/1.ogg-505a94773df7b04b33321082eb1c0d28.md5 index 4afc588..2744b2a 100644 --- a/.godot/imported/1.ogg-505a94773df7b04b33321082eb1c0d28.md5 +++ b/.godot/imported/1.ogg-505a94773df7b04b33321082eb1c0d28.md5 @@ -1,2 +1,2 @@ source_md5="216bb6f3426e3b20d76e94fbce257f64" -dest_md5="481e8c801cd75961e3ccf7699e48805a" +dest_md5="ec346124a74bdcc862f8516242f897ab" diff --git a/.godot/imported/1.ogg-505a94773df7b04b33321082eb1c0d28.oggvorbisstr b/.godot/imported/1.ogg-505a94773df7b04b33321082eb1c0d28.oggvorbisstr index bb26c02..fdccf7d 100644 Binary files a/.godot/imported/1.ogg-505a94773df7b04b33321082eb1c0d28.oggvorbisstr and b/.godot/imported/1.ogg-505a94773df7b04b33321082eb1c0d28.oggvorbisstr differ diff --git a/.godot/imported/1.ogg-fe6c4854b4685a8b714525fead435b69.md5 b/.godot/imported/1.ogg-fe6c4854b4685a8b714525fead435b69.md5 index 14333e3..634aaa9 100644 --- a/.godot/imported/1.ogg-fe6c4854b4685a8b714525fead435b69.md5 +++ b/.godot/imported/1.ogg-fe6c4854b4685a8b714525fead435b69.md5 @@ -1,2 +1,2 @@ source_md5="1b51c7f8ca07f1ec47bf108456e9aba8" -dest_md5="af8dc60b2aedf72a7d1cb808e6939e9a" +dest_md5="c21c12bbaa68fa41eab2d96f09e1503d" diff --git a/.godot/imported/1.ogg-fe6c4854b4685a8b714525fead435b69.oggvorbisstr b/.godot/imported/1.ogg-fe6c4854b4685a8b714525fead435b69.oggvorbisstr index b85eeb3..bde91c4 100644 Binary files a/.godot/imported/1.ogg-fe6c4854b4685a8b714525fead435b69.oggvorbisstr and b/.godot/imported/1.ogg-fe6c4854b4685a8b714525fead435b69.oggvorbisstr differ diff --git a/.godot/imported/2.ogg-ecc3f96acc35b9eefd8f7f915ff6ffa5.md5 b/.godot/imported/2.ogg-ecc3f96acc35b9eefd8f7f915ff6ffa5.md5 index dcc538b..e8460ea 100644 --- a/.godot/imported/2.ogg-ecc3f96acc35b9eefd8f7f915ff6ffa5.md5 +++ b/.godot/imported/2.ogg-ecc3f96acc35b9eefd8f7f915ff6ffa5.md5 @@ -1,2 +1,2 @@ source_md5="fc35f230d33696dcf6be4a5e68f31180" -dest_md5="789453fc51828a10809893ca8dabf0d4" +dest_md5="5267150983abe5e60e092e0fe5a00372" diff --git a/.godot/imported/2.ogg-ecc3f96acc35b9eefd8f7f915ff6ffa5.oggvorbisstr b/.godot/imported/2.ogg-ecc3f96acc35b9eefd8f7f915ff6ffa5.oggvorbisstr index 9b17bf9..0c16428 100644 Binary files a/.godot/imported/2.ogg-ecc3f96acc35b9eefd8f7f915ff6ffa5.oggvorbisstr and b/.godot/imported/2.ogg-ecc3f96acc35b9eefd8f7f915ff6ffa5.oggvorbisstr differ diff --git a/.godot/imported/2.ogg-fe10e3a63d86a006ce225b5e75b1bd4b.md5 b/.godot/imported/2.ogg-fe10e3a63d86a006ce225b5e75b1bd4b.md5 index b969a24..82884ee 100644 --- a/.godot/imported/2.ogg-fe10e3a63d86a006ce225b5e75b1bd4b.md5 +++ b/.godot/imported/2.ogg-fe10e3a63d86a006ce225b5e75b1bd4b.md5 @@ -1,2 +1,2 @@ source_md5="a66aa6ae1bba2bee2295afb23bd13b8f" -dest_md5="4032dc2f415dfaf646c5b34b2f4df4f8" +dest_md5="835061a369007af1fd9751c001febd79" diff --git a/.godot/imported/2.ogg-fe10e3a63d86a006ce225b5e75b1bd4b.oggvorbisstr b/.godot/imported/2.ogg-fe10e3a63d86a006ce225b5e75b1bd4b.oggvorbisstr index 26b95d5..74b0db2 100644 Binary files a/.godot/imported/2.ogg-fe10e3a63d86a006ce225b5e75b1bd4b.oggvorbisstr and b/.godot/imported/2.ogg-fe10e3a63d86a006ce225b5e75b1bd4b.oggvorbisstr differ diff --git a/.godot/imported/3.ogg-c40e68613a79b6723347c57eae50189e.md5 b/.godot/imported/3.ogg-c40e68613a79b6723347c57eae50189e.md5 index 60db664..91de839 100644 --- a/.godot/imported/3.ogg-c40e68613a79b6723347c57eae50189e.md5 +++ b/.godot/imported/3.ogg-c40e68613a79b6723347c57eae50189e.md5 @@ -1,2 +1,2 @@ source_md5="73929c6b60004b96d5818036469cc2bd" -dest_md5="f604b64f57fbe820ee3128064e2f1a03" +dest_md5="00e20b2553763f8b6ac4b4802d2387ec" diff --git a/.godot/imported/3.ogg-c40e68613a79b6723347c57eae50189e.oggvorbisstr b/.godot/imported/3.ogg-c40e68613a79b6723347c57eae50189e.oggvorbisstr index 3315b58..406be00 100644 Binary files a/.godot/imported/3.ogg-c40e68613a79b6723347c57eae50189e.oggvorbisstr and b/.godot/imported/3.ogg-c40e68613a79b6723347c57eae50189e.oggvorbisstr differ diff --git a/.godot/imported/3.ogg-c648b2e4b9bc8501f2d13ed1eb879599.md5 b/.godot/imported/3.ogg-c648b2e4b9bc8501f2d13ed1eb879599.md5 index adb2f7d..3ff1ac3 100644 --- a/.godot/imported/3.ogg-c648b2e4b9bc8501f2d13ed1eb879599.md5 +++ b/.godot/imported/3.ogg-c648b2e4b9bc8501f2d13ed1eb879599.md5 @@ -1,2 +1,2 @@ source_md5="b08416f2a84cec71c50caef1f015abd0" -dest_md5="4cac6a8531279c8b61c9c0513dd67328" +dest_md5="cdc3b9f55c39d08b8d2cd9b01e3214bc" diff --git a/.godot/imported/3.ogg-c648b2e4b9bc8501f2d13ed1eb879599.oggvorbisstr b/.godot/imported/3.ogg-c648b2e4b9bc8501f2d13ed1eb879599.oggvorbisstr index c2b7b1e..3e81586 100644 Binary files a/.godot/imported/3.ogg-c648b2e4b9bc8501f2d13ed1eb879599.oggvorbisstr and b/.godot/imported/3.ogg-c648b2e4b9bc8501f2d13ed1eb879599.oggvorbisstr differ diff --git a/.godot/imported/4.ogg-7b3e638ccf6beab3ae3b6b91e4c651aa.md5 b/.godot/imported/4.ogg-7b3e638ccf6beab3ae3b6b91e4c651aa.md5 index dd129f6..7a1431a 100644 --- a/.godot/imported/4.ogg-7b3e638ccf6beab3ae3b6b91e4c651aa.md5 +++ b/.godot/imported/4.ogg-7b3e638ccf6beab3ae3b6b91e4c651aa.md5 @@ -1,2 +1,2 @@ source_md5="75087bbe073c9a806c0e62b1ed723fa8" -dest_md5="5fcab22124ce00661074040181b5dddf" +dest_md5="f41fbbd5cc0bb0a634da3799173ce382" diff --git a/.godot/imported/4.ogg-7b3e638ccf6beab3ae3b6b91e4c651aa.oggvorbisstr b/.godot/imported/4.ogg-7b3e638ccf6beab3ae3b6b91e4c651aa.oggvorbisstr index 6cbe456..5afcb6c 100644 Binary files a/.godot/imported/4.ogg-7b3e638ccf6beab3ae3b6b91e4c651aa.oggvorbisstr and b/.godot/imported/4.ogg-7b3e638ccf6beab3ae3b6b91e4c651aa.oggvorbisstr differ diff --git a/.godot/imported/4.ogg-965a72546d819d04233bf1b40c6489f2.md5 b/.godot/imported/4.ogg-965a72546d819d04233bf1b40c6489f2.md5 index 2655a01..c0a7ec2 100644 --- a/.godot/imported/4.ogg-965a72546d819d04233bf1b40c6489f2.md5 +++ b/.godot/imported/4.ogg-965a72546d819d04233bf1b40c6489f2.md5 @@ -1,2 +1,2 @@ source_md5="6e06fd029965c8a592a7978fbfa39390" -dest_md5="ad846734060c5e1ffc196226b10d5bf1" +dest_md5="5205d2824a218412645338b3c28f5637" diff --git a/.godot/imported/4.ogg-965a72546d819d04233bf1b40c6489f2.oggvorbisstr b/.godot/imported/4.ogg-965a72546d819d04233bf1b40c6489f2.oggvorbisstr index 251ca10..4e98a4e 100644 Binary files a/.godot/imported/4.ogg-965a72546d819d04233bf1b40c6489f2.oggvorbisstr and b/.godot/imported/4.ogg-965a72546d819d04233bf1b40c6489f2.oggvorbisstr differ diff --git a/.godot/imported/5.ogg-4c07c61ec389e3e4d52927b378354b57.md5 b/.godot/imported/5.ogg-4c07c61ec389e3e4d52927b378354b57.md5 index ed0413a..f6d29c9 100644 --- a/.godot/imported/5.ogg-4c07c61ec389e3e4d52927b378354b57.md5 +++ b/.godot/imported/5.ogg-4c07c61ec389e3e4d52927b378354b57.md5 @@ -1,2 +1,2 @@ source_md5="87ca2a172bbe9a6c56b1dabe1ca6581a" -dest_md5="38bc4f95dd1a06b10361fc6d103ffe9a" +dest_md5="700fa39460a631d2dbcf02c4e567b68f" diff --git a/.godot/imported/5.ogg-4c07c61ec389e3e4d52927b378354b57.oggvorbisstr b/.godot/imported/5.ogg-4c07c61ec389e3e4d52927b378354b57.oggvorbisstr index 14cae8b..9b5eee0 100644 Binary files a/.godot/imported/5.ogg-4c07c61ec389e3e4d52927b378354b57.oggvorbisstr and b/.godot/imported/5.ogg-4c07c61ec389e3e4d52927b378354b57.oggvorbisstr differ diff --git a/.godot/imported/5.ogg-939cdc737740c2abacf5e13dd4e8de7e.md5 b/.godot/imported/5.ogg-939cdc737740c2abacf5e13dd4e8de7e.md5 index c967d77..a9b95bf 100644 --- a/.godot/imported/5.ogg-939cdc737740c2abacf5e13dd4e8de7e.md5 +++ b/.godot/imported/5.ogg-939cdc737740c2abacf5e13dd4e8de7e.md5 @@ -1,2 +1,2 @@ source_md5="7e78765f4aafae5ad0c26cbfd9369e24" -dest_md5="bade6b9259a1f5bb05b42afc39713fdc" +dest_md5="9d700567d7daea59955c900129c207da" diff --git a/.godot/imported/5.ogg-939cdc737740c2abacf5e13dd4e8de7e.oggvorbisstr b/.godot/imported/5.ogg-939cdc737740c2abacf5e13dd4e8de7e.oggvorbisstr index e9e9322..175453f 100644 Binary files a/.godot/imported/5.ogg-939cdc737740c2abacf5e13dd4e8de7e.oggvorbisstr and b/.godot/imported/5.ogg-939cdc737740c2abacf5e13dd4e8de7e.oggvorbisstr differ diff --git a/.godot/imported/6.ogg-8cc7bc2b4e7841d7f36665f4be5ae0e4.md5 b/.godot/imported/6.ogg-8cc7bc2b4e7841d7f36665f4be5ae0e4.md5 index 54bfd50..af98bf9 100644 --- a/.godot/imported/6.ogg-8cc7bc2b4e7841d7f36665f4be5ae0e4.md5 +++ b/.godot/imported/6.ogg-8cc7bc2b4e7841d7f36665f4be5ae0e4.md5 @@ -1,2 +1,2 @@ source_md5="668b37215697a0db2b715eaa4018ac8c" -dest_md5="1d38ddc52057a287a337fecacb7398fa" +dest_md5="4b3c70c7b233ee1f8a5e88e91723ffd2" diff --git a/.godot/imported/6.ogg-8cc7bc2b4e7841d7f36665f4be5ae0e4.oggvorbisstr b/.godot/imported/6.ogg-8cc7bc2b4e7841d7f36665f4be5ae0e4.oggvorbisstr index dfb6a2d..7c8b8a9 100644 Binary files a/.godot/imported/6.ogg-8cc7bc2b4e7841d7f36665f4be5ae0e4.oggvorbisstr and b/.godot/imported/6.ogg-8cc7bc2b4e7841d7f36665f4be5ae0e4.oggvorbisstr differ diff --git a/.godot/imported/Dungeon Theme.mp3-f0a0a007e49e3408fbfc9e0989075c22.md5 b/.godot/imported/Dungeon Theme.mp3-f0a0a007e49e3408fbfc9e0989075c22.md5 index c4bb9bc..8764dd1 100644 --- a/.godot/imported/Dungeon Theme.mp3-f0a0a007e49e3408fbfc9e0989075c22.md5 +++ b/.godot/imported/Dungeon Theme.mp3-f0a0a007e49e3408fbfc9e0989075c22.md5 @@ -1,2 +1,2 @@ source_md5="90abecfcd039eee6003182f47c7af00c" -dest_md5="776cc38c626c320a466246d00a65e69f" +dest_md5="780cfbd825ae432918c765bab1043474" diff --git a/.godot/imported/Dungeon Theme.mp3-f0a0a007e49e3408fbfc9e0989075c22.mp3str b/.godot/imported/Dungeon Theme.mp3-f0a0a007e49e3408fbfc9e0989075c22.mp3str index ef77e30..a4587cb 100644 Binary files a/.godot/imported/Dungeon Theme.mp3-f0a0a007e49e3408fbfc9e0989075c22.mp3str and b/.godot/imported/Dungeon Theme.mp3-f0a0a007e49e3408fbfc9e0989075c22.mp3str differ diff --git a/.godot/imported/Grasslands Theme.mp3-81ace43172754c613986336baa0fcb77.md5 b/.godot/imported/Grasslands Theme.mp3-81ace43172754c613986336baa0fcb77.md5 index 2b570c7..9a35e69 100644 --- a/.godot/imported/Grasslands Theme.mp3-81ace43172754c613986336baa0fcb77.md5 +++ b/.godot/imported/Grasslands Theme.mp3-81ace43172754c613986336baa0fcb77.md5 @@ -1,2 +1,2 @@ source_md5="12965d1751deaf68b5bd7553c315f1bc" -dest_md5="f91787f53575b6f0ff24b3dfe13bdb97" +dest_md5="5a03ae4c9db86d58b742ee3168c828c9" diff --git a/.godot/imported/Grasslands Theme.mp3-81ace43172754c613986336baa0fcb77.mp3str b/.godot/imported/Grasslands Theme.mp3-81ace43172754c613986336baa0fcb77.mp3str index aa02f47..5653a45 100644 Binary files a/.godot/imported/Grasslands Theme.mp3-81ace43172754c613986336baa0fcb77.mp3str and b/.godot/imported/Grasslands Theme.mp3-81ace43172754c613986336baa0fcb77.mp3str differ diff --git a/.godot/imported/Noise.png-49623d22636507f04adfc06869f390a7.s3tc.ctex b/.godot/imported/Noise.png-49623d22636507f04adfc06869f390a7.s3tc.ctex deleted file mode 100644 index 7d0c427..0000000 Binary files a/.godot/imported/Noise.png-49623d22636507f04adfc06869f390a7.s3tc.ctex and /dev/null differ diff --git a/.godot/imported/StreetLamp_albedo000.png-ffd68202b4c84e96b744bbe22ee26058.ctex b/.godot/imported/StreetLamp_albedo000.png-ffd68202b4c84e96b744bbe22ee26058.ctex deleted file mode 100644 index 0a7713d..0000000 Binary files a/.godot/imported/StreetLamp_albedo000.png-ffd68202b4c84e96b744bbe22ee26058.ctex and /dev/null differ diff --git a/.godot/imported/StreetLamp_albedo000.png-ffd68202b4c84e96b744bbe22ee26058.md5 b/.godot/imported/StreetLamp_albedo000.png-ffd68202b4c84e96b744bbe22ee26058.md5 deleted file mode 100644 index e9958c6..0000000 --- a/.godot/imported/StreetLamp_albedo000.png-ffd68202b4c84e96b744bbe22ee26058.md5 +++ /dev/null @@ -1,2 +0,0 @@ -source_md5="fd1796543637f98353085d28e7123a51" -dest_md5="12d46ea1b112ab56ca191e74143d8e78" diff --git a/.godot/imported/StreetLamp_albedo000.png-ffd68202b4c84e96b744bbe22ee26058.s3tc.ctex b/.godot/imported/StreetLamp_albedo000.png-ffd68202b4c84e96b744bbe22ee26058.s3tc.ctex deleted file mode 100644 index d315771..0000000 Binary files a/.godot/imported/StreetLamp_albedo000.png-ffd68202b4c84e96b744bbe22ee26058.s3tc.ctex and /dev/null differ diff --git a/.godot/imported/StreetLamp_albedo002.png-27e92690139b3c51fd18ba5ef0638a5b.ctex b/.godot/imported/StreetLamp_albedo002.png-27e92690139b3c51fd18ba5ef0638a5b.ctex deleted file mode 100644 index 91433df..0000000 Binary files a/.godot/imported/StreetLamp_albedo002.png-27e92690139b3c51fd18ba5ef0638a5b.ctex and /dev/null differ diff --git a/.godot/imported/StreetLamp_albedo002.png-27e92690139b3c51fd18ba5ef0638a5b.md5 b/.godot/imported/StreetLamp_albedo002.png-27e92690139b3c51fd18ba5ef0638a5b.md5 deleted file mode 100644 index 4f92f86..0000000 --- a/.godot/imported/StreetLamp_albedo002.png-27e92690139b3c51fd18ba5ef0638a5b.md5 +++ /dev/null @@ -1,2 +0,0 @@ -source_md5="16df86ac9e0938168a909f31880f0584" -dest_md5="dab1d846ec20a8b4e0ae39ae5e080bc3" diff --git a/.godot/imported/StreetLamp_albedo002.png-27e92690139b3c51fd18ba5ef0638a5b.s3tc.ctex b/.godot/imported/StreetLamp_albedo002.png-27e92690139b3c51fd18ba5ef0638a5b.s3tc.ctex deleted file mode 100644 index 0547ea4..0000000 Binary files a/.godot/imported/StreetLamp_albedo002.png-27e92690139b3c51fd18ba5ef0638a5b.s3tc.ctex and /dev/null differ diff --git a/.godot/imported/StreetLamp_emission000.png-02271c59422ad9ba963117077e872a1c.ctex b/.godot/imported/StreetLamp_emission000.png-02271c59422ad9ba963117077e872a1c.ctex deleted file mode 100644 index 4983341..0000000 Binary files a/.godot/imported/StreetLamp_emission000.png-02271c59422ad9ba963117077e872a1c.ctex and /dev/null differ diff --git a/.godot/imported/StreetLamp_emission000.png-02271c59422ad9ba963117077e872a1c.md5 b/.godot/imported/StreetLamp_emission000.png-02271c59422ad9ba963117077e872a1c.md5 deleted file mode 100644 index 287cc89..0000000 --- a/.godot/imported/StreetLamp_emission000.png-02271c59422ad9ba963117077e872a1c.md5 +++ /dev/null @@ -1,2 +0,0 @@ -source_md5="e78d0053aebc2fc620358b74fb152577" -dest_md5="db591c778213081aa3610ec542bae750" diff --git a/.godot/imported/StreetLamp_emission000.png-02271c59422ad9ba963117077e872a1c.s3tc.ctex b/.godot/imported/StreetLamp_emission000.png-02271c59422ad9ba963117077e872a1c.s3tc.ctex deleted file mode 100644 index 21adc19..0000000 Binary files a/.godot/imported/StreetLamp_emission000.png-02271c59422ad9ba963117077e872a1c.s3tc.ctex and /dev/null differ diff --git a/.godot/imported/StreetLamp_normal000.png-44469a80600d30178ed8de4713bad6a4.ctex b/.godot/imported/StreetLamp_normal000.png-44469a80600d30178ed8de4713bad6a4.ctex deleted file mode 100644 index cbd1fc3..0000000 Binary files a/.godot/imported/StreetLamp_normal000.png-44469a80600d30178ed8de4713bad6a4.ctex and /dev/null differ diff --git a/.godot/imported/StreetLamp_normal000.png-44469a80600d30178ed8de4713bad6a4.md5 b/.godot/imported/StreetLamp_normal000.png-44469a80600d30178ed8de4713bad6a4.md5 deleted file mode 100644 index 2466d75..0000000 --- a/.godot/imported/StreetLamp_normal000.png-44469a80600d30178ed8de4713bad6a4.md5 +++ /dev/null @@ -1,2 +0,0 @@ -source_md5="6bd1f6db4caae88e964a5116e165ab38" -dest_md5="4e1322edd8f06f1d74035870b92ac719" diff --git a/.godot/imported/StreetLamp_normal000.png-44469a80600d30178ed8de4713bad6a4.s3tc.ctex b/.godot/imported/StreetLamp_normal000.png-44469a80600d30178ed8de4713bad6a4.s3tc.ctex deleted file mode 100644 index d48b87e..0000000 Binary files a/.godot/imported/StreetLamp_normal000.png-44469a80600d30178ed8de4713bad6a4.s3tc.ctex and /dev/null differ diff --git a/.godot/imported/StreetLamp_orm000.png-49d7132ad41150453800652f744bc6f7.ctex b/.godot/imported/StreetLamp_orm000.png-49d7132ad41150453800652f744bc6f7.ctex deleted file mode 100644 index 2729092..0000000 Binary files a/.godot/imported/StreetLamp_orm000.png-49d7132ad41150453800652f744bc6f7.ctex and /dev/null differ diff --git a/.godot/imported/StreetLamp_orm000.png-49d7132ad41150453800652f744bc6f7.md5 b/.godot/imported/StreetLamp_orm000.png-49d7132ad41150453800652f744bc6f7.md5 deleted file mode 100644 index b1e28ee..0000000 --- a/.godot/imported/StreetLamp_orm000.png-49d7132ad41150453800652f744bc6f7.md5 +++ /dev/null @@ -1,2 +0,0 @@ -source_md5="d937a77fa24bf411f131a60a092ff2b9" -dest_md5="f5e37f7676f747e2be18f461271aadf5" diff --git a/.godot/imported/StreetLamp_orm000.png-49d7132ad41150453800652f744bc6f7.s3tc.ctex b/.godot/imported/StreetLamp_orm000.png-49d7132ad41150453800652f744bc6f7.s3tc.ctex deleted file mode 100644 index 8bca602..0000000 Binary files a/.godot/imported/StreetLamp_orm000.png-49d7132ad41150453800652f744bc6f7.s3tc.ctex and /dev/null differ diff --git a/.godot/imported/basic_5x3.fbx-268ac8b02ab2c4273b949a7d6e75995a.md5 b/.godot/imported/basic_5x3.fbx-268ac8b02ab2c4273b949a7d6e75995a.md5 index b10f8d2..42f7759 100644 --- a/.godot/imported/basic_5x3.fbx-268ac8b02ab2c4273b949a7d6e75995a.md5 +++ b/.godot/imported/basic_5x3.fbx-268ac8b02ab2c4273b949a7d6e75995a.md5 @@ -1,2 +1,2 @@ source_md5="541d0e553f8bd579752bf85949e0f874" -dest_md5="a7fb809c5403681b897fe1f51952bd74" +dest_md5="1cf3d47412ccb8bd9df1f354a4bd4561" diff --git a/.godot/imported/basic_5x3.fbx-268ac8b02ab2c4273b949a7d6e75995a.scn b/.godot/imported/basic_5x3.fbx-268ac8b02ab2c4273b949a7d6e75995a.scn index c98ef49..4447193 100644 Binary files a/.godot/imported/basic_5x3.fbx-268ac8b02ab2c4273b949a7d6e75995a.scn and b/.godot/imported/basic_5x3.fbx-268ac8b02ab2c4273b949a7d6e75995a.scn differ diff --git a/.godot/imported/brick.glb-d79404ecf88b29143e6e07e77bacb44c.md5 b/.godot/imported/brick.glb-d79404ecf88b29143e6e07e77bacb44c.md5 index fb7e513..39e5292 100644 --- a/.godot/imported/brick.glb-d79404ecf88b29143e6e07e77bacb44c.md5 +++ b/.godot/imported/brick.glb-d79404ecf88b29143e6e07e77bacb44c.md5 @@ -1,2 +1,2 @@ source_md5="a7594812277c0f513192cb7969b6573c" -dest_md5="4720028adf4fcd64b6ef9fb97ffd60e8" +dest_md5="a36617af43ee534d8d45d0ef423ce48e" diff --git a/.godot/imported/brick.glb-d79404ecf88b29143e6e07e77bacb44c.scn b/.godot/imported/brick.glb-d79404ecf88b29143e6e07e77bacb44c.scn index 5554406..987bc12 100644 Binary files a/.godot/imported/brick.glb-d79404ecf88b29143e6e07e77bacb44c.scn and b/.godot/imported/brick.glb-d79404ecf88b29143e6e07e77bacb44c.scn differ diff --git a/.godot/imported/bush.glb-28e0128066fe8d913839a6b96204b1c6.md5 b/.godot/imported/bush.glb-28e0128066fe8d913839a6b96204b1c6.md5 index b5f9110..bc193f1 100644 --- a/.godot/imported/bush.glb-28e0128066fe8d913839a6b96204b1c6.md5 +++ b/.godot/imported/bush.glb-28e0128066fe8d913839a6b96204b1c6.md5 @@ -1,2 +1,2 @@ source_md5="2363f5129d4bd1510e126638c39f7379" -dest_md5="82c6536b61aa9ba45d55612bfcdc5c43" +dest_md5="6dfb3f30726be9ac41eddaa0aa8689f2" diff --git a/.godot/imported/bush.glb-28e0128066fe8d913839a6b96204b1c6.scn b/.godot/imported/bush.glb-28e0128066fe8d913839a6b96204b1c6.scn index 61aa61e..c838eb2 100644 Binary files a/.godot/imported/bush.glb-28e0128066fe8d913839a6b96204b1c6.scn and b/.godot/imported/bush.glb-28e0128066fe8d913839a6b96204b1c6.scn differ diff --git a/.godot/imported/car.obj-daf865d4de5a11c90f15471c32957620.md5 b/.godot/imported/car.obj-daf865d4de5a11c90f15471c32957620.md5 index 07fb4df..f82100a 100644 --- a/.godot/imported/car.obj-daf865d4de5a11c90f15471c32957620.md5 +++ b/.godot/imported/car.obj-daf865d4de5a11c90f15471c32957620.md5 @@ -1,2 +1,2 @@ source_md5="bcc6053f9e84b42bf20afd2581dc5c96" -dest_md5="2b7cf6437addd40e7c2c7d2ef82cc41f" +dest_md5="ca20ea94d5eb83beb95678be4a0638a9" diff --git a/.godot/imported/car.obj-daf865d4de5a11c90f15471c32957620.mesh b/.godot/imported/car.obj-daf865d4de5a11c90f15471c32957620.mesh index 168954c..a9f1d90 100644 Binary files a/.godot/imported/car.obj-daf865d4de5a11c90f15471c32957620.mesh and b/.godot/imported/car.obj-daf865d4de5a11c90f15471c32957620.mesh differ diff --git a/.godot/imported/car.ogg-0521f5d7369ec46c2b904a3d34cff95d.md5 b/.godot/imported/car.ogg-0521f5d7369ec46c2b904a3d34cff95d.md5 index 97756d4..77977d3 100644 --- a/.godot/imported/car.ogg-0521f5d7369ec46c2b904a3d34cff95d.md5 +++ b/.godot/imported/car.ogg-0521f5d7369ec46c2b904a3d34cff95d.md5 @@ -1,2 +1,2 @@ source_md5="852bbffcca1cddddf55720dc3f8f1a3c" -dest_md5="9977ec975dec230a3bd14b14d18afc4a" +dest_md5="4ee613fc682710f73adbd2a5421b9915" diff --git a/.godot/imported/car.ogg-0521f5d7369ec46c2b904a3d34cff95d.oggvorbisstr b/.godot/imported/car.ogg-0521f5d7369ec46c2b904a3d34cff95d.oggvorbisstr index e5b1e5d..c0ff6c3 100644 Binary files a/.godot/imported/car.ogg-0521f5d7369ec46c2b904a3d34cff95d.oggvorbisstr and b/.godot/imported/car.ogg-0521f5d7369ec46c2b904a3d34cff95d.oggvorbisstr differ diff --git a/.godot/imported/car.png-935d00590472112d29cc5ccbaf238317.ctex b/.godot/imported/car.png-935d00590472112d29cc5ccbaf238317.ctex new file mode 100644 index 0000000..7681040 Binary files /dev/null and b/.godot/imported/car.png-935d00590472112d29cc5ccbaf238317.ctex differ diff --git a/.godot/imported/car.png-935d00590472112d29cc5ccbaf238317.image b/.godot/imported/car.png-935d00590472112d29cc5ccbaf238317.image new file mode 100644 index 0000000..5f7a940 Binary files /dev/null and b/.godot/imported/car.png-935d00590472112d29cc5ccbaf238317.image differ diff --git a/.godot/imported/car.png-935d00590472112d29cc5ccbaf238317.md5 b/.godot/imported/car.png-935d00590472112d29cc5ccbaf238317.md5 index a6c4a75..0db3812 100644 --- a/.godot/imported/car.png-935d00590472112d29cc5ccbaf238317.md5 +++ b/.godot/imported/car.png-935d00590472112d29cc5ccbaf238317.md5 @@ -1,2 +1,2 @@ -source_md5="9ea7ca0e7dc9b0e2072aa131a6c6fd5c" +source_md5="b66c79a0ccb8ce8f23dbc575b57d7a5e" dest_md5="5a4e2f0c8dc7052677387c5bacf127b0" diff --git a/.godot/imported/car_blue.png-fc503ed168e8a9684888a89e961bc2ee.md5 b/.godot/imported/car_blue.png-fc503ed168e8a9684888a89e961bc2ee.md5 index fcfcb19..f26a952 100644 --- a/.godot/imported/car_blue.png-fc503ed168e8a9684888a89e961bc2ee.md5 +++ b/.godot/imported/car_blue.png-fc503ed168e8a9684888a89e961bc2ee.md5 @@ -1,2 +1,2 @@ -source_md5="c530495c08290689f51dbd5f20b314d2" +source_md5="4bb9d0587ef3290c7ec5943ddcd621aa" dest_md5="357a11b1d5e888ee5590c20dc204cc02" diff --git a/.godot/imported/car_blue.png-fc503ed168e8a9684888a89e961bc2ee.s3tc.ctex b/.godot/imported/car_blue.png-fc503ed168e8a9684888a89e961bc2ee.s3tc.ctex deleted file mode 100644 index 64018c5..0000000 Binary files a/.godot/imported/car_blue.png-fc503ed168e8a9684888a89e961bc2ee.s3tc.ctex and /dev/null differ diff --git a/.godot/imported/click1.wav-909dee0f8fc6bd4f71bd9cba975a66dd.md5 b/.godot/imported/click1.wav-909dee0f8fc6bd4f71bd9cba975a66dd.md5 index cb2c01b..0785cf6 100644 --- a/.godot/imported/click1.wav-909dee0f8fc6bd4f71bd9cba975a66dd.md5 +++ b/.godot/imported/click1.wav-909dee0f8fc6bd4f71bd9cba975a66dd.md5 @@ -1,2 +1,2 @@ source_md5="82923b00b55f0f47e6d37bf5fb09ddb5" -dest_md5="ef8755a7f99083affb9d3b9d69e69611" +dest_md5="b1a465339e48fed0fe860098202c8d91" diff --git a/.godot/imported/click1.wav-909dee0f8fc6bd4f71bd9cba975a66dd.sample b/.godot/imported/click1.wav-909dee0f8fc6bd4f71bd9cba975a66dd.sample index 083efd9..88a30e1 100644 Binary files a/.godot/imported/click1.wav-909dee0f8fc6bd4f71bd9cba975a66dd.sample and b/.godot/imported/click1.wav-909dee0f8fc6bd4f71bd9cba975a66dd.sample differ diff --git a/.godot/imported/click2.wav-632e8890d33b7ecbbfcf9cbb02ee48bd.md5 b/.godot/imported/click2.wav-632e8890d33b7ecbbfcf9cbb02ee48bd.md5 index 295d360..cd8cc4d 100644 --- a/.godot/imported/click2.wav-632e8890d33b7ecbbfcf9cbb02ee48bd.md5 +++ b/.godot/imported/click2.wav-632e8890d33b7ecbbfcf9cbb02ee48bd.md5 @@ -1,2 +1,2 @@ source_md5="a08604717f7a7a15030e3af3d1e5ded3" -dest_md5="38ba93b173c73272196267ee01843bcd" +dest_md5="60e62a6dc29df2af9218ed2b36683037" diff --git a/.godot/imported/click2.wav-632e8890d33b7ecbbfcf9cbb02ee48bd.sample b/.godot/imported/click2.wav-632e8890d33b7ecbbfcf9cbb02ee48bd.sample index 1717cab..661adab 100644 Binary files a/.godot/imported/click2.wav-632e8890d33b7ecbbfcf9cbb02ee48bd.sample and b/.godot/imported/click2.wav-632e8890d33b7ecbbfcf9cbb02ee48bd.sample differ diff --git a/.godot/imported/compute_relax.glsl-b06f9e60cda7719b78bde9673f2501b7.md5 b/.godot/imported/compute_relax.glsl-b06f9e60cda7719b78bde9673f2501b7.md5 index aa70c07..b8a41eb 100644 --- a/.godot/imported/compute_relax.glsl-b06f9e60cda7719b78bde9673f2501b7.md5 +++ b/.godot/imported/compute_relax.glsl-b06f9e60cda7719b78bde9673f2501b7.md5 @@ -1,2 +1,2 @@ source_md5="d28fc1b4998adc3f0ef9aeebc3099059" -dest_md5="3120e8627fd85e0dffaa930f089b9191" +dest_md5="707c9b7e1d8a86609becafc546b57277" diff --git a/.godot/imported/compute_relax.glsl-b06f9e60cda7719b78bde9673f2501b7.res b/.godot/imported/compute_relax.glsl-b06f9e60cda7719b78bde9673f2501b7.res index a99ab7f..853eb83 100644 Binary files a/.godot/imported/compute_relax.glsl-b06f9e60cda7719b78bde9673f2501b7.res and b/.godot/imported/compute_relax.glsl-b06f9e60cda7719b78bde9673f2501b7.res differ diff --git a/.godot/imported/control_box.glb-356b47cb1487a2f31aa86473e60560b8.md5 b/.godot/imported/control_box.glb-356b47cb1487a2f31aa86473e60560b8.md5 deleted file mode 100644 index 70d6a4d..0000000 --- a/.godot/imported/control_box.glb-356b47cb1487a2f31aa86473e60560b8.md5 +++ /dev/null @@ -1,2 +0,0 @@ -source_md5="7a9cfb6daae8bdbbf342501a5b5bebcc" -dest_md5="33350217f0d8e865006e87603ca714ac" diff --git a/.godot/imported/control_box.glb-356b47cb1487a2f31aa86473e60560b8.scn b/.godot/imported/control_box.glb-356b47cb1487a2f31aa86473e60560b8.scn deleted file mode 100644 index 94416ec..0000000 Binary files a/.godot/imported/control_box.glb-356b47cb1487a2f31aa86473e60560b8.scn and /dev/null differ diff --git a/.godot/imported/control_box.gltf-6644e99346e7211edd8a2a53a6cb5a5b.md5 b/.godot/imported/control_box.gltf-6644e99346e7211edd8a2a53a6cb5a5b.md5 index 2f20cf7..bb686d2 100644 --- a/.godot/imported/control_box.gltf-6644e99346e7211edd8a2a53a6cb5a5b.md5 +++ b/.godot/imported/control_box.gltf-6644e99346e7211edd8a2a53a6cb5a5b.md5 @@ -1,2 +1,2 @@ source_md5="16e02660572c8b25611fe8d9da729feb" -dest_md5="486acd9bb870bcb59282ef102e29cd65" +dest_md5="b891ee21e9abfc98b33fb28aea4f945d" diff --git a/.godot/imported/control_box.gltf-6644e99346e7211edd8a2a53a6cb5a5b.scn b/.godot/imported/control_box.gltf-6644e99346e7211edd8a2a53a6cb5a5b.scn index c684b02..11fe554 100644 Binary files a/.godot/imported/control_box.gltf-6644e99346e7211edd8a2a53a6cb5a5b.scn and b/.godot/imported/control_box.gltf-6644e99346e7211edd8a2a53a6cb5a5b.scn differ diff --git a/.godot/imported/control_box_StreetLamp_albedo000.png-5c495bf6832ce4f9bd5d80477ca0d471.ctex b/.godot/imported/control_box_StreetLamp_albedo000.png-5c495bf6832ce4f9bd5d80477ca0d471.ctex deleted file mode 100644 index 028b6ec..0000000 Binary files a/.godot/imported/control_box_StreetLamp_albedo000.png-5c495bf6832ce4f9bd5d80477ca0d471.ctex and /dev/null differ diff --git a/.godot/imported/control_box_StreetLamp_albedo000.png-5c495bf6832ce4f9bd5d80477ca0d471.md5 b/.godot/imported/control_box_StreetLamp_albedo000.png-5c495bf6832ce4f9bd5d80477ca0d471.md5 deleted file mode 100644 index e9958c6..0000000 --- a/.godot/imported/control_box_StreetLamp_albedo000.png-5c495bf6832ce4f9bd5d80477ca0d471.md5 +++ /dev/null @@ -1,2 +0,0 @@ -source_md5="fd1796543637f98353085d28e7123a51" -dest_md5="12d46ea1b112ab56ca191e74143d8e78" diff --git a/.godot/imported/control_box_StreetLamp_albedo000.png-5c495bf6832ce4f9bd5d80477ca0d471.s3tc.ctex b/.godot/imported/control_box_StreetLamp_albedo000.png-5c495bf6832ce4f9bd5d80477ca0d471.s3tc.ctex deleted file mode 100644 index d315771..0000000 Binary files a/.godot/imported/control_box_StreetLamp_albedo000.png-5c495bf6832ce4f9bd5d80477ca0d471.s3tc.ctex and /dev/null differ diff --git a/.godot/imported/control_box_StreetLamp_albedo002.png-942ffe82a57dc177a2788f481657d9e4.ctex b/.godot/imported/control_box_StreetLamp_albedo002.png-942ffe82a57dc177a2788f481657d9e4.ctex deleted file mode 100644 index fb7f88f..0000000 Binary files a/.godot/imported/control_box_StreetLamp_albedo002.png-942ffe82a57dc177a2788f481657d9e4.ctex and /dev/null differ diff --git a/.godot/imported/control_box_StreetLamp_albedo002.png-942ffe82a57dc177a2788f481657d9e4.md5 b/.godot/imported/control_box_StreetLamp_albedo002.png-942ffe82a57dc177a2788f481657d9e4.md5 deleted file mode 100644 index 4f92f86..0000000 --- a/.godot/imported/control_box_StreetLamp_albedo002.png-942ffe82a57dc177a2788f481657d9e4.md5 +++ /dev/null @@ -1,2 +0,0 @@ -source_md5="16df86ac9e0938168a909f31880f0584" -dest_md5="dab1d846ec20a8b4e0ae39ae5e080bc3" diff --git a/.godot/imported/control_box_StreetLamp_albedo002.png-942ffe82a57dc177a2788f481657d9e4.s3tc.ctex b/.godot/imported/control_box_StreetLamp_albedo002.png-942ffe82a57dc177a2788f481657d9e4.s3tc.ctex deleted file mode 100644 index 0547ea4..0000000 Binary files a/.godot/imported/control_box_StreetLamp_albedo002.png-942ffe82a57dc177a2788f481657d9e4.s3tc.ctex and /dev/null differ diff --git a/.godot/imported/control_box_StreetLamp_emission000.png-adb00b33d1ab3155ec3c61dadd6b89e8.ctex b/.godot/imported/control_box_StreetLamp_emission000.png-adb00b33d1ab3155ec3c61dadd6b89e8.ctex deleted file mode 100644 index 4cf0b17..0000000 Binary files a/.godot/imported/control_box_StreetLamp_emission000.png-adb00b33d1ab3155ec3c61dadd6b89e8.ctex and /dev/null differ diff --git a/.godot/imported/control_box_StreetLamp_emission000.png-adb00b33d1ab3155ec3c61dadd6b89e8.md5 b/.godot/imported/control_box_StreetLamp_emission000.png-adb00b33d1ab3155ec3c61dadd6b89e8.md5 deleted file mode 100644 index 287cc89..0000000 --- a/.godot/imported/control_box_StreetLamp_emission000.png-adb00b33d1ab3155ec3c61dadd6b89e8.md5 +++ /dev/null @@ -1,2 +0,0 @@ -source_md5="e78d0053aebc2fc620358b74fb152577" -dest_md5="db591c778213081aa3610ec542bae750" diff --git a/.godot/imported/control_box_StreetLamp_emission000.png-adb00b33d1ab3155ec3c61dadd6b89e8.s3tc.ctex b/.godot/imported/control_box_StreetLamp_emission000.png-adb00b33d1ab3155ec3c61dadd6b89e8.s3tc.ctex deleted file mode 100644 index 21adc19..0000000 Binary files a/.godot/imported/control_box_StreetLamp_emission000.png-adb00b33d1ab3155ec3c61dadd6b89e8.s3tc.ctex and /dev/null differ diff --git a/.godot/imported/control_box_StreetLamp_normal000.png-96785793f332081830ef63e7ac2cddd7.ctex b/.godot/imported/control_box_StreetLamp_normal000.png-96785793f332081830ef63e7ac2cddd7.ctex deleted file mode 100644 index bc5e093..0000000 Binary files a/.godot/imported/control_box_StreetLamp_normal000.png-96785793f332081830ef63e7ac2cddd7.ctex and /dev/null differ diff --git a/.godot/imported/control_box_StreetLamp_normal000.png-96785793f332081830ef63e7ac2cddd7.md5 b/.godot/imported/control_box_StreetLamp_normal000.png-96785793f332081830ef63e7ac2cddd7.md5 deleted file mode 100644 index 2466d75..0000000 --- a/.godot/imported/control_box_StreetLamp_normal000.png-96785793f332081830ef63e7ac2cddd7.md5 +++ /dev/null @@ -1,2 +0,0 @@ -source_md5="6bd1f6db4caae88e964a5116e165ab38" -dest_md5="4e1322edd8f06f1d74035870b92ac719" diff --git a/.godot/imported/control_box_StreetLamp_normal000.png-96785793f332081830ef63e7ac2cddd7.s3tc.ctex b/.godot/imported/control_box_StreetLamp_normal000.png-96785793f332081830ef63e7ac2cddd7.s3tc.ctex deleted file mode 100644 index d48b87e..0000000 Binary files a/.godot/imported/control_box_StreetLamp_normal000.png-96785793f332081830ef63e7ac2cddd7.s3tc.ctex and /dev/null differ diff --git a/.godot/imported/control_box_StreetLamp_orm000.png-aa831d687e56274012fc4d842af35d39.ctex b/.godot/imported/control_box_StreetLamp_orm000.png-aa831d687e56274012fc4d842af35d39.ctex deleted file mode 100644 index 2172a4d..0000000 Binary files a/.godot/imported/control_box_StreetLamp_orm000.png-aa831d687e56274012fc4d842af35d39.ctex and /dev/null differ diff --git a/.godot/imported/control_box_StreetLamp_orm000.png-aa831d687e56274012fc4d842af35d39.md5 b/.godot/imported/control_box_StreetLamp_orm000.png-aa831d687e56274012fc4d842af35d39.md5 deleted file mode 100644 index b1e28ee..0000000 --- a/.godot/imported/control_box_StreetLamp_orm000.png-aa831d687e56274012fc4d842af35d39.md5 +++ /dev/null @@ -1,2 +0,0 @@ -source_md5="d937a77fa24bf411f131a60a092ff2b9" -dest_md5="f5e37f7676f747e2be18f461271aadf5" diff --git a/.godot/imported/control_box_StreetLamp_orm000.png-aa831d687e56274012fc4d842af35d39.s3tc.ctex b/.godot/imported/control_box_StreetLamp_orm000.png-aa831d687e56274012fc4d842af35d39.s3tc.ctex deleted file mode 100644 index 8bca602..0000000 Binary files a/.godot/imported/control_box_StreetLamp_orm000.png-aa831d687e56274012fc4d842af35d39.s3tc.ctex and /dev/null differ diff --git a/.godot/imported/control_box_street_lamp_albedo000.png-5cbb543138142ece3ed16170b0eb1a83.ctex b/.godot/imported/control_box_street_lamp_albedo000.png-5cbb543138142ece3ed16170b0eb1a83.ctex index 028b6ec..c269e83 100644 Binary files a/.godot/imported/control_box_street_lamp_albedo000.png-5cbb543138142ece3ed16170b0eb1a83.ctex and b/.godot/imported/control_box_street_lamp_albedo000.png-5cbb543138142ece3ed16170b0eb1a83.ctex differ diff --git a/.godot/imported/control_box_street_lamp_albedo000.png-5cbb543138142ece3ed16170b0eb1a83.md5 b/.godot/imported/control_box_street_lamp_albedo000.png-5cbb543138142ece3ed16170b0eb1a83.md5 index 874b2ec..7b5a0fe 100644 --- a/.godot/imported/control_box_street_lamp_albedo000.png-5cbb543138142ece3ed16170b0eb1a83.md5 +++ b/.godot/imported/control_box_street_lamp_albedo000.png-5cbb543138142ece3ed16170b0eb1a83.md5 @@ -1,2 +1,2 @@ -source_md5="fd1796543637f98353085d28e7123a51" -dest_md5="aa08cbf0ff8784c863f662cd9204489d" +source_md5="1b9265e7a8aaceeb0c388f9f6c44175d" +dest_md5="03779079395322694bfc189121101429" diff --git a/.godot/imported/control_box_street_lamp_albedo002.png-cfe7ad10bc8499f18d9bbec2d94078b4.md5 b/.godot/imported/control_box_street_lamp_albedo002.png-cfe7ad10bc8499f18d9bbec2d94078b4.md5 index 3cbaa8b..1bbce27 100644 --- a/.godot/imported/control_box_street_lamp_albedo002.png-cfe7ad10bc8499f18d9bbec2d94078b4.md5 +++ b/.godot/imported/control_box_street_lamp_albedo002.png-cfe7ad10bc8499f18d9bbec2d94078b4.md5 @@ -1,2 +1,2 @@ -source_md5="16df86ac9e0938168a909f31880f0584" +source_md5="3c1aaaeed6c467c2f2055f38490183b3" dest_md5="de1722ead4b526bc8d7b85062083e2be" diff --git a/.godot/imported/control_box_street_lamp_emission000.png-db4537906f5e241ff86fff7e24a48743.md5 b/.godot/imported/control_box_street_lamp_emission000.png-db4537906f5e241ff86fff7e24a48743.md5 index f1811f8..69d777e 100644 --- a/.godot/imported/control_box_street_lamp_emission000.png-db4537906f5e241ff86fff7e24a48743.md5 +++ b/.godot/imported/control_box_street_lamp_emission000.png-db4537906f5e241ff86fff7e24a48743.md5 @@ -1,2 +1,2 @@ -source_md5="e78d0053aebc2fc620358b74fb152577" +source_md5="b9e78ffdd03bf396ec2ea30d4c02f448" dest_md5="08fdc045ee79ad5e5d848d6870fc95bb" diff --git a/.godot/imported/control_box_street_lamp_normal000.png-783e35e7656ebd6ab22568618a8f6738.ctex b/.godot/imported/control_box_street_lamp_normal000.png-783e35e7656ebd6ab22568618a8f6738.ctex index bc5e093..b88a085 100644 Binary files a/.godot/imported/control_box_street_lamp_normal000.png-783e35e7656ebd6ab22568618a8f6738.ctex and b/.godot/imported/control_box_street_lamp_normal000.png-783e35e7656ebd6ab22568618a8f6738.ctex differ diff --git a/.godot/imported/control_box_street_lamp_normal000.png-783e35e7656ebd6ab22568618a8f6738.md5 b/.godot/imported/control_box_street_lamp_normal000.png-783e35e7656ebd6ab22568618a8f6738.md5 index bffe58d..50c5276 100644 --- a/.godot/imported/control_box_street_lamp_normal000.png-783e35e7656ebd6ab22568618a8f6738.md5 +++ b/.godot/imported/control_box_street_lamp_normal000.png-783e35e7656ebd6ab22568618a8f6738.md5 @@ -1,2 +1,2 @@ -source_md5="6bd1f6db4caae88e964a5116e165ab38" -dest_md5="6e1e672628a3b90cc189407dab9bbb23" +source_md5="447b4a2acaee24d4383bec5fd1353e04" +dest_md5="922f98d07358e349fa2f0478bef8fa63" diff --git a/.godot/imported/control_box_street_lamp_orm000.png-b5647570894759eee0f3b26332b4108e.ctex b/.godot/imported/control_box_street_lamp_orm000.png-b5647570894759eee0f3b26332b4108e.ctex index 2172a4d..7eba137 100644 Binary files a/.godot/imported/control_box_street_lamp_orm000.png-b5647570894759eee0f3b26332b4108e.ctex and b/.godot/imported/control_box_street_lamp_orm000.png-b5647570894759eee0f3b26332b4108e.ctex differ diff --git a/.godot/imported/control_box_street_lamp_orm000.png-b5647570894759eee0f3b26332b4108e.md5 b/.godot/imported/control_box_street_lamp_orm000.png-b5647570894759eee0f3b26332b4108e.md5 index a005004..737e7da 100644 --- a/.godot/imported/control_box_street_lamp_orm000.png-b5647570894759eee0f3b26332b4108e.md5 +++ b/.godot/imported/control_box_street_lamp_orm000.png-b5647570894759eee0f3b26332b4108e.md5 @@ -1,2 +1,2 @@ -source_md5="d937a77fa24bf411f131a60a092ff2b9" -dest_md5="c71745f428735ed19279d677d144165b" +source_md5="9065398b765504f90bbb924d68dff921" +dest_md5="ee960bc3affdd02c1fddf404a71e748c" diff --git a/.godot/imported/crowbar.glb-a393ee718e3dc6099bf97ae1576ac31e.md5 b/.godot/imported/crowbar.glb-a393ee718e3dc6099bf97ae1576ac31e.md5 index 1b7c25f..ed1a287 100644 --- a/.godot/imported/crowbar.glb-a393ee718e3dc6099bf97ae1576ac31e.md5 +++ b/.godot/imported/crowbar.glb-a393ee718e3dc6099bf97ae1576ac31e.md5 @@ -1,2 +1,2 @@ source_md5="25d7d1a65eb5dd84aa58c20def1eaaaa" -dest_md5="fe967e211701ed6c939bb335c855755c" +dest_md5="d7fc4b7026226e10c6810e8d3bf3a7c9" diff --git a/.godot/imported/crowbar.glb-a393ee718e3dc6099bf97ae1576ac31e.scn b/.godot/imported/crowbar.glb-a393ee718e3dc6099bf97ae1576ac31e.scn index 8f0e79c..c87af5e 100644 Binary files a/.godot/imported/crowbar.glb-a393ee718e3dc6099bf97ae1576ac31e.scn and b/.godot/imported/crowbar.glb-a393ee718e3dc6099bf97ae1576ac31e.scn differ diff --git a/.godot/imported/dead_branch.glb-e4e41ce877f1ef0b2d20a7b89af5de7b.md5 b/.godot/imported/dead_branch.glb-e4e41ce877f1ef0b2d20a7b89af5de7b.md5 index 1da5f59..f22319d 100644 --- a/.godot/imported/dead_branch.glb-e4e41ce877f1ef0b2d20a7b89af5de7b.md5 +++ b/.godot/imported/dead_branch.glb-e4e41ce877f1ef0b2d20a7b89af5de7b.md5 @@ -1,2 +1,2 @@ source_md5="81425403dffc8e4a8722edc480988edb" -dest_md5="f77681161bf685758a8fb067cefe48a5" +dest_md5="783af918ec6555ad2c3e4c206191bef4" diff --git a/.godot/imported/dead_branch.glb-e4e41ce877f1ef0b2d20a7b89af5de7b.scn b/.godot/imported/dead_branch.glb-e4e41ce877f1ef0b2d20a7b89af5de7b.scn index 74f2538..a23d3f4 100644 Binary files a/.godot/imported/dead_branch.glb-e4e41ce877f1ef0b2d20a7b89af5de7b.scn and b/.godot/imported/dead_branch.glb-e4e41ce877f1ef0b2d20a7b89af5de7b.scn differ diff --git a/.godot/imported/disket-mono-bold.ttf-cf93b19f0481ae1a06c04a6b61dc6c17.fontdata b/.godot/imported/disket-mono-bold.ttf-cf93b19f0481ae1a06c04a6b61dc6c17.fontdata index 027f7d8..9cb7ef1 100644 Binary files a/.godot/imported/disket-mono-bold.ttf-cf93b19f0481ae1a06c04a6b61dc6c17.fontdata and b/.godot/imported/disket-mono-bold.ttf-cf93b19f0481ae1a06c04a6b61dc6c17.fontdata differ diff --git a/.godot/imported/disket-mono-bold.ttf-cf93b19f0481ae1a06c04a6b61dc6c17.md5 b/.godot/imported/disket-mono-bold.ttf-cf93b19f0481ae1a06c04a6b61dc6c17.md5 index 6996a18..2a90df5 100644 --- a/.godot/imported/disket-mono-bold.ttf-cf93b19f0481ae1a06c04a6b61dc6c17.md5 +++ b/.godot/imported/disket-mono-bold.ttf-cf93b19f0481ae1a06c04a6b61dc6c17.md5 @@ -1,2 +1,2 @@ source_md5="6c122b79a74903eb114a264a5103b5b1" -dest_md5="aadf97b964b5f3326eb05ec354102431" +dest_md5="f784e0f4c8996d299921c447ab463313" diff --git a/.godot/imported/disket-mono-regular.ttf-675f000c7addd97668f031a0b4d5f247.fontdata b/.godot/imported/disket-mono-regular.ttf-675f000c7addd97668f031a0b4d5f247.fontdata index 02a07d0..280d4d1 100644 Binary files a/.godot/imported/disket-mono-regular.ttf-675f000c7addd97668f031a0b4d5f247.fontdata and b/.godot/imported/disket-mono-regular.ttf-675f000c7addd97668f031a0b4d5f247.fontdata differ diff --git a/.godot/imported/disket-mono-regular.ttf-675f000c7addd97668f031a0b4d5f247.md5 b/.godot/imported/disket-mono-regular.ttf-675f000c7addd97668f031a0b4d5f247.md5 index 1f431b1..d16d4f1 100644 --- a/.godot/imported/disket-mono-regular.ttf-675f000c7addd97668f031a0b4d5f247.md5 +++ b/.godot/imported/disket-mono-regular.ttf-675f000c7addd97668f031a0b4d5f247.md5 @@ -1,2 +1,2 @@ source_md5="3284c3a32cf946466fb963369b3c5b2d" -dest_md5="39f43ac80f91408b00605cccd211f695" +dest_md5="7937ad0933ae691719fcd9d9d4d031fb" diff --git a/.godot/imported/door_open.ogg-c5f410d133a98510dffd78e873897188.md5 b/.godot/imported/door_open.ogg-c5f410d133a98510dffd78e873897188.md5 index fb6d335..aaac34c 100644 --- a/.godot/imported/door_open.ogg-c5f410d133a98510dffd78e873897188.md5 +++ b/.godot/imported/door_open.ogg-c5f410d133a98510dffd78e873897188.md5 @@ -1,2 +1,2 @@ source_md5="2c8f48724ca2ddef67cf2fa96b434dc1" -dest_md5="88b875a74dfb59bb70bb9048ea4bd27c" +dest_md5="dace1eb0d72d785fac36e7fb84d4fe83" diff --git a/.godot/imported/door_open.ogg-c5f410d133a98510dffd78e873897188.oggvorbisstr b/.godot/imported/door_open.ogg-c5f410d133a98510dffd78e873897188.oggvorbisstr index e64012f..117cb9b 100644 Binary files a/.godot/imported/door_open.ogg-c5f410d133a98510dffd78e873897188.oggvorbisstr and b/.godot/imported/door_open.ogg-c5f410d133a98510dffd78e873897188.oggvorbisstr differ diff --git a/.godot/imported/fence_planks.glb-4cee642c3e514323763ee9631fb323e9.md5 b/.godot/imported/fence_planks.glb-4cee642c3e514323763ee9631fb323e9.md5 index d2bd104..ee57981 100644 --- a/.godot/imported/fence_planks.glb-4cee642c3e514323763ee9631fb323e9.md5 +++ b/.godot/imported/fence_planks.glb-4cee642c3e514323763ee9631fb323e9.md5 @@ -1,2 +1,2 @@ source_md5="acf67c6d4b4eddc4751a018ed6cf3ca9" -dest_md5="001d331d10fb156de30d4d918cc0d32c" +dest_md5="44070a3f099fe1efd41299eec9fec667" diff --git a/.godot/imported/fence_planks.glb-4cee642c3e514323763ee9631fb323e9.scn b/.godot/imported/fence_planks.glb-4cee642c3e514323763ee9631fb323e9.scn index 781ebe4..6a8c7cb 100644 Binary files a/.godot/imported/fence_planks.glb-4cee642c3e514323763ee9631fb323e9.scn and b/.godot/imported/fence_planks.glb-4cee642c3e514323763ee9631fb323e9.scn differ diff --git a/.godot/imported/flashlight.obj-4d78cd8f9f4af70bfd9d2fcc093f8750.md5 b/.godot/imported/flashlight.obj-4d78cd8f9f4af70bfd9d2fcc093f8750.md5 index b6f2c6c..b46c84f 100644 --- a/.godot/imported/flashlight.obj-4d78cd8f9f4af70bfd9d2fcc093f8750.md5 +++ b/.godot/imported/flashlight.obj-4d78cd8f9f4af70bfd9d2fcc093f8750.md5 @@ -1,2 +1,2 @@ source_md5="b88782cea2fd50b365a29c32ec70a5db" -dest_md5="6aee50cbab42de49019b1f03e9eb4b7d" +dest_md5="7605d11d068f89049150fe497812f3a5" diff --git a/.godot/imported/flashlight.obj-4d78cd8f9f4af70bfd9d2fcc093f8750.mesh b/.godot/imported/flashlight.obj-4d78cd8f9f4af70bfd9d2fcc093f8750.mesh index c073544..48baa78 100644 Binary files a/.godot/imported/flashlight.obj-4d78cd8f9f4af70bfd9d2fcc093f8750.mesh and b/.godot/imported/flashlight.obj-4d78cd8f9f4af70bfd9d2fcc093f8750.mesh differ diff --git a/.godot/imported/flowerbed6_1x2.fbx-db3ee28b373b271389eb1fc61627f09f.md5 b/.godot/imported/flowerbed6_1x2.fbx-db3ee28b373b271389eb1fc61627f09f.md5 index 5a2deb7..0fe4501 100644 --- a/.godot/imported/flowerbed6_1x2.fbx-db3ee28b373b271389eb1fc61627f09f.md5 +++ b/.godot/imported/flowerbed6_1x2.fbx-db3ee28b373b271389eb1fc61627f09f.md5 @@ -1,2 +1,2 @@ source_md5="f5fc07ec71c345bd24cbdc6ee41209a0" -dest_md5="0d88b25e486001e7cfcd2d6f55d9d060" +dest_md5="58d80a90c9cbe763e0243cbd3bf02114" diff --git a/.godot/imported/flowerbed6_1x2.fbx-db3ee28b373b271389eb1fc61627f09f.scn b/.godot/imported/flowerbed6_1x2.fbx-db3ee28b373b271389eb1fc61627f09f.scn index 3ee9078..90331c2 100644 Binary files a/.godot/imported/flowerbed6_1x2.fbx-db3ee28b373b271389eb1fc61627f09f.scn and b/.godot/imported/flowerbed6_1x2.fbx-db3ee28b373b271389eb1fc61627f09f.scn differ diff --git a/.godot/imported/fountain01_round.fbx-a18e35b8e6b08c141ae3a4389a65faaa.md5 b/.godot/imported/fountain01_round.fbx-a18e35b8e6b08c141ae3a4389a65faaa.md5 index 7fd6336..6c3c53f 100644 --- a/.godot/imported/fountain01_round.fbx-a18e35b8e6b08c141ae3a4389a65faaa.md5 +++ b/.godot/imported/fountain01_round.fbx-a18e35b8e6b08c141ae3a4389a65faaa.md5 @@ -1,2 +1,2 @@ source_md5="1f72ba14ac0757b0c6ec8ff03e4ed6d3" -dest_md5="7a6b546d4fec4e5736fe13641fac94d8" +dest_md5="41d08a9ac17cf106c951cf964be7f52c" diff --git a/.godot/imported/fountain01_round.fbx-a18e35b8e6b08c141ae3a4389a65faaa.scn b/.godot/imported/fountain01_round.fbx-a18e35b8e6b08c141ae3a4389a65faaa.scn index 15ecd80..42107f3 100644 Binary files a/.godot/imported/fountain01_round.fbx-a18e35b8e6b08c141ae3a4389a65faaa.scn and b/.godot/imported/fountain01_round.fbx-a18e35b8e6b08c141ae3a4389a65faaa.scn differ diff --git a/.godot/imported/fountain01_round_water.fbx-edbe45063be2c509a37d315e4dbbb7a6.md5 b/.godot/imported/fountain01_round_water.fbx-edbe45063be2c509a37d315e4dbbb7a6.md5 index ed41f26..916d7fb 100644 --- a/.godot/imported/fountain01_round_water.fbx-edbe45063be2c509a37d315e4dbbb7a6.md5 +++ b/.godot/imported/fountain01_round_water.fbx-edbe45063be2c509a37d315e4dbbb7a6.md5 @@ -1,2 +1,2 @@ source_md5="621fdd54dfe442dc933809b041be2998" -dest_md5="7a3b6a181cfd6cc5750f7bb5c7757377" +dest_md5="286576b84ff29a13db2f06dd4fb2c059" diff --git a/.godot/imported/fountain01_round_water.fbx-edbe45063be2c509a37d315e4dbbb7a6.scn b/.godot/imported/fountain01_round_water.fbx-edbe45063be2c509a37d315e4dbbb7a6.scn index 7ed10e9..496082c 100644 Binary files a/.godot/imported/fountain01_round_water.fbx-edbe45063be2c509a37d315e4dbbb7a6.scn and b/.godot/imported/fountain01_round_water.fbx-edbe45063be2c509a37d315e4dbbb7a6.scn differ diff --git a/.godot/imported/gazebo.fbx-1a40b36a6524f7a16de76c33bdca3f49.md5 b/.godot/imported/gazebo.fbx-1a40b36a6524f7a16de76c33bdca3f49.md5 index e349620..d438d6e 100644 --- a/.godot/imported/gazebo.fbx-1a40b36a6524f7a16de76c33bdca3f49.md5 +++ b/.godot/imported/gazebo.fbx-1a40b36a6524f7a16de76c33bdca3f49.md5 @@ -1,2 +1,2 @@ source_md5="52040accaccb382fd64d4e660f91eb5d" -dest_md5="a3f6ef38b3541379be06fec7af709c17" +dest_md5="513dffe720bf11aeb5a29ca9b492919d" diff --git a/.godot/imported/gazebo.fbx-1a40b36a6524f7a16de76c33bdca3f49.scn b/.godot/imported/gazebo.fbx-1a40b36a6524f7a16de76c33bdca3f49.scn index 0d25c9b..f906046 100644 Binary files a/.godot/imported/gazebo.fbx-1a40b36a6524f7a16de76c33bdca3f49.scn and b/.godot/imported/gazebo.fbx-1a40b36a6524f7a16de76c33bdca3f49.scn differ diff --git a/.godot/imported/gobot.glb-36505aa16090f2bc2f34fbe5362f44e8.md5 b/.godot/imported/gobot.glb-36505aa16090f2bc2f34fbe5362f44e8.md5 index e157d1b..de7639f 100644 --- a/.godot/imported/gobot.glb-36505aa16090f2bc2f34fbe5362f44e8.md5 +++ b/.godot/imported/gobot.glb-36505aa16090f2bc2f34fbe5362f44e8.md5 @@ -1,2 +1,2 @@ source_md5="47b2f0428ac459670abcb7eed226e03e" -dest_md5="6f0dfad3090721e9eda817b8de14d359" +dest_md5="b051d90d4489585669331ea65436190e" diff --git a/.godot/imported/gobot.glb-36505aa16090f2bc2f34fbe5362f44e8.scn b/.godot/imported/gobot.glb-36505aa16090f2bc2f34fbe5362f44e8.scn index 4d5144f..a069ee9 100644 Binary files a/.godot/imported/gobot.glb-36505aa16090f2bc2f34fbe5362f44e8.scn and b/.godot/imported/gobot.glb-36505aa16090f2bc2f34fbe5362f44e8.scn differ diff --git a/.godot/imported/grass.glb-0ef73576363e4c601b9f45b1787e1487.md5 b/.godot/imported/grass.glb-0ef73576363e4c601b9f45b1787e1487.md5 index 9d30328..d409699 100644 --- a/.godot/imported/grass.glb-0ef73576363e4c601b9f45b1787e1487.md5 +++ b/.godot/imported/grass.glb-0ef73576363e4c601b9f45b1787e1487.md5 @@ -1,2 +1,2 @@ source_md5="78c80a15562fc393dc8d024b43f1dd75" -dest_md5="70d8b873a7cdd5494936a1283092db23" +dest_md5="dbbc5228f2ed0f5c7d5cf877ae210fc3" diff --git a/.godot/imported/grass.glb-0ef73576363e4c601b9f45b1787e1487.scn b/.godot/imported/grass.glb-0ef73576363e4c601b9f45b1787e1487.scn index 6d4f702..49adafe 100644 Binary files a/.godot/imported/grass.glb-0ef73576363e4c601b9f45b1787e1487.scn and b/.godot/imported/grass.glb-0ef73576363e4c601b9f45b1787e1487.scn differ diff --git a/.godot/imported/grass.png-44de1b601ed5e0482c9aa195977ab90c.md5 b/.godot/imported/grass.png-44de1b601ed5e0482c9aa195977ab90c.md5 index 5f8b37a..80f6e19 100644 --- a/.godot/imported/grass.png-44de1b601ed5e0482c9aa195977ab90c.md5 +++ b/.godot/imported/grass.png-44de1b601ed5e0482c9aa195977ab90c.md5 @@ -1,2 +1,2 @@ -source_md5="f77e36a97cb398a16c87e3bf5d6dbab5" +source_md5="4440f9f3c54263a0a620a8c9bfd41e45" dest_md5="9c490e04908c573ca50f9efc53f21403" diff --git a/.godot/imported/grass_2.glb-2dc56a32acf64077863c701e8b94ea02.md5 b/.godot/imported/grass_2.glb-2dc56a32acf64077863c701e8b94ea02.md5 index dbe157a..6516f45 100644 --- a/.godot/imported/grass_2.glb-2dc56a32acf64077863c701e8b94ea02.md5 +++ b/.godot/imported/grass_2.glb-2dc56a32acf64077863c701e8b94ea02.md5 @@ -1,2 +1,2 @@ source_md5="c8ea57ccd2f30a806bfd7c6c516a9391" -dest_md5="64f1d5e37347a6f24c9f521529912fc6" +dest_md5="0d715454afd8473828294eb0e84b9e07" diff --git a/.godot/imported/grass_2.glb-2dc56a32acf64077863c701e8b94ea02.scn b/.godot/imported/grass_2.glb-2dc56a32acf64077863c701e8b94ea02.scn index 96e55c8..d9cc974 100644 Binary files a/.godot/imported/grass_2.glb-2dc56a32acf64077863c701e8b94ea02.scn and b/.godot/imported/grass_2.glb-2dc56a32acf64077863c701e8b94ea02.scn differ diff --git a/.godot/imported/house2.glb-d144ddecddcf42a0db88e44676bad23d.md5 b/.godot/imported/house2.glb-d144ddecddcf42a0db88e44676bad23d.md5 index b8f40c3..8c7c88e 100644 --- a/.godot/imported/house2.glb-d144ddecddcf42a0db88e44676bad23d.md5 +++ b/.godot/imported/house2.glb-d144ddecddcf42a0db88e44676bad23d.md5 @@ -1,2 +1,2 @@ source_md5="5d32f82fa90b1ff5999513bacac28fa7" -dest_md5="de827a4eda4dba9fa79d85aa1149183c" +dest_md5="c562f734d63b3faf8ca9e79aeaff0391" diff --git a/.godot/imported/house2.glb-d144ddecddcf42a0db88e44676bad23d.scn b/.godot/imported/house2.glb-d144ddecddcf42a0db88e44676bad23d.scn index dff8667..1cf96ba 100644 Binary files a/.godot/imported/house2.glb-d144ddecddcf42a0db88e44676bad23d.scn and b/.godot/imported/house2.glb-d144ddecddcf42a0db88e44676bad23d.scn differ diff --git a/.godot/imported/house2_tex1.png-6edf3f05b194c5156b5d72c3adfbbf16.md5 b/.godot/imported/house2_tex1.png-6edf3f05b194c5156b5d72c3adfbbf16.md5 index d7e7bc3..0eb6904 100644 --- a/.godot/imported/house2_tex1.png-6edf3f05b194c5156b5d72c3adfbbf16.md5 +++ b/.godot/imported/house2_tex1.png-6edf3f05b194c5156b5d72c3adfbbf16.md5 @@ -1,2 +1,2 @@ -source_md5="edbaae8d572dbcafa3a76ba8d7620923" +source_md5="2898b2b58b782ca2754cf8e5ee849e38" dest_md5="2898c9ab4789c93ab0cfa50cf524c269" diff --git a/.godot/imported/large_rock.glb-f7a7a73f49167cee4ed84e7342d1f507.md5 b/.godot/imported/large_rock.glb-f7a7a73f49167cee4ed84e7342d1f507.md5 index 2774726..70c7d26 100644 --- a/.godot/imported/large_rock.glb-f7a7a73f49167cee4ed84e7342d1f507.md5 +++ b/.godot/imported/large_rock.glb-f7a7a73f49167cee4ed84e7342d1f507.md5 @@ -1,2 +1,2 @@ source_md5="1fc3800f498ce772e019676efe8fb1c8" -dest_md5="8cd3ead11cdf497a5f909cd7936b4246" +dest_md5="4986a9b0bbee270bbdaadc24124787c5" diff --git a/.godot/imported/large_rock.glb-f7a7a73f49167cee4ed84e7342d1f507.scn b/.godot/imported/large_rock.glb-f7a7a73f49167cee4ed84e7342d1f507.scn index 9f89d6d..e58071d 100644 Binary files a/.godot/imported/large_rock.glb-f7a7a73f49167cee4ed84e7342d1f507.scn and b/.godot/imported/large_rock.glb-f7a7a73f49167cee4ed84e7342d1f507.scn differ diff --git a/.godot/imported/locale.csv-48d44e43046fb84a8f21d68facb95972.md5 b/.godot/imported/locale.csv-48d44e43046fb84a8f21d68facb95972.md5 index 496d2b0..6a3537c 100644 --- a/.godot/imported/locale.csv-48d44e43046fb84a8f21d68facb95972.md5 +++ b/.godot/imported/locale.csv-48d44e43046fb84a8f21d68facb95972.md5 @@ -1,2 +1,2 @@ source_md5="54ac736ec1deaf597f4b48477dcdd392" -dest_md5="4df0c03404c59a23b340b667315f3c39" +dest_md5="1aad2eaaa0857fa6758f7cfbdfc9aa3c" diff --git a/.godot/imported/main_menu.ogg-6d763a9ee7e50033fc80a64bc05a8ded.md5 b/.godot/imported/main_menu.ogg-6d763a9ee7e50033fc80a64bc05a8ded.md5 index f67e08c..0eeed65 100644 --- a/.godot/imported/main_menu.ogg-6d763a9ee7e50033fc80a64bc05a8ded.md5 +++ b/.godot/imported/main_menu.ogg-6d763a9ee7e50033fc80a64bc05a8ded.md5 @@ -1,2 +1,2 @@ source_md5="ebd03138fae292ff2addce612b66d255" -dest_md5="6097a5d06b33c8eb7d54a8bb878b3db0" +dest_md5="754c2b9746904504f4c1dda09636636d" diff --git a/.godot/imported/main_menu.ogg-6d763a9ee7e50033fc80a64bc05a8ded.oggvorbisstr b/.godot/imported/main_menu.ogg-6d763a9ee7e50033fc80a64bc05a8ded.oggvorbisstr index 86a62e3..da9ee92 100644 Binary files a/.godot/imported/main_menu.ogg-6d763a9ee7e50033fc80a64bc05a8ded.oggvorbisstr and b/.godot/imported/main_menu.ogg-6d763a9ee7e50033fc80a64bc05a8ded.oggvorbisstr differ diff --git a/.godot/imported/metal_slide.wav-c485d5ec8941370c75b1dea3e6bd7f22.md5 b/.godot/imported/metal_slide.wav-c485d5ec8941370c75b1dea3e6bd7f22.md5 index b384cbb..99ceefb 100644 --- a/.godot/imported/metal_slide.wav-c485d5ec8941370c75b1dea3e6bd7f22.md5 +++ b/.godot/imported/metal_slide.wav-c485d5ec8941370c75b1dea3e6bd7f22.md5 @@ -1,2 +1,2 @@ source_md5="a26188801e6ec8fdf3e1ae45cf16b5e5" -dest_md5="5bb20d7b15040d7924f4ca9055c7d48f" +dest_md5="6e7312e1eff16491fc475131dcabe08e" diff --git a/.godot/imported/metal_slide.wav-c485d5ec8941370c75b1dea3e6bd7f22.sample b/.godot/imported/metal_slide.wav-c485d5ec8941370c75b1dea3e6bd7f22.sample index bcc9855..6e5bcd1 100644 Binary files a/.godot/imported/metal_slide.wav-c485d5ec8941370c75b1dea3e6bd7f22.sample and b/.godot/imported/metal_slide.wav-c485d5ec8941370c75b1dea3e6bd7f22.sample differ diff --git a/.godot/imported/mushrooms.glb-64c83b02a53711f9983c978d53ab0f12.md5 b/.godot/imported/mushrooms.glb-64c83b02a53711f9983c978d53ab0f12.md5 index e720cf2..6e8f63f 100644 --- a/.godot/imported/mushrooms.glb-64c83b02a53711f9983c978d53ab0f12.md5 +++ b/.godot/imported/mushrooms.glb-64c83b02a53711f9983c978d53ab0f12.md5 @@ -1,2 +1,2 @@ source_md5="d41b4c6d18ea38557a3db75c02211906" -dest_md5="1821bde55f93880ecd8f16965bfeee62" +dest_md5="21b50bbe389bff3a23fd2cfd3504a156" diff --git a/.godot/imported/mushrooms.glb-64c83b02a53711f9983c978d53ab0f12.scn b/.godot/imported/mushrooms.glb-64c83b02a53711f9983c978d53ab0f12.scn index 4354329..66969ae 100644 Binary files a/.godot/imported/mushrooms.glb-64c83b02a53711f9983c978d53ab0f12.scn and b/.godot/imported/mushrooms.glb-64c83b02a53711f9983c978d53ab0f12.scn differ diff --git a/.godot/imported/noise.png-bb7ee9b1cae22f59aa9c7a55a764cfa3.md5 b/.godot/imported/noise.png-bb7ee9b1cae22f59aa9c7a55a764cfa3.md5 deleted file mode 100644 index 49c1c68..0000000 --- a/.godot/imported/noise.png-bb7ee9b1cae22f59aa9c7a55a764cfa3.md5 +++ /dev/null @@ -1,2 +0,0 @@ -source_md5="3d41e5cf131f0ad4fc880ced12e91ef6" -dest_md5="b3e55fdc67fa7a3d95ad102fc163633c" diff --git a/.godot/imported/pickup.wav-2aad7c0550afa96cbe4815c7cdbd1e30.md5 b/.godot/imported/pickup.wav-2aad7c0550afa96cbe4815c7cdbd1e30.md5 index 4cbc833..9b6a109 100644 --- a/.godot/imported/pickup.wav-2aad7c0550afa96cbe4815c7cdbd1e30.md5 +++ b/.godot/imported/pickup.wav-2aad7c0550afa96cbe4815c7cdbd1e30.md5 @@ -1,2 +1,2 @@ source_md5="7a6a1969d9f9658e9850e431dac28689" -dest_md5="af576d8920d5a40bcac501fbb2297bd7" +dest_md5="9378a81631fbcc0794ac0eab2e5d40c9" diff --git a/.godot/imported/pickup.wav-2aad7c0550afa96cbe4815c7cdbd1e30.sample b/.godot/imported/pickup.wav-2aad7c0550afa96cbe4815c7cdbd1e30.sample index ed16330..9a9a272 100644 Binary files a/.godot/imported/pickup.wav-2aad7c0550afa96cbe4815c7cdbd1e30.sample and b/.godot/imported/pickup.wav-2aad7c0550afa96cbe4815c7cdbd1e30.sample differ diff --git a/.godot/imported/pine_tree.glb-662cc3d34707ccadde24f89b98fadf88.md5 b/.godot/imported/pine_tree.glb-662cc3d34707ccadde24f89b98fadf88.md5 index 812b806..93e55ac 100644 --- a/.godot/imported/pine_tree.glb-662cc3d34707ccadde24f89b98fadf88.md5 +++ b/.godot/imported/pine_tree.glb-662cc3d34707ccadde24f89b98fadf88.md5 @@ -1,2 +1,2 @@ source_md5="9cca2d6634b61774d490534b8f565fce" -dest_md5="6ef3a97eb62cabea5d1a54967f924517" +dest_md5="34edde6f6107fdcdb5953c81cdd84530" diff --git a/.godot/imported/pine_tree.glb-662cc3d34707ccadde24f89b98fadf88.scn b/.godot/imported/pine_tree.glb-662cc3d34707ccadde24f89b98fadf88.scn index 6fc65e6..1d11dcb 100644 Binary files a/.godot/imported/pine_tree.glb-662cc3d34707ccadde24f89b98fadf88.scn and b/.godot/imported/pine_tree.glb-662cc3d34707ccadde24f89b98fadf88.scn differ diff --git a/.godot/imported/plant.png-62edf342479022b6e9e3755732742e28.md5 b/.godot/imported/plant.png-62edf342479022b6e9e3755732742e28.md5 index 17037aa..c69f647 100644 --- a/.godot/imported/plant.png-62edf342479022b6e9e3755732742e28.md5 +++ b/.godot/imported/plant.png-62edf342479022b6e9e3755732742e28.md5 @@ -1,2 +1,2 @@ -source_md5="96b353edf199bbbac61ce4080dcf4f50" +source_md5="5a1bb7ddbdafcd70a8400cd4b913c5e9" dest_md5="eb827fc404b225d3f12923a79b37a7bc" diff --git a/.godot/imported/psx_tree.gltf-7ffb84591b2b9eb05c2c08aba4af5474.md5 b/.godot/imported/psx_tree.gltf-7ffb84591b2b9eb05c2c08aba4af5474.md5 index 56aae57..a937f8c 100644 --- a/.godot/imported/psx_tree.gltf-7ffb84591b2b9eb05c2c08aba4af5474.md5 +++ b/.godot/imported/psx_tree.gltf-7ffb84591b2b9eb05c2c08aba4af5474.md5 @@ -1,2 +1,2 @@ source_md5="65178b8088068654fc7f09e9fdbf85a8" -dest_md5="820b1e7aaf78341f38d3e04d54593f87" +dest_md5="db75068a2b0dc85f898483d07e60885b" diff --git a/.godot/imported/psx_tree.gltf-7ffb84591b2b9eb05c2c08aba4af5474.scn b/.godot/imported/psx_tree.gltf-7ffb84591b2b9eb05c2c08aba4af5474.scn index d4e3937..aaff64e 100644 Binary files a/.godot/imported/psx_tree.gltf-7ffb84591b2b9eb05c2c08aba4af5474.scn and b/.godot/imported/psx_tree.gltf-7ffb84591b2b9eb05c2c08aba4af5474.scn differ diff --git a/.godot/imported/red_bricks.jpg-5dd86cd25e4957e121cc79f9fd814415.ctex b/.godot/imported/red_bricks.jpg-5dd86cd25e4957e121cc79f9fd814415.ctex deleted file mode 100644 index 2770cf5..0000000 Binary files a/.godot/imported/red_bricks.jpg-5dd86cd25e4957e121cc79f9fd814415.ctex and /dev/null differ diff --git a/.godot/imported/red_bricks.jpg-5dd86cd25e4957e121cc79f9fd814415.md5 b/.godot/imported/red_bricks.jpg-5dd86cd25e4957e121cc79f9fd814415.md5 index 52e6a83..e23c105 100644 --- a/.godot/imported/red_bricks.jpg-5dd86cd25e4957e121cc79f9fd814415.md5 +++ b/.godot/imported/red_bricks.jpg-5dd86cd25e4957e121cc79f9fd814415.md5 @@ -1,2 +1,2 @@ -source_md5="8830dde094a19d459e4ecace0f77b457" +source_md5="5c93833795389a873d37ad226b61600b" dest_md5="26e10bb895acae69a32304a1094efe56" diff --git a/.godot/imported/round_5x2_01.fbx-7b4ce65ca0b067f4ccffd0edccfb3539.md5 b/.godot/imported/round_5x2_01.fbx-7b4ce65ca0b067f4ccffd0edccfb3539.md5 index 4815fb6..d17cbbb 100644 --- a/.godot/imported/round_5x2_01.fbx-7b4ce65ca0b067f4ccffd0edccfb3539.md5 +++ b/.godot/imported/round_5x2_01.fbx-7b4ce65ca0b067f4ccffd0edccfb3539.md5 @@ -1,2 +1,2 @@ source_md5="75cc52eba1e1036a318e066dbded1adf" -dest_md5="2fbad687fa7cf11a589fb5e711817804" +dest_md5="388a26fde2647c473399cd5d9852e2c3" diff --git a/.godot/imported/round_5x2_01.fbx-7b4ce65ca0b067f4ccffd0edccfb3539.scn b/.godot/imported/round_5x2_01.fbx-7b4ce65ca0b067f4ccffd0edccfb3539.scn index 28b2d54..ec45ca2 100644 Binary files a/.godot/imported/round_5x2_01.fbx-7b4ce65ca0b067f4ccffd0edccfb3539.scn and b/.godot/imported/round_5x2_01.fbx-7b4ce65ca0b067f4ccffd0edccfb3539.scn differ diff --git a/.godot/imported/security_post.gltf-428df031fdb40442871d25b3e709176b.md5 b/.godot/imported/security_post.gltf-428df031fdb40442871d25b3e709176b.md5 index 84ba493..101dbd1 100644 --- a/.godot/imported/security_post.gltf-428df031fdb40442871d25b3e709176b.md5 +++ b/.godot/imported/security_post.gltf-428df031fdb40442871d25b3e709176b.md5 @@ -1,2 +1,2 @@ source_md5="13a78b1a78175123910ab91780ec545c" -dest_md5="c1e8e8757fcde2fcb7b435b5a2674805" +dest_md5="89394a4fe6e5d729f0ae15f86ae44269" diff --git a/.godot/imported/security_post.gltf-428df031fdb40442871d25b3e709176b.scn b/.godot/imported/security_post.gltf-428df031fdb40442871d25b3e709176b.scn index a801ec3..25bbe8e 100644 Binary files a/.godot/imported/security_post.gltf-428df031fdb40442871d25b3e709176b.scn and b/.godot/imported/security_post.gltf-428df031fdb40442871d25b3e709176b.scn differ diff --git a/.godot/imported/sfx_exp_long1.wav-4084405aad75519e784dfc638c7c68da.md5 b/.godot/imported/sfx_exp_long1.wav-4084405aad75519e784dfc638c7c68da.md5 index 1a4212c..747cd4f 100644 --- a/.godot/imported/sfx_exp_long1.wav-4084405aad75519e784dfc638c7c68da.md5 +++ b/.godot/imported/sfx_exp_long1.wav-4084405aad75519e784dfc638c7c68da.md5 @@ -1,2 +1,2 @@ source_md5="e65a7e8bc025ea83efff538398dfc545" -dest_md5="33eee1d3851528179f59bee6e8b6669b" +dest_md5="9746c43730413f0646b3b7fb1e1b747a" diff --git a/.godot/imported/sfx_exp_long1.wav-4084405aad75519e784dfc638c7c68da.sample b/.godot/imported/sfx_exp_long1.wav-4084405aad75519e784dfc638c7c68da.sample index beef498..dcba2a1 100644 Binary files a/.godot/imported/sfx_exp_long1.wav-4084405aad75519e784dfc638c7c68da.sample and b/.godot/imported/sfx_exp_long1.wav-4084405aad75519e784dfc638c7c68da.sample differ diff --git a/.godot/imported/sfx_sound_depressurizing.wav-f134b66addd59996a126e0f613ce569c.md5 b/.godot/imported/sfx_sound_depressurizing.wav-f134b66addd59996a126e0f613ce569c.md5 index 94b4952..29f9285 100644 --- a/.godot/imported/sfx_sound_depressurizing.wav-f134b66addd59996a126e0f613ce569c.md5 +++ b/.godot/imported/sfx_sound_depressurizing.wav-f134b66addd59996a126e0f613ce569c.md5 @@ -1,2 +1,2 @@ source_md5="c64a4af7e9c91485528191c87212a69d" -dest_md5="579070fdd81f462b66edbf9653308b08" +dest_md5="24d714951602bab75b1d9a11f5a2a18b" diff --git a/.godot/imported/sfx_sound_depressurizing.wav-f134b66addd59996a126e0f613ce569c.sample b/.godot/imported/sfx_sound_depressurizing.wav-f134b66addd59996a126e0f613ce569c.sample index d5e60e7..6bc60aa 100644 Binary files a/.godot/imported/sfx_sound_depressurizing.wav-f134b66addd59996a126e0f613ce569c.sample and b/.godot/imported/sfx_sound_depressurizing.wav-f134b66addd59996a126e0f613ce569c.sample differ diff --git a/.godot/imported/sfx_sound_shutdown2.wav-564eea78bf100d9dc2738e59696245da.md5 b/.godot/imported/sfx_sound_shutdown2.wav-564eea78bf100d9dc2738e59696245da.md5 index b751c3d..1c2be43 100644 --- a/.godot/imported/sfx_sound_shutdown2.wav-564eea78bf100d9dc2738e59696245da.md5 +++ b/.godot/imported/sfx_sound_shutdown2.wav-564eea78bf100d9dc2738e59696245da.md5 @@ -1,2 +1,2 @@ source_md5="0795d3997e037697417684a32eb9843c" -dest_md5="32e0af8e24657c3481eba1f0b7ca1fb7" +dest_md5="08df5e1f2e5afd7d139862a42e495a2c" diff --git a/.godot/imported/sfx_sound_shutdown2.wav-564eea78bf100d9dc2738e59696245da.sample b/.godot/imported/sfx_sound_shutdown2.wav-564eea78bf100d9dc2738e59696245da.sample index 0c6f0a6..c5fd08e 100644 Binary files a/.godot/imported/sfx_sound_shutdown2.wav-564eea78bf100d9dc2738e59696245da.sample and b/.godot/imported/sfx_sound_shutdown2.wav-564eea78bf100d9dc2738e59696245da.sample differ diff --git a/.godot/imported/small_rock.glb-9b9690e480edfa6e23f0243045338de9.md5 b/.godot/imported/small_rock.glb-9b9690e480edfa6e23f0243045338de9.md5 index 1496ee3..6440697 100644 --- a/.godot/imported/small_rock.glb-9b9690e480edfa6e23f0243045338de9.md5 +++ b/.godot/imported/small_rock.glb-9b9690e480edfa6e23f0243045338de9.md5 @@ -1,2 +1,2 @@ source_md5="6061dbc319955281054c4160679e3aa2" -dest_md5="ca7bd4f03890dc71ab31e5f0c750e255" +dest_md5="2f4531db99f7643a6221579719e84b75" diff --git a/.godot/imported/small_rock.glb-9b9690e480edfa6e23f0243045338de9.scn b/.godot/imported/small_rock.glb-9b9690e480edfa6e23f0243045338de9.scn index f98ba7a..3d60dd8 100644 Binary files a/.godot/imported/small_rock.glb-9b9690e480edfa6e23f0243045338de9.scn and b/.godot/imported/small_rock.glb-9b9690e480edfa6e23f0243045338de9.scn differ diff --git a/.godot/imported/street_lamp.png-2275910362be86fcff2469cfecc17a01.md5 b/.godot/imported/street_lamp.png-2275910362be86fcff2469cfecc17a01.md5 index fa68d59..2272cbf 100644 --- a/.godot/imported/street_lamp.png-2275910362be86fcff2469cfecc17a01.md5 +++ b/.godot/imported/street_lamp.png-2275910362be86fcff2469cfecc17a01.md5 @@ -1,2 +1,2 @@ -source_md5="6b6e5b36ef427c28ce3a1049ef62fc47" +source_md5="bb0357231ed96cf4f3b3f3c64e4de3b1" dest_md5="dab1d846ec20a8b4e0ae39ae5e080bc3" diff --git a/.godot/imported/street_lamp_albedo000.png-2caaaf9e1faa091f98f252ab13cc8c9f.ctex b/.godot/imported/street_lamp_albedo000.png-2caaaf9e1faa091f98f252ab13cc8c9f.ctex deleted file mode 100644 index 0a7713d..0000000 Binary files a/.godot/imported/street_lamp_albedo000.png-2caaaf9e1faa091f98f252ab13cc8c9f.ctex and /dev/null differ diff --git a/.godot/imported/street_lamp_albedo000.png-2caaaf9e1faa091f98f252ab13cc8c9f.md5 b/.godot/imported/street_lamp_albedo000.png-2caaaf9e1faa091f98f252ab13cc8c9f.md5 index e9958c6..9d7453e 100644 --- a/.godot/imported/street_lamp_albedo000.png-2caaaf9e1faa091f98f252ab13cc8c9f.md5 +++ b/.godot/imported/street_lamp_albedo000.png-2caaaf9e1faa091f98f252ab13cc8c9f.md5 @@ -1,2 +1,2 @@ -source_md5="fd1796543637f98353085d28e7123a51" +source_md5="1b9265e7a8aaceeb0c388f9f6c44175d" dest_md5="12d46ea1b112ab56ca191e74143d8e78" diff --git a/.godot/imported/street_lamp_albedo002.png-4568909929c2a5df6e5e397b25c74ebb.ctex b/.godot/imported/street_lamp_albedo002.png-4568909929c2a5df6e5e397b25c74ebb.ctex deleted file mode 100644 index 91433df..0000000 Binary files a/.godot/imported/street_lamp_albedo002.png-4568909929c2a5df6e5e397b25c74ebb.ctex and /dev/null differ diff --git a/.godot/imported/street_lamp_albedo002.png-4568909929c2a5df6e5e397b25c74ebb.md5 b/.godot/imported/street_lamp_albedo002.png-4568909929c2a5df6e5e397b25c74ebb.md5 index 4f92f86..d7ba7e8 100644 --- a/.godot/imported/street_lamp_albedo002.png-4568909929c2a5df6e5e397b25c74ebb.md5 +++ b/.godot/imported/street_lamp_albedo002.png-4568909929c2a5df6e5e397b25c74ebb.md5 @@ -1,2 +1,2 @@ -source_md5="16df86ac9e0938168a909f31880f0584" +source_md5="3c1aaaeed6c467c2f2055f38490183b3" dest_md5="dab1d846ec20a8b4e0ae39ae5e080bc3" diff --git a/.godot/imported/street_lamp_emission000.png-617d02777e9c8d69c3b969041d1a7f66.ctex b/.godot/imported/street_lamp_emission000.png-617d02777e9c8d69c3b969041d1a7f66.ctex deleted file mode 100644 index 4983341..0000000 Binary files a/.godot/imported/street_lamp_emission000.png-617d02777e9c8d69c3b969041d1a7f66.ctex and /dev/null differ diff --git a/.godot/imported/street_lamp_emission000.png-617d02777e9c8d69c3b969041d1a7f66.md5 b/.godot/imported/street_lamp_emission000.png-617d02777e9c8d69c3b969041d1a7f66.md5 index 287cc89..2a9c26b 100644 --- a/.godot/imported/street_lamp_emission000.png-617d02777e9c8d69c3b969041d1a7f66.md5 +++ b/.godot/imported/street_lamp_emission000.png-617d02777e9c8d69c3b969041d1a7f66.md5 @@ -1,2 +1,2 @@ -source_md5="e78d0053aebc2fc620358b74fb152577" +source_md5="b9e78ffdd03bf396ec2ea30d4c02f448" dest_md5="db591c778213081aa3610ec542bae750" diff --git a/.godot/imported/street_lamp_normal000.png-3de499aad26b6fcbb9a9920d90ffdd16.ctex b/.godot/imported/street_lamp_normal000.png-3de499aad26b6fcbb9a9920d90ffdd16.ctex deleted file mode 100644 index cbd1fc3..0000000 Binary files a/.godot/imported/street_lamp_normal000.png-3de499aad26b6fcbb9a9920d90ffdd16.ctex and /dev/null differ diff --git a/.godot/imported/street_lamp_normal000.png-3de499aad26b6fcbb9a9920d90ffdd16.md5 b/.godot/imported/street_lamp_normal000.png-3de499aad26b6fcbb9a9920d90ffdd16.md5 index 2466d75..fb13bbc 100644 --- a/.godot/imported/street_lamp_normal000.png-3de499aad26b6fcbb9a9920d90ffdd16.md5 +++ b/.godot/imported/street_lamp_normal000.png-3de499aad26b6fcbb9a9920d90ffdd16.md5 @@ -1,2 +1,2 @@ -source_md5="6bd1f6db4caae88e964a5116e165ab38" +source_md5="22368d3d3ed679ebcc0d230afe1f4fcd" dest_md5="4e1322edd8f06f1d74035870b92ac719" diff --git a/.godot/imported/street_lamp_orm000.png-e3c56fbc46b5843f09049726edcfae44.ctex b/.godot/imported/street_lamp_orm000.png-e3c56fbc46b5843f09049726edcfae44.ctex deleted file mode 100644 index 2729092..0000000 Binary files a/.godot/imported/street_lamp_orm000.png-e3c56fbc46b5843f09049726edcfae44.ctex and /dev/null differ diff --git a/.godot/imported/street_lamp_orm000.png-e3c56fbc46b5843f09049726edcfae44.md5 b/.godot/imported/street_lamp_orm000.png-e3c56fbc46b5843f09049726edcfae44.md5 index b1e28ee..eceaff9 100644 --- a/.godot/imported/street_lamp_orm000.png-e3c56fbc46b5843f09049726edcfae44.md5 +++ b/.godot/imported/street_lamp_orm000.png-e3c56fbc46b5843f09049726edcfae44.md5 @@ -1,2 +1,2 @@ -source_md5="d937a77fa24bf411f131a60a092ff2b9" +source_md5="9065398b765504f90bbb924d68dff921" dest_md5="f5e37f7676f747e2be18f461271aadf5" diff --git a/.godot/imported/street_light.glb-b6541c84d48540666895ef5dfec26033.md5 b/.godot/imported/street_light.glb-b6541c84d48540666895ef5dfec26033.md5 index 0cda6f6..5c80d0a 100644 --- a/.godot/imported/street_light.glb-b6541c84d48540666895ef5dfec26033.md5 +++ b/.godot/imported/street_light.glb-b6541c84d48540666895ef5dfec26033.md5 @@ -1,2 +1,2 @@ source_md5="f4321beb2619fd04d2be98c5a3efabdc" -dest_md5="9be783fe75fca379e5bf2bb943d1dd0e" +dest_md5="8396e37a627a41a7cc6e2e365646ceaa" diff --git a/.godot/imported/street_light.glb-b6541c84d48540666895ef5dfec26033.scn b/.godot/imported/street_light.glb-b6541c84d48540666895ef5dfec26033.scn index 5c23782..f4a0074 100644 Binary files a/.godot/imported/street_light.glb-b6541c84d48540666895ef5dfec26033.scn and b/.godot/imported/street_light.glb-b6541c84d48540666895ef5dfec26033.scn differ diff --git a/.godot/imported/textures.png-e6f60238c9a2ffceda15d612ae0b92de.md5 b/.godot/imported/textures.png-e6f60238c9a2ffceda15d612ae0b92de.md5 index a96dd7f..83d4008 100644 --- a/.godot/imported/textures.png-e6f60238c9a2ffceda15d612ae0b92de.md5 +++ b/.godot/imported/textures.png-e6f60238c9a2ffceda15d612ae0b92de.md5 @@ -1,2 +1,2 @@ -source_md5="b35a3294fedce30c6866c8e3286bf4aa" +source_md5="e6887bc374c3d44bba55fb5d71217311" dest_md5="cb7af280eee8aa272b7a17a19c715cf2" diff --git a/.godot/imported/textures3.png-62f92289631ead3c2da66a728907770b.md5 b/.godot/imported/textures3.png-62f92289631ead3c2da66a728907770b.md5 index f2ecfc4..4e884e0 100644 --- a/.godot/imported/textures3.png-62f92289631ead3c2da66a728907770b.md5 +++ b/.godot/imported/textures3.png-62f92289631ead3c2da66a728907770b.md5 @@ -1,2 +1,2 @@ -source_md5="3ccc29c79fcc931f150b6703e71eb2d4" +source_md5="f6c0500ebef96ea107e624feb05dd360" dest_md5="ba92d0807083544d26b556a92a79db0c" diff --git a/.godot/imported/tire.obj-7a8b701f4a73a1a9df572484abe352e7.md5 b/.godot/imported/tire.obj-7a8b701f4a73a1a9df572484abe352e7.md5 index 07aceba..892202e 100644 --- a/.godot/imported/tire.obj-7a8b701f4a73a1a9df572484abe352e7.md5 +++ b/.godot/imported/tire.obj-7a8b701f4a73a1a9df572484abe352e7.md5 @@ -1,2 +1,2 @@ source_md5="c1516df08441ecf52ce7a521f79b0014" -dest_md5="e8110f26761f03322e2e5bd0f5395be2" +dest_md5="dd26c8607996b09245ef4d8665197f57" diff --git a/.godot/imported/tire.obj-7a8b701f4a73a1a9df572484abe352e7.mesh b/.godot/imported/tire.obj-7a8b701f4a73a1a9df572484abe352e7.mesh index c24b91a..af814b6 100644 Binary files a/.godot/imported/tire.obj-7a8b701f4a73a1a9df572484abe352e7.mesh and b/.godot/imported/tire.obj-7a8b701f4a73a1a9df572484abe352e7.mesh differ diff --git a/.godot/imported/tree.glb-86fae6fb2428df7d74097b1a7c75b288.md5 b/.godot/imported/tree.glb-86fae6fb2428df7d74097b1a7c75b288.md5 index 68c5f21..acd0a49 100644 --- a/.godot/imported/tree.glb-86fae6fb2428df7d74097b1a7c75b288.md5 +++ b/.godot/imported/tree.glb-86fae6fb2428df7d74097b1a7c75b288.md5 @@ -1,2 +1,2 @@ source_md5="a4c148dcac1393f31f0aca35e3497b59" -dest_md5="e130df7991ae2a15a5993328aa07905c" +dest_md5="7f4d154bc159b18daa099c60912afb02" diff --git a/.godot/imported/tree.glb-86fae6fb2428df7d74097b1a7c75b288.scn b/.godot/imported/tree.glb-86fae6fb2428df7d74097b1a7c75b288.scn index b1bb31c..eaed769 100644 Binary files a/.godot/imported/tree.glb-86fae6fb2428df7d74097b1a7c75b288.scn and b/.godot/imported/tree.glb-86fae6fb2428df7d74097b1a7c75b288.scn differ diff --git a/.godot/imported/tree.png-22f72eaa48eccf833487049e218e55c5.image b/.godot/imported/tree.png-22f72eaa48eccf833487049e218e55c5.image new file mode 100644 index 0000000..6763669 Binary files /dev/null and b/.godot/imported/tree.png-22f72eaa48eccf833487049e218e55c5.image differ diff --git a/.godot/imported/tree.png-22f72eaa48eccf833487049e218e55c5.md5 b/.godot/imported/tree.png-22f72eaa48eccf833487049e218e55c5.md5 index 89d5159..1dc616b 100644 --- a/.godot/imported/tree.png-22f72eaa48eccf833487049e218e55c5.md5 +++ b/.godot/imported/tree.png-22f72eaa48eccf833487049e218e55c5.md5 @@ -1,2 +1,2 @@ -source_md5="d847162fd55e54aa4554092859248543" +source_md5="c3ff3ed4f9f0f4048e2d8d40ba353c27" dest_md5="884903c2c361845106130eb93ddffdc8" diff --git a/.godot/imported/unfinished_atlas.png-65fa10125932f366012f0b8590a21c05.md5 b/.godot/imported/unfinished_atlas.png-65fa10125932f366012f0b8590a21c05.md5 index 75ab360..35c48fc 100644 --- a/.godot/imported/unfinished_atlas.png-65fa10125932f366012f0b8590a21c05.md5 +++ b/.godot/imported/unfinished_atlas.png-65fa10125932f366012f0b8590a21c05.md5 @@ -1,2 +1,2 @@ -source_md5="9081e540aea259f475c78eb6bef8f93e" +source_md5="2110ed95cdbaca82cc9015df934ee287" dest_md5="99bb1ed8837deba6b33fd5b313289e37" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index d2c8d34..c05084e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -32,8 +32,8 @@ repos: exclude: '^addons/gd-plug/' - repo: local hooks: - - id: lower-case-only - name: lower case only + - id: check-filenames-are-lowercase + name: check that filenames are lowercase entry: filenames must be lower-case or lower_case only language: fail files: '[^a-z0-9._/-]' @@ -41,7 +41,7 @@ repos: (?x)^( .godot/| .reuse/| - addons/| + addons/gd-plug/| CHANGELOG.md| CONTRIBUTING.md| CREDITS.md| @@ -51,8 +51,8 @@ repos: public/| README.md ) - - id: check-shaders - name: check shaders + - id: format-shaders + name: format shaders entry: clang-format args: - --style=llvm @@ -60,4 +60,4 @@ repos: - -i language: system files: \.gdshader$ - exclude: ^addons/ + exclude: ^addons/gd-plug/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 193dd10..d749bc1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,24 +10,36 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ### Security ### Dependencies +## [1.0.3] +### Added +### Changed +### Deprecated +### Removed +### Fixed +- Use an export plugin to setup build info ([#23](https://github.com/MechanicalFlower/HazyRoad/pull/23)) +- Export with text resources instead of binaries ([#23](https://github.com/MechanicalFlower/HazyRoad/pull/23)) +### Security +### Dependencies + ## [1.0.2] ### Added -- Add black vignette when approaching the dark road [#15](https://github.com/MechanicalFlower/HazyRoad/pull/15) +- Add black vignette when approaching the dark road ([#15](https://github.com/MechanicalFlower/HazyRoad/pull/15)) ### Fixed -- Correctly define path to control box switch mesh [#14](https://github.com/MechanicalFlower/HazyRoad/pull/14) +- Correctly define path to control box switch mesh ([#14](https://github.com/MechanicalFlower/HazyRoad/pull/14)) ## [1.0.1] ### Fixed -- Add the English translation [#13](https://github.com/MechanicalFlower/HazyRoad/pull/13) +- Add the English translation ([#13](https://github.com/MechanicalFlower/HazyRoad/pull/13)) ## [1.0.0] ### Changed -- Optimize images via ImgBot [#1](https://github.com/MechanicalFlower/HazyRoad/pull/1) -- Update sky shader to add clouds [#4](https://github.com/MechanicalFlower/HazyRoad/pull/4) +- Optimize images via ImgBot ([#1](https://github.com/MechanicalFlower/HazyRoad/pull/1)) +- Update sky shader to add clouds ([#4](https://github.com/MechanicalFlower/HazyRoad/pull/4)) ### Fixed -- Include `.godot` folder to fix the CI build step [#2](https://github.com/MechanicalFlower/HazyRoad/pull/2) +- Include `.godot` folder to fix the CI build step ([#2](https://github.com/MechanicalFlower/HazyRoad/pull/2)) -[Unreleased]: https://github.com/MechanicalFlower/HazyRoad/compare/1.0.2...HEAD +[Unreleased]: https://github.com/MechanicalFlower/HazyRoad/compare/1.0.3...HEAD +[1.0.3]: https://github.com/MechanicalFlower/HazyRoad/compare/1.0.2...1.0.3 [1.0.2]: https://github.com/MechanicalFlower/HazyRoad/compare/1.0.1...1.0.2 [1.0.1]: https://github.com/MechanicalFlower/HazyRoad/compare/1.0.0...1.0.1 [1.0.0]: https://github.com/MechanicalFlower/HazyRoad/commits/1.0.0 diff --git a/Justfile b/Justfile index f4548b9..89bfa4f 100644 --- a/Justfile +++ b/Justfile @@ -57,7 +57,6 @@ game_itchio_key := env_var_or_default('GAME_ITCHIO_KEY', "") # Build info datetime := `date '+%Y%m%d'` short_version := replace_regex(game_version, "([0-9]+).([0-9]+).[0-9]+", "$1.$2") -build_date := `date +'%Y/%m/%d'` commit_hash := `git log --pretty=format:"%H" -1` # Python virtualenv @@ -188,10 +187,6 @@ butler *ARGS: check-butler echo "Update version in the project.godot" sed -i "s,config/version=.*$,config/version=\"{{ game_version }}\",g" ./project.godot - echo "Create the override.cfg" - touch override.cfg - echo -e '[build_info]\npackage/version="{{ game_version }}"\npackage/build_date="{{ build_date }}"\nsource/commit="{{ commit_hash }}"' > override.cfg - [private] pre-export: clean-addons makedirs bump-version install-addons import-resources @@ -231,7 +226,7 @@ export: export-windows export-mac export-linux # Remove game plugins clean-addons: rm -rf .plugged - [ -f plug.gd ] && find addons/ -type d -not -name 'addons' -not -name 'gd-plug' -exec rm -rf {} \; || true + [ -f plug.gd ] && (cd addons/ && git clean -X -d) || true # Remove files created by Godot clean-resources: diff --git a/README.md b/README.md index 9558f13..ca2a8b5 100644 --- a/README.md +++ b/README.md @@ -13,13 +13,13 @@ A short puzzle game with a dark atmosphere, made with [Godot Engine](https://god -# About +## About Ever had one of those days where even getting home feels like a puzzle? Well, that's exactly what happens in __Hazy Road__. You're cruising home, and bam! A barrier shows up out of nowhere, blocking your way. So, you do what any sane person would do – step out of your car and figure out how to get the heck out of this crossroads mess. Explore and interact with object to figure out how to unblock your way at the crossroads. -## Controls +### Controls Keep it simple and straight: diff --git a/addons/export-build-info/build_info.gd b/addons/export-build-info/build_info.gd new file mode 100644 index 0000000..c4bc315 --- /dev/null +++ b/addons/export-build-info/build_info.gd @@ -0,0 +1,19 @@ +const BUILD_INFO_VERSION := "application/config/version" +const BUILD_INFO_COMMIT := "custom_options/build_info/commit" +const BUILD_INFO_DATE := "custom_options/build_info/date" + + +static func setup_build_info_settings(): + var output := [] + + # Commit Hash + OS.execute("git", ["log", '--pretty=format:"%H"', "-1"], output, false) + output[0] = output[0].trim_suffix("\n") + ProjectSettings.set_as_internal(BUILD_INFO_COMMIT, true) + ProjectSettings.set_setting(BUILD_INFO_COMMIT, output[0]) + + # Datetime + OS.execute("date", ["+%Y/%m/%d"], output, false) + output[1] = output[1].trim_suffix("\n") + ProjectSettings.set_as_internal(BUILD_INFO_DATE, true) + ProjectSettings.set_setting(BUILD_INFO_DATE, output[1]) diff --git a/addons/export-build-info/export_plugin.gd b/addons/export-build-info/export_plugin.gd new file mode 100644 index 0000000..a1db813 --- /dev/null +++ b/addons/export-build-info/export_plugin.gd @@ -0,0 +1,7 @@ +extends EditorExportPlugin + +const BuildInfo := preload("res://addons/export-build-info/build_info.gd") + + +func _export_begin(_features, _is_debug, _path, _flags) -> void: + BuildInfo.setup_build_info_settings() diff --git a/addons/export-build-info/label.gd b/addons/export-build-info/label.gd new file mode 100644 index 0000000..9048772 --- /dev/null +++ b/addons/export-build-info/label.gd @@ -0,0 +1,15 @@ +@tool +extends Label + +const BuildInfo := preload("res://addons/export-build-info/build_info.gd") + + +func _ready(): + var build_version = ProjectSettings.get_setting(BuildInfo.BUILD_INFO_VERSION) + var build_commit = ProjectSettings.get_setting(BuildInfo.BUILD_INFO_COMMIT) + var build_date = ProjectSettings.get_setting(BuildInfo.BUILD_INFO_DATE) + + if build_version and build_commit and build_date: + set_text("v%s @ %s\n%s" % [build_version, build_commit.left(7), build_date]) + else: + set_text("") diff --git a/addons/export-build-info/plugin.cfg b/addons/export-build-info/plugin.cfg new file mode 100644 index 0000000..c89fddd --- /dev/null +++ b/addons/export-build-info/plugin.cfg @@ -0,0 +1,7 @@ +[plugin] + +name="build_info" +description="" +author="florianvazelle" +version="0.0.0" +script="plugin.gd" diff --git a/addons/export-build-info/plugin.gd b/addons/export-build-info/plugin.gd new file mode 100644 index 0000000..3d3b081 --- /dev/null +++ b/addons/export-build-info/plugin.gd @@ -0,0 +1,17 @@ +@tool +extends EditorPlugin + +const BuildInfo := preload("res://addons/export-build-info/build_info.gd") + +var export_plugin := preload("res://addons/export-build-info/export_plugin.gd").new() + + +func _enter_tree(): + add_export_plugin(export_plugin) + + if Engine.is_editor_hint(): + BuildInfo.setup_build_info_settings() + + +func _exit_tree(): + remove_export_plugin(export_plugin) diff --git a/assets/models/car/car_blue.png b/assets/models/car/car_blue.png deleted file mode 100644 index 893a700..0000000 Binary files a/assets/models/car/car_blue.png and /dev/null differ diff --git a/assets/models/car/car_blue.png.import b/assets/models/car/car_blue.png.import deleted file mode 100644 index 7daae36..0000000 --- a/assets/models/car/car_blue.png.import +++ /dev/null @@ -1,35 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://y12agwabcn1" -path.s3tc="res://.godot/imported/car_blue.png-fc503ed168e8a9684888a89e961bc2ee.s3tc.ctex" -metadata={ -"imported_formats": ["s3tc_bptc"], -"vram_texture": true -} - -[deps] - -source_file="res://assets/models/car/car_blue.png" -dest_files=["res://.godot/imported/car_blue.png-fc503ed168e8a9684888a89e961bc2ee.s3tc.ctex"] - -[params] - -compress/mode=2 -compress/high_quality=false -compress/lossy_quality=0.7 -compress/hdr_compression=1 -compress/normal_map=0 -compress/channel_pack=0 -mipmaps/generate=true -mipmaps/limit=-1 -roughness/mode=0 -roughness/src_normal="" -process/fix_alpha_border=true -process/premult_alpha=false -process/normal_map_invert_y=false -process/hdr_as_srgb=false -process/hdr_clamp_exposure=false -process/size_limit=0 -detect_3d/compress_to=0 diff --git a/export_presets.cfg b/export_presets.cfg index 011106e..7d521f0 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -6,7 +6,7 @@ runnable=true dedicated_server=false custom_features="" export_filter="all_resources" -include_filter="override.cfg" +include_filter="" exclude_filter="" export_path="" encryption_include_filters="" @@ -35,8 +35,8 @@ application/modify_resources=true application/icon="" application/console_wrapper_icon="" application/icon_interpolation=4 -application/file_version="1.0.1.20240114" -application/product_version="1.0.1.20240114" +application/file_version="1.0.2.20240115" +application/product_version="1.0.2.20240115" application/company_name="Mechanical Flower" application/product_name="Marble" application/file_description="" @@ -70,7 +70,7 @@ runnable=true dedicated_server=false custom_features="" export_filter="all_resources" -include_filter="override.cfg" +include_filter="" exclude_filter="" export_path="" encryption_include_filters="" @@ -110,7 +110,7 @@ runnable=true dedicated_server=false custom_features="" export_filter="all_resources" -include_filter="override.cfg" +include_filter="" exclude_filter="" export_path="" encryption_include_filters="" @@ -131,7 +131,7 @@ application/bundle_identifier="io.itch.MechanicalFlower" application/signature="" application/app_category="Games" application/short_version="1.0" -application/version="1.0.1" +application/version="1.0.2" application/copyright="2023-present Mechanical Flower" application/copyright_localized={} application/min_macos_version="10.12" @@ -217,7 +217,7 @@ runnable=true dedicated_server=false custom_features="" export_filter="all_resources" -include_filter="override.cfg" +include_filter="" exclude_filter="" export_path="" encryption_include_filters="" diff --git a/plug.gd b/plug.gd index 92046ae..42100e1 100644 --- a/plug.gd +++ b/plug.gd @@ -4,21 +4,47 @@ extends "res://addons/gd-plug/plug.gd" func _plugging(): plug( "godot-extended-libraries/godot-debug-menu", - {"commit": "9d36ea23661d095198ff7fcfff2715172f73c983"} + {"commit": "9d36ea23661d095198ff7fcfff2715172f73c983", "renovate-branch": "master"} + ) + plug( + "night-glider/Dialogue-Label", + {"commit": "a211f35e4e4c255de1b640af14430ff675e31e5c", "renovate-branch": "main"} + ) + plug( + "KoBeWi/Godot-Universal-Fade", + {"commit": "f091514bba652880f81c5bc8809e0ee4498988ea", "renovate-branch": "master"} ) - plug("night-glider/Dialogue-Label", {"commit": "a211f35e4e4c255de1b640af14430ff675e31e5c"}) - plug("KoBeWi/Godot-Universal-Fade", {"commit": "f091514bba652880f81c5bc8809e0ee4498988ea"}) plug( "miskatonicstudio/goat", - {"commit": "b10f26a07b4ffb283a53632f31d529f38c688082", "include": ["addons/goat/images"]} + { + "commit": "b10f26a07b4ffb283a53632f31d529f38c688082", + "renovate-branch": "master", + "include": ["addons/goat/images"] + } + ) + plug( + "samclee/EZ-Sfx-and-Music", + {"commit": "ac2b77c0336ff6edf6b26aa9342628d2ad63f359", "renovate-branch": "main"} ) - plug("samclee/EZ-Sfx-and-Music", {"commit": "ac2b77c0336ff6edf6b26aa9342628d2ad63f359"}) plug( "HolonProduction/godot_kanban_tasks", - {"commit": "cfc914caa1dabd085024ff196bcb8578eaee1e67", "include": ["addons/kanban_tasks"]} + { + "commit": "cfc914caa1dabd085024ff196bcb8578eaee1e67", + "renovate-branch": "master", + "include": ["addons/kanban_tasks"] + } ) # Patched version - plug("florianvazelle/EasyMenus", {"commit": "4d960ef6ab9f51a206e2eb40c2cc0b8f8eced71a"}) - plug("florianvazelle/scatter", {"commit": "d1133ab81351907624a8eff48fc064a92ffeb316"}) - plug("florianvazelle/Log", {"commit": "51878aa55c4169f19b2c000f0e53b77439654829"}) + plug( + "florianvazelle/EasyMenus", + {"commit": "4d960ef6ab9f51a206e2eb40c2cc0b8f8eced71a", "renovate-branch": "master"} + ) + plug( + "florianvazelle/scatter", + {"commit": "d1133ab81351907624a8eff48fc064a92ffeb316", "renovate-branch": "v4"} + ) + plug( + "florianvazelle/Log", + {"commit": "51878aa55c4169f19b2c000f0e53b77439654829", "renovate-branch": "main"} + ) diff --git a/project.godot b/project.godot index b9ff697..d2975e1 100644 --- a/project.godot +++ b/project.godot @@ -19,7 +19,7 @@ logger/break_on_error=false config/name="Hazy Road" config/description="You're on your way home and come to a crossroads where a barrier is blocking your way. You decide to get out of your car to find a way through." -config/version="1.0.1" +config/version="1.0.2" run/main_scene="res://scenes/menu.tscn" config/features=PackedStringArray("4.2") @@ -40,9 +40,13 @@ Log="*res://addons/logger/logger.gd" window/size/viewport_width=960 window/size/viewport_height=720 +[editor] + +export/convert_text_resources_to_binary=false + [editor_plugins] -enabled=PackedStringArray("res://addons/debug_menu/plugin.cfg", "res://addons/dialogue_label/plugin.cfg", "res://addons/kanban_tasks/plugin.cfg", "res://addons/logger/plugin.cfg", "res://addons/proton_scatter/plugin.cfg") +enabled=PackedStringArray("res://addons/debug_menu/plugin.cfg", "res://addons/dialogue_label/plugin.cfg", "res://addons/export-build-info/plugin.cfg", "res://addons/kanban_tasks/plugin.cfg", "res://addons/logger/plugin.cfg") [filesystem] @@ -137,5 +141,15 @@ locale/translations=PackedStringArray("res://assets/i18n/locale.fr.translation", [rendering] +occlusion_culling/bvh_build_quality=0 +driver/threads/thread_model=0 +global_illumination/gi/use_half_resolution=true +camera/depth_of_field/depth_of_field_bokeh_shape=0 +environment/ssao/quality=0 +environment/ssil/quality=0 anti_aliasing/screen_space_roughness_limiter/enabled=false +environment/glow/upscale_mode=0 +environment/screen_space_reflection/roughness_quality=0 +environment/subsurface_scattering/subsurface_scattering_quality=0 +environment/volumetric_fog/use_filter=0 occlusion_culling/use_occlusion_culling=true diff --git a/resources/materials/psx_car.tres b/resources/materials/psx_car.tres index f7a3d55..5f9ea50 100644 --- a/resources/materials/psx_car.tres +++ b/resources/materials/psx_car.tres @@ -1,7 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=3 format=3 uid="uid://cisfqkqr8poc2"] [ext_resource type="Shader" path="res://shaders/psx_model.gdshader" id="1_kq6bn"] -[ext_resource type="Texture2D" uid="uid://c7kbo6eb05878" path="res://assets/models/car/car.png" id="1_xqt31"] +[ext_resource type="Texture2D" uid="uid://c7kbo6eb05878" path="res://assets/models/car/car.png" id="2_a7fp2"] [resource] render_priority = 0 @@ -10,4 +10,4 @@ shader_parameter/affine_mapping = false shader_parameter/alpha_scissor = 0.5 shader_parameter/jitter = 0.25 shader_parameter/resolution = Vector2i(320, 240) -shader_parameter/albedo = ExtResource("1_xqt31") +shader_parameter/albedo = ExtResource("2_a7fp2") diff --git a/resources/materials/psx_tree.tres b/resources/materials/psx_tree.tres index 00f512f..c681ca5 100644 --- a/resources/materials/psx_tree.tres +++ b/resources/materials/psx_tree.tres @@ -1,7 +1,7 @@ [gd_resource type="ShaderMaterial" load_steps=3 format=3 uid="uid://bbfbifstmtxwl"] [ext_resource type="Shader" path="res://shaders/psx_model.gdshader" id="1_e2pe1"] -[ext_resource type="Texture2D" uid="uid://dsu04ntogxnh4" path="res://assets/models/tree/tree.png" id="2_t6ccv"] +[ext_resource type="Texture2D" uid="uid://dsu04ntogxnh4" path="res://assets/models/tree/tree.png" id="2_e7ncu"] [resource] render_priority = 0 @@ -10,4 +10,4 @@ shader_parameter/affine_mapping = false shader_parameter/alpha_scissor = 0.5 shader_parameter/jitter = 0.5 shader_parameter/resolution = Vector2i(320, 240) -shader_parameter/albedo = ExtResource("2_t6ccv") +shader_parameter/albedo = ExtResource("2_e7ncu") diff --git a/resources/materials/tree.tres b/resources/materials/tree.tres deleted file mode 100644 index 3e66dd6..0000000 --- a/resources/materials/tree.tres +++ /dev/null @@ -1,13 +0,0 @@ -[gd_resource type="StandardMaterial3D" load_steps=2 format=3 uid="uid://b4jws8d16lgp7"] - -[ext_resource type="Texture2D" uid="uid://c2jki6cssv0m0" path="res://assets/textures/tree.png" id="1_37tfm"] - -[resource] -resource_name = "MaterialTree008" -transparency = 2 -alpha_scissor_threshold = 0.5 -alpha_antialiasing_mode = 0 -cull_mode = 2 -vertex_color_use_as_albedo = true -albedo_texture = ExtResource("1_37tfm") -roughness = 0.5 diff --git a/resources/vfog_env.tres b/resources/vfog_env.tres deleted file mode 100644 index fe0020d..0000000 --- a/resources/vfog_env.tres +++ /dev/null @@ -1,26 +0,0 @@ -[gd_resource type="Environment" load_steps=5 format=3 uid="uid://dbqh85yx1dxlo"] - -[ext_resource type="Shader" path="res://addons/gpsx/example/materials/shaders/misc/gpsx_sky.gdshader" id="1_any3l"] -[ext_resource type="Texture2D" uid="uid://dxmmrih8af3qb" path="res://assets/textures/nightsky.hdr" id="2_1grnd"] - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_o70s5"] -shader = ExtResource("1_any3l") -shader_parameter/mixer = Color(0.290196, 0.282353, 1, 1) -shader_parameter/tex = ExtResource("2_1grnd") -shader_parameter/dithering = true -shader_parameter/banding = true - -[sub_resource type="Sky" id="Sky_t5ash"] -sky_material = SubResource("ShaderMaterial_o70s5") - -[resource] -background_mode = 2 -sky = SubResource("Sky_t5ash") -ambient_light_color = Color(1, 1, 1, 1) -ambient_light_sky_contribution = 0.9 -tonemap_mode = 2 -glow_enabled = true -volumetric_fog_enabled = true -volumetric_fog_density = 0.15 -volumetric_fog_emission = Color(0.0338533, 0.0338533, 0.0338533, 1) -volumetric_fog_sky_affect = 0.3 diff --git a/scenes/item/accessory/mesh/tire.tscn b/scenes/item/accessory/mesh/tire.tscn index 79c8896..2a0908f 100644 --- a/scenes/item/accessory/mesh/tire.tscn +++ b/scenes/item/accessory/mesh/tire.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=4 format=3 uid="uid://c2vreol3ncw80"] -[ext_resource type="Texture2D" uid="uid://y12agwabcn1" path="res://assets/models/car/car_blue.png" id="1_rpwso"] +[ext_resource type="Texture2D" uid="uid://c7kbo6eb05878" path="res://assets/models/car/car.png" id="1_iakau"] [ext_resource type="ArrayMesh" uid="uid://dyr7hbelnx668" path="res://assets/models/car/tire.obj" id="2_ckhxb"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_uxodw"] -albedo_texture = ExtResource("1_rpwso") +albedo_texture = ExtResource("1_iakau") [node name="TireMesh" type="MeshInstance3D"] material_override = SubResource("StandardMaterial3D_uxodw") diff --git a/scenes/item/receptacle/car.tscn b/scenes/item/receptacle/car.tscn index b8517a2..d8a2fb5 100644 --- a/scenes/item/receptacle/car.tscn +++ b/scenes/item/receptacle/car.tscn @@ -8,7 +8,6 @@ data = PackedVector3Array(0.8963, 2.0896, -2.1098, 0, 2.0896, -2.1098, 1.0184, 1.3617, -2.6009, 1.0184, 1.3617, -2.6009, 0, 2.0896, -2.1098, 1.0521, 0.8405, -2.9525, 1.0521, 0.8405, -2.9525, 0, 2.0896, -2.1098, 0, 0.8405, -2.9525, 0.9151, 2.1353, -0.934, 0, 2.1353, -0.934, 0.8963, 2.0896, -2.1098, 0.9527, 2.0846, 0.8136, 0, 2.0846, 0.9575, 0.9151, 2.1353, -0.934, 1.1425, 1.3589, 1.4873, 0, 1.3589, 1.6313, 0.9527, 2.0846, 0.8136, 1.077, 1.2017, 2.9151, 0, 1.2006, 2.9807, 1.1425, 1.3589, 1.4873, 0, 1.3589, 1.6313, 1.1425, 1.3589, 1.4873, 0, 1.2006, 2.9807, 1.0521, 0.8405, -2.9525, 0, 0.8405, -2.9525, 0.9849, 0.3665, -2.7659, 0, 0.3665, -2.7659, 0.9849, 0.3665, -2.7659, 0, 0.8405, -2.9525, 0, 1.2006, 2.9807, 1.077, 1.2017, 2.9151, 0, 0.3834, 2.9086, 1.0146, 0.4448, 2.8113, 0, 0.3834, 2.9086, 1.077, 1.2017, 2.9151, 0.9527, 2.0846, 0.8136, 1.1425, 1.3698, 0.9451, 1.1425, 1.3589, 1.4873, 0.9527, 2.0846, 0.8136, 0.9151, 2.1353, -0.934, 1.1425, 1.3698, 0.9451, 0.8963, 2.0896, -2.1098, 1.0184, 1.3617, -2.6009, 1.0457, 1.3384, -2.1229, 1.1425, 1.3589, 1.4873, 1.1775, 0.9302, 2.008, 1.077, 1.2017, 2.9151, 1.152, 0.7268, 2.5988, 1.0146, 0.4448, 2.8113, 1.077, 1.2017, 2.9151, 0.9151, 2.1353, -0.934, 0.8963, 2.0896, -2.1098, 1.0917, 1.3685, -0.9474, 1.1425, 1.3589, 1.4873, 1.1425, 1.3698, 0.9451, 1.109, 0.2919, 1.5059, 0.9849, 0.3665, -2.7659, 1.0286, 0.3555, -2.1401, 1.0521, 0.8405, -2.9525, 1.0184, 1.3617, -2.6009, 1.0521, 0.8405, -2.9525, 1.0457, 1.3384, -2.1229, 0, 0.3834, 2.9086, 1.0146, 0.4448, 2.8113, 0, 0.3388, 2.8504, 1.1373, 0.4312, 1.6319, 1.2074, 0.7418, 1.7389, 1.1425, 1.3589, 1.4873, 1.1697, 0.9245, 2.3364, 1.152, 0.7268, 2.5988, 1.077, 1.2017, 2.9151, 1.072, 0.3286, -0.5997, 1.1057, 0.302, 0.9264, 1.0917, 1.3685, -0.9474, 0, 2.1353, -0.934, 0.9151, 2.1353, -0.934, 0, 2.0846, 0.9575, 0.5241, 0.3329, 1.6284, 0.425, 0.4119, 2.6482, 0.4826, 0.9238, 2.2899, 0.4756, 0.8166, -1.6357, 0.4936, 0.8109, -1.3073, 1.1418, 0.885, -1.668, 1.152, 0.7268, 2.5988, 1.1697, 0.9245, 2.3364, 0.4783, 0.7261, 2.5522, 1.2074, 0.7418, 1.7389, 1.1373, 0.4312, 1.6319, 0.5337, 0.7411, 1.6923, 0.4783, 0.7261, 2.5522, 0.4698, 0.5569, 2.6039, 1.152, 0.7268, 2.5988, 1.1085, 0.6966, -1.9371, 1.0286, 0.386, -2.0441, 0.4959, 0.6282, -1.9048, 1.1455, 0.6816, -1.0773, 1.1598, 0.8792, -1.3396, 0.543, 0.6132, -1.045, 1.0138, 0.3443, 2.6942, 0, 0.3388, 2.8504, 1.0146, 0.4448, 2.8113, 0.5609, 0.4305, 1.5854, 0.5337, 0.7411, 1.6923, 1.1373, 0.4312, 1.6319, 0.4936, 0.8109, -1.3073, 0.4756, 0.8166, -1.6357, 0.6048, 0.3779, -0.9531, 0.543, 0.6132, -1.045, 0.6048, 0.3779, -0.9531, 1.1455, 0.6816, -1.0773, 0.5038, 0.9295, 1.9614, 0.4997, 0.9248, 2.2317, 1.1775, 0.9302, 2.008, 0.5337, 0.7411, 1.6923, 0.5241, 0.3329, 1.6284, 0.4826, 0.9238, 2.2899, 0, 2.0846, 0.9575, 0.9527, 2.0846, 0.8136, 0, 1.3589, 1.6313, 1.0457, 1.3384, -2.1229, 1.0917, 1.3685, -0.9474, 0.8963, 2.0896, -2.1098, 1.1455, 0.6816, -1.0773, 1.0917, 1.3685, -0.9474, 1.1598, 0.8792, -1.3396, 0.4756, 0.8166, -1.6357, 0.5468, 0.4231, -2.0099, 0.6048, 0.3779, -0.9531, 0.5468, 0.4231, -2.0099, 0.4959, 0.6282, -1.9048, 1.0286, 0.386, -2.0441, 1.0138, 0.3443, 2.6942, 1.106, 0.4127, 2.6948, 0.4872, 0.3436, 2.6477, 1.0138, 0.3443, 2.6942, 1.0146, 0.4448, 2.8113, 1.106, 0.4127, 2.6948, 1.0917, 1.3685, -0.9474, 1.0457, 1.3384, -2.1229, 1.1598, 0.8792, -1.3396, 1.1775, 0.9302, 2.008, 1.1734, 0.9255, 2.2783, 1.077, 1.2017, 2.9151, 1.1734, 0.9255, 2.2783, 1.1775, 0.9302, 2.008, 0.4997, 0.9248, 2.2317, 1.1418, 0.885, -1.668, 1.0457, 1.3384, -2.1229, 1.1085, 0.6966, -1.9371, 1.1418, 0.885, -1.668, 1.1085, 0.6966, -1.9371, 0.4756, 0.8166, -1.6357, 1.069, 0.3354, -0.9873, 1.0917, 1.3685, -0.9474, 1.1455, 0.6816, -1.0773, 1.069, 0.3354, -0.9873, 1.1455, 0.6816, -1.0773, 0.6048, 0.3779, -0.9531, 0.4872, 0.3436, 2.6477, 0.425, 0.4119, 2.6482, 0.5241, 0.3329, 1.6284, 0.425, 0.4119, 2.6482, 0.4872, 0.3436, 2.6477, 1.106, 0.4127, 2.6948, 1.1373, 0.4312, 1.6319, 1.1025, 0.289, 1.6742, 0.5609, 0.4305, 1.5854, 1.109, 0.2919, 1.5059, 1.1373, 0.4312, 1.6319, 1.1425, 1.3589, 1.4873, 0.4783, 0.7261, 2.5522, 0.4826, 0.9238, 2.2899, 0.4698, 0.5569, 2.6039, 0.4826, 0.9238, 2.2899, 0.4783, 0.7261, 2.5522, 1.1697, 0.9245, 2.3364, 1.1269, 0.5576, 2.6505, 1.0146, 0.4448, 2.8113, 1.152, 0.7268, 2.5988, 1.1269, 0.5576, 2.6505, 1.152, 0.7268, 2.5988, 0.4698, 0.5569, 2.6039, 0.5337, 0.7411, 1.6923, 0.5038, 0.9295, 1.9614, 1.2074, 0.7418, 1.7389, 0.5038, 0.9295, 1.9614, 0.5337, 0.7411, 1.6923, 0.4997, 0.9248, 2.2317, 1.1598, 0.8792, -1.3396, 1.1418, 0.885, -1.668, 0.4936, 0.8109, -1.3073, 1.1598, 0.8792, -1.3396, 1.0457, 1.3384, -2.1229, 1.1418, 0.885, -1.668, 1.2074, 0.7418, 1.7389, 1.1775, 0.9302, 2.008, 1.1425, 1.3589, 1.4873, 1.1775, 0.9302, 2.008, 1.2074, 0.7418, 1.7389, 0.5038, 0.9295, 1.9614, 0.4959, 0.6282, -1.9048, 0.5468, 0.4231, -2.0099, 0.4756, 0.8166, -1.6357, 0.4959, 0.6282, -1.9048, 0.4756, 0.8166, -1.6357, 1.1085, 0.6966, -1.9371, 0.543, 0.6132, -1.045, 0.4936, 0.8109, -1.3073, 0.6048, 0.3779, -0.9531, 0.4936, 0.8109, -1.3073, 0.543, 0.6132, -1.045, 1.1598, 0.8792, -1.3396, 0, 2.0896, -2.1098, 0.8963, 2.0896, -2.1098, 0, 2.1353, -0.934, 1.0917, 1.3685, -0.9474, 1.1425, 1.3698, 0.9451, 0.9151, 2.1353, -0.934, 1.1425, 1.3698, 0.9451, 1.0917, 1.3685, -0.9474, 1.1057, 0.302, 0.9264, 0.5241, 0.3329, 1.6284, 0.5609, 0.4305, 1.5854, 1.1025, 0.289, 1.6742, 0.5609, 0.4305, 1.5854, 0.5241, 0.3329, 1.6284, 0.5337, 0.7411, 1.6923, 1.1025, 0.289, 1.6742, 1.1373, 0.4312, 1.6319, 1.109, 0.2919, 1.5059, 1.0286, 0.3555, -2.1401, 1.0286, 0.386, -2.0441, 1.1085, 0.6966, -1.9371, 1.0286, 0.386, -2.0441, 1.0286, 0.3537, -2.0342, 0.5468, 0.4231, -2.0099, 1.0286, 0.3537, -2.0342, 1.0286, 0.386, -2.0441, 1.0286, 0.3555, -2.1401, 0.4698, 0.5569, 2.6039, 0.425, 0.4119, 2.6482, 1.1269, 0.5576, 2.6505, 0.4826, 0.9238, 2.2899, 0.425, 0.4119, 2.6482, 0.4698, 0.5569, 2.6039, 1.106, 0.4127, 2.6948, 1.1269, 0.5576, 2.6505, 0.425, 0.4119, 2.6482, 1.106, 0.4127, 2.6948, 1.0146, 0.4448, 2.8113, 1.1269, 0.5576, 2.6505, 0.5564, 0.3908, -2.0001, 0.5468, 0.4231, -2.0099, 1.0286, 0.3537, -2.0342, 0.6048, 0.3779, -0.9531, 0.5468, 0.4231, -2.0099, 0.5564, 0.3908, -2.0001, 1.1057, 0.302, 0.9264, 1.109, 0.2919, 1.5059, 1.1425, 1.3698, 0.9451, 0.4997, 0.9248, 2.2317, 0.5337, 0.7411, 1.6923, 0.4826, 0.9238, 2.2899, 0.4997, 0.9248, 2.2317, 0.4826, 0.9238, 2.2899, 1.1734, 0.9255, 2.2783, 1.1734, 0.9255, 2.2783, 1.1697, 0.9245, 2.3364, 1.077, 1.2017, 2.9151, 1.1697, 0.9245, 2.3364, 1.1734, 0.9255, 2.2783, 0.4826, 0.9238, 2.2899, 1.072, 0.3286, -0.5997, 1.0917, 1.3685, -0.9474, 1.069, 0.3354, -0.9873, 1.0521, 0.8405, -2.9525, 1.1085, 0.6966, -1.9371, 1.0457, 1.3384, -2.1229, 1.0286, 0.3555, -2.1401, 1.1085, 0.6966, -1.9371, 1.0521, 0.8405, -2.9525, -1.0184, 1.3617, -2.6009, 0, 2.0896, -2.1098, -0.8963, 2.0896, -2.1098, -1.0521, 0.8405, -2.9525, 0, 2.0896, -2.1098, -1.0184, 1.3617, -2.6009, 0, 0.8405, -2.9525, 0, 2.0896, -2.1098, -1.0521, 0.8405, -2.9525, -0.8963, 2.0896, -2.1098, 0, 2.1353, -0.934, -0.9151, 2.1353, -0.934, -0.9151, 2.1353, -0.934, 0, 2.0846, 0.9575, -0.9527, 2.0846, 0.8136, -0.9527, 2.0846, 0.8136, 0, 1.3589, 1.6313, -1.1425, 1.3589, 1.4873, -1.1425, 1.3589, 1.4873, 0, 1.2006, 2.9807, -1.077, 1.2017, 2.9151, 0, 1.2006, 2.9807, -1.1425, 1.3589, 1.4873, 0, 1.3589, 1.6313, -0.9849, 0.3665, -2.7659, 0, 0.8405, -2.9525, -1.0521, 0.8405, -2.9525, 0, 0.8405, -2.9525, -0.9849, 0.3665, -2.7659, 0, 0.3665, -2.7659, 0, 0.3834, 2.9086, -1.077, 1.2017, 2.9151, 0, 1.2006, 2.9807, -1.077, 1.2017, 2.9151, 0, 0.3834, 2.9086, -1.0146, 0.4448, 2.8113, -1.1425, 1.3589, 1.4873, -1.1425, 1.3698, 0.9451, -0.9527, 2.0846, 0.8136, -1.1425, 1.3698, 0.9451, -0.9151, 2.1353, -0.934, -0.9527, 2.0846, 0.8136, -1.0457, 1.3384, -2.1229, -1.0184, 1.3617, -2.6009, -0.8963, 2.0896, -2.1098, -1.077, 1.2017, 2.9151, -1.1775, 0.9302, 2.008, -1.1425, 1.3589, 1.4873, -1.077, 1.2017, 2.9151, -1.0146, 0.4448, 2.8113, -1.152, 0.7268, 2.5988, -1.0917, 1.3685, -0.9474, -0.8963, 2.0896, -2.1098, -0.9151, 2.1353, -0.934, -1.109, 0.2919, 1.5059, -1.1425, 1.3698, 0.9451, -1.1425, 1.3589, 1.4873, -1.0521, 0.8405, -2.9525, -1.0286, 0.3555, -2.1401, -0.9849, 0.3665, -2.7659, -1.0457, 1.3384, -2.1229, -1.0521, 0.8405, -2.9525, -1.0184, 1.3617, -2.6009, 0, 0.3388, 2.8504, -1.0146, 0.4448, 2.8113, 0, 0.3834, 2.9086, -1.1425, 1.3589, 1.4873, -1.2074, 0.7418, 1.7389, -1.1373, 0.4312, 1.6319, -1.077, 1.2017, 2.9151, -1.152, 0.7268, 2.5988, -1.1697, 0.9245, 2.3364, -1.0917, 1.3685, -0.9474, -1.1057, 0.302, 0.9264, -1.072, 0.3286, -0.5997, 0, 2.0846, 0.9575, -0.9151, 2.1353, -0.934, 0, 2.1353, -0.934, -0.4826, 0.9238, 2.2899, -0.425, 0.4119, 2.6482, -0.5241, 0.3329, 1.6284, -1.1418, 0.885, -1.668, -0.4936, 0.8109, -1.3073, -0.4756, 0.8166, -1.6357, -0.4783, 0.7261, 2.5522, -1.1697, 0.9245, 2.3364, -1.152, 0.7268, 2.5988, -0.5337, 0.7411, 1.6923, -1.1373, 0.4312, 1.6319, -1.2074, 0.7418, 1.7389, -1.152, 0.7268, 2.5988, -0.4698, 0.5569, 2.6039, -0.4783, 0.7261, 2.5522, -0.4959, 0.6282, -1.9048, -1.0286, 0.386, -2.0441, -1.1085, 0.6966, -1.9371, -0.543, 0.6132, -1.045, -1.1598, 0.8792, -1.3396, -1.1455, 0.6816, -1.0773, -1.0146, 0.4448, 2.8113, 0, 0.3388, 2.8504, -1.0138, 0.3443, 2.6942, -1.1373, 0.4312, 1.6319, -0.5337, 0.7411, 1.6923, -0.5609, 0.4305, 1.5854, -0.6048, 0.3779, -0.9531, -0.4756, 0.8166, -1.6357, -0.4936, 0.8109, -1.3073, -1.1455, 0.6816, -1.0773, -0.6048, 0.3779, -0.9531, -0.543, 0.6132, -1.045, -1.1775, 0.9302, 2.008, -0.4997, 0.9248, 2.2317, -0.5038, 0.9295, 1.9614, -0.4826, 0.9238, 2.2899, -0.5241, 0.3329, 1.6284, -0.5337, 0.7411, 1.6923, 0, 1.3589, 1.6313, -0.9527, 2.0846, 0.8136, 0, 2.0846, 0.9575, -0.8963, 2.0896, -2.1098, -1.0917, 1.3685, -0.9474, -1.0457, 1.3384, -2.1229, -1.1598, 0.8792, -1.3396, -1.0917, 1.3685, -0.9474, -1.1455, 0.6816, -1.0773, -0.6048, 0.3779, -0.9531, -0.5468, 0.4231, -2.0099, -0.4756, 0.8166, -1.6357, -1.0286, 0.386, -2.0441, -0.4959, 0.6282, -1.9048, -0.5468, 0.4231, -2.0099, -0.4872, 0.3436, 2.6477, -1.106, 0.4127, 2.6948, -1.0138, 0.3443, 2.6942, -1.106, 0.4127, 2.6948, -1.0146, 0.4448, 2.8113, -1.0138, 0.3443, 2.6942, -1.1598, 0.8792, -1.3396, -1.0457, 1.3384, -2.1229, -1.0917, 1.3685, -0.9474, -1.077, 1.2017, 2.9151, -1.1734, 0.9255, 2.2783, -1.1775, 0.9302, 2.008, -0.4997, 0.9248, 2.2317, -1.1775, 0.9302, 2.008, -1.1734, 0.9255, 2.2783, -1.1085, 0.6966, -1.9371, -1.0457, 1.3384, -2.1229, -1.1418, 0.885, -1.668, -0.4756, 0.8166, -1.6357, -1.1085, 0.6966, -1.9371, -1.1418, 0.885, -1.668, -1.1455, 0.6816, -1.0773, -1.0917, 1.3685, -0.9474, -1.069, 0.3354, -0.9873, -0.6048, 0.3779, -0.9531, -1.1455, 0.6816, -1.0773, -1.069, 0.3354, -0.9873, -0.5241, 0.3329, 1.6284, -0.425, 0.4119, 2.6482, -0.4872, 0.3436, 2.6477, -1.106, 0.4127, 2.6948, -0.4872, 0.3436, 2.6477, -0.425, 0.4119, 2.6482, -0.5609, 0.4305, 1.5854, -1.1025, 0.289, 1.6742, -1.1373, 0.4312, 1.6319, -1.1425, 1.3589, 1.4873, -1.1373, 0.4312, 1.6319, -1.109, 0.2919, 1.5059, -0.4698, 0.5569, 2.6039, -0.4826, 0.9238, 2.2899, -0.4783, 0.7261, 2.5522, -1.1697, 0.9245, 2.3364, -0.4783, 0.7261, 2.5522, -0.4826, 0.9238, 2.2899, -1.152, 0.7268, 2.5988, -1.0146, 0.4448, 2.8113, -1.1269, 0.5576, 2.6505, -0.4698, 0.5569, 2.6039, -1.152, 0.7268, 2.5988, -1.1269, 0.5576, 2.6505, -1.2074, 0.7418, 1.7389, -0.5038, 0.9295, 1.9614, -0.5337, 0.7411, 1.6923, -0.4997, 0.9248, 2.2317, -0.5337, 0.7411, 1.6923, -0.5038, 0.9295, 1.9614, -0.4936, 0.8109, -1.3073, -1.1418, 0.885, -1.668, -1.1598, 0.8792, -1.3396, -1.1418, 0.885, -1.668, -1.0457, 1.3384, -2.1229, -1.1598, 0.8792, -1.3396, -1.1425, 1.3589, 1.4873, -1.1775, 0.9302, 2.008, -1.2074, 0.7418, 1.7389, -0.5038, 0.9295, 1.9614, -1.2074, 0.7418, 1.7389, -1.1775, 0.9302, 2.008, -0.4756, 0.8166, -1.6357, -0.5468, 0.4231, -2.0099, -0.4959, 0.6282, -1.9048, -1.1085, 0.6966, -1.9371, -0.4756, 0.8166, -1.6357, -0.4959, 0.6282, -1.9048, -0.6048, 0.3779, -0.9531, -0.4936, 0.8109, -1.3073, -0.543, 0.6132, -1.045, -1.1598, 0.8792, -1.3396, -0.543, 0.6132, -1.045, -0.4936, 0.8109, -1.3073, 0, 2.1353, -0.934, -0.8963, 2.0896, -2.1098, 0, 2.0896, -2.1098, -0.9151, 2.1353, -0.934, -1.1425, 1.3698, 0.9451, -1.0917, 1.3685, -0.9474, -1.1057, 0.302, 0.9264, -1.0917, 1.3685, -0.9474, -1.1425, 1.3698, 0.9451, -1.1025, 0.289, 1.6742, -0.5609, 0.4305, 1.5854, -0.5241, 0.3329, 1.6284, -0.5337, 0.7411, 1.6923, -0.5241, 0.3329, 1.6284, -0.5609, 0.4305, 1.5854, -1.109, 0.2919, 1.5059, -1.1373, 0.4312, 1.6319, -1.1025, 0.289, 1.6742, -1.1085, 0.6966, -1.9371, -1.0286, 0.386, -2.0441, -1.0286, 0.3555, -2.1401, -0.5468, 0.4231, -2.0099, -1.0286, 0.3537, -2.0342, -1.0286, 0.386, -2.0441, -1.0286, 0.3555, -2.1401, -1.0286, 0.386, -2.0441, -1.0286, 0.3537, -2.0342, -1.1269, 0.5576, 2.6505, -0.425, 0.4119, 2.6482, -0.4698, 0.5569, 2.6039, -0.4698, 0.5569, 2.6039, -0.425, 0.4119, 2.6482, -0.4826, 0.9238, 2.2899, -0.425, 0.4119, 2.6482, -1.1269, 0.5576, 2.6505, -1.106, 0.4127, 2.6948, -1.1269, 0.5576, 2.6505, -1.0146, 0.4448, 2.8113, -1.106, 0.4127, 2.6948, -1.0286, 0.3537, -2.0342, -0.5468, 0.4231, -2.0099, -0.5564, 0.3908, -2.0001, -0.5564, 0.3908, -2.0001, -0.5468, 0.4231, -2.0099, -0.6048, 0.3779, -0.9531, -1.1425, 1.3698, 0.9451, -1.109, 0.2919, 1.5059, -1.1057, 0.302, 0.9264, -0.4826, 0.9238, 2.2899, -0.5337, 0.7411, 1.6923, -0.4997, 0.9248, 2.2317, -1.1734, 0.9255, 2.2783, -0.4826, 0.9238, 2.2899, -0.4997, 0.9248, 2.2317, -1.077, 1.2017, 2.9151, -1.1697, 0.9245, 2.3364, -1.1734, 0.9255, 2.2783, -0.4826, 0.9238, 2.2899, -1.1734, 0.9255, 2.2783, -1.1697, 0.9245, 2.3364, -1.069, 0.3354, -0.9873, -1.0917, 1.3685, -0.9474, -1.072, 0.3286, -0.5997, -1.0457, 1.3384, -2.1229, -1.1085, 0.6966, -1.9371, -1.0521, 0.8405, -2.9525, -1.0521, 0.8405, -2.9525, -1.1085, 0.6966, -1.9371, -1.0286, 0.3555, -2.1401, -1.0316, 0.6021, 2.955, -1.0316, 0.4621, 2.955, -1.1284, 0.6021, 2.815, -1.1284, 0.6021, 2.815, -1.0316, 0.4621, 2.955, -1.1284, 0.4621, 2.815, 1.1284, 0.4621, 2.815, 1.0316, 0.4621, 2.955, 1.1284, 0.6021, 2.815, 1.1284, 0.6021, 2.815, 1.0316, 0.4621, 2.955, 1.0316, 0.6021, 2.955, -1.1284, 0.4621, 2.815, -1.0316, 0.4621, 2.955, 0, 0.4621, 2.8902, 0, 0.4621, 2.8902, -1.0316, 0.4621, 2.955, 0, 0.4621, 3.0302, 0, 0.4621, 2.8902, 0, 0.4621, 3.0302, 1.1284, 0.4621, 2.815, 1.1284, 0.4621, 2.815, 0, 0.4621, 3.0302, 1.0316, 0.4621, 2.955, -1.1284, 0.6021, 2.815, -1.1284, 0.4621, 2.815, 0, 0.6021, 2.8902, 0, 0.6021, 2.8902, -1.1284, 0.4621, 2.815, 0, 0.4621, 2.8902, 0, 0.6021, 2.8902, 0, 0.4621, 2.8902, 1.1284, 0.6021, 2.815, 1.1284, 0.6021, 2.815, 0, 0.4621, 2.8902, 1.1284, 0.4621, 2.815, -1.0316, 0.6021, 2.955, -1.1284, 0.6021, 2.815, 0, 0.6021, 3.0302, 0, 0.6021, 3.0302, -1.1284, 0.6021, 2.815, 0, 0.6021, 2.8902, 0, 0.6021, 3.0302, 0, 0.6021, 2.8902, 1.0316, 0.6021, 2.955, 1.0316, 0.6021, 2.955, 0, 0.6021, 2.8902, 1.1284, 0.6021, 2.815, -1.0316, 0.4621, 2.955, -1.0316, 0.6021, 2.955, 0, 0.4621, 3.0302, 0, 0.4621, 3.0302, -1.0316, 0.6021, 2.955, 0, 0.6021, 3.0302, 0, 0.4621, 3.0302, 0, 0.6021, 3.0302, 1.0316, 0.4621, 2.955, 1.0316, 0.4621, 2.955, 0, 0.6021, 3.0302, 1.0316, 0.6021, 2.955, -1.0882, 0.6254, -2.863, -1.0882, 0.4854, -2.8045, -1.0318, 0.6254, -3.003, -1.0318, 0.6254, -3.003, -1.0882, 0.4854, -2.8045, -1.0318, 0.4854, -2.9445, 1.0318, 0.4854, -2.9445, 1.0882, 0.4854, -2.8045, 1.0318, 0.6254, -3.003, 1.0318, 0.6254, -3.003, 1.0882, 0.4854, -2.8045, 1.0882, 0.6254, -2.863, -1.0318, 0.4854, -2.9445, -1.0882, 0.4854, -2.8045, 1.0318, 0.4854, -2.9445, 1.0318, 0.4854, -2.9445, -1.0882, 0.4854, -2.8045, 1.0882, 0.4854, -2.8045, -1.0318, 0.6254, -3.003, -1.0318, 0.4854, -2.9445, 1.0318, 0.6254, -3.003, 1.0318, 0.6254, -3.003, -1.0318, 0.4854, -2.9445, 1.0318, 0.4854, -2.9445, -1.0882, 0.6254, -2.863, -1.0318, 0.6254, -3.003, 1.0882, 0.6254, -2.863, 1.0882, 0.6254, -2.863, -1.0318, 0.6254, -3.003, 1.0318, 0.6254, -3.003, -1.0882, 0.4854, -2.8045, -1.0882, 0.6254, -2.863, 1.0882, 0.4854, -2.8045, 1.0882, 0.4854, -2.8045, -1.0882, 0.6254, -2.863, 1.0882, 0.6254, -2.863, 1.0286, 0.3537, -2.0342, 1.0286, 0.3555, -2.1401, 0.5564, 0.3908, -2.0001, 0.5564, 0.3908, -2.0001, 1.0286, 0.3555, -2.1401, 0, 0.3665, -2.7659, 0.5564, 0.3908, -2.0001, 0, 0.3665, -2.7659, 0.6048, 0.3779, -0.9531, 0.6048, 0.3779, -0.9531, 0, 0.3665, -2.7659, 0.5241, 0.3329, 1.6284, 0.5241, 0.3329, 1.6284, 1.109, 0.2919, 1.5059, 0.6048, 0.3779, -0.9531, 0.6048, 0.3779, -0.9531, 1.109, 0.2919, 1.5059, 1.072, 0.3286, -0.5997, 1.069, 0.3354, -0.9873, 0.6048, 0.3779, -0.9531, 1.072, 0.3286, -0.5997, 1.1057, 0.302, 0.9264, 1.072, 0.3286, -0.5997, 1.109, 0.2919, 1.5059, 1.1025, 0.289, 1.6742, 1.109, 0.2919, 1.5059, 0.5241, 0.3329, 1.6284, 0, 0.3665, -2.7659, -0.6048, 0.3779, -0.9531, 0.5241, 0.3329, 1.6284, 0.5241, 0.3329, 1.6284, -0.6048, 0.3779, -0.9531, -0.5241, 0.3329, 1.6284, -0.5241, 0.3329, 1.6284, 0, 0.3388, 2.8504, 0.5241, 0.3329, 1.6284, 0.5241, 0.3329, 1.6284, 0, 0.3388, 2.8504, 0.4872, 0.3436, 2.6477, 1.0138, 0.3443, 2.6942, 0.4872, 0.3436, 2.6477, 0, 0.3388, 2.8504, -0.5241, 0.3329, 1.6284, -0.4872, 0.3436, 2.6477, 0, 0.3388, 2.8504, 0, 0.3388, 2.8504, -0.4872, 0.3436, 2.6477, -1.0138, 0.3443, 2.6942, -0.6048, 0.3779, -0.9531, -1.072, 0.3286, -0.5997, -0.5241, 0.3329, 1.6284, -0.5241, 0.3329, 1.6284, -1.072, 0.3286, -0.5997, -1.109, 0.2919, 1.5059, -1.1025, 0.289, 1.6742, -0.5241, 0.3329, 1.6284, -1.109, 0.2919, 1.5059, -1.1057, 0.302, 0.9264, -1.109, 0.2919, 1.5059, -1.072, 0.3286, -0.5997, -1.069, 0.3354, -0.9873, -1.072, 0.3286, -0.5997, -0.6048, 0.3779, -0.9531, -0.6048, 0.3779, -0.9531, 0, 0.3665, -2.7659, -0.5564, 0.3908, -2.0001, -0.5564, 0.3908, -2.0001, 0, 0.3665, -2.7659, -1.0286, 0.3555, -2.1401, -1.0286, 0.3537, -2.0342, -0.5564, 0.3908, -2.0001, -1.0286, 0.3555, -2.1401, -0.9849, 0.3665, -2.7659, -1.0286, 0.3555, -2.1401, 0, 0.3665, -2.7659, 1.0286, 0.3555, -2.1401, 0.9849, 0.3665, -2.7659, 0, 0.3665, -2.7659, 1.324, 1.3608, 1.4141, 1.3506, 1.4604, 1.4066, 1.3189, 1.3608, 1.3976, 1.3189, 1.3608, 1.3976, 1.3506, 1.4604, 1.4066, 1.3456, 1.4604, 1.3901, 1.2245, 1.3341, 1.442, 1.324, 1.3608, 1.4141, 1.2195, 1.3341, 1.4256, 1.2195, 1.3341, 1.4256, 1.324, 1.3608, 1.4141, 1.3189, 1.3608, 1.3976, 1.1517, 1.407, 1.4625, 1.2245, 1.3341, 1.442, 1.1467, 1.407, 1.446, 1.1467, 1.407, 1.446, 1.2245, 1.3341, 1.442, 1.2195, 1.3341, 1.4256, 1.1784, 1.5067, 1.455, 1.1517, 1.407, 1.4625, 1.1734, 1.5067, 1.4385, 1.1734, 1.5067, 1.4385, 1.1517, 1.407, 1.4625, 1.1467, 1.407, 1.446, 1.2778, 1.5333, 1.4271, 1.1784, 1.5067, 1.455, 1.2728, 1.5333, 1.4106, 1.2728, 1.5333, 1.4106, 1.1784, 1.5067, 1.455, 1.1734, 1.5067, 1.4385, 1.3506, 1.4604, 1.4066, 1.2778, 1.5333, 1.4271, 1.3456, 1.4604, 1.3901, 1.3456, 1.4604, 1.3901, 1.2778, 1.5333, 1.4271, 1.2728, 1.5333, 1.4106, 1.1517, 1.407, 1.4625, 1.1784, 1.5067, 1.455, 1.2245, 1.3341, 1.442, 1.2245, 1.3341, 1.442, 1.1784, 1.5067, 1.455, 1.3506, 1.4604, 1.4066, 1.324, 1.3608, 1.4141, 1.2245, 1.3341, 1.442, 1.3506, 1.4604, 1.4066, 1.1784, 1.5067, 1.455, 1.2778, 1.5333, 1.4271, 1.3506, 1.4604, 1.4066, 1.2195, 1.3341, 1.4256, 1.3189, 1.3608, 1.3976, 1.1467, 1.407, 1.446, 1.1467, 1.407, 1.446, 1.3189, 1.3608, 1.3976, 1.2728, 1.5333, 1.4106, 1.1734, 1.5067, 1.4385, 1.1467, 1.407, 1.446, 1.2728, 1.5333, 1.4106, 1.3189, 1.3608, 1.3976, 1.3456, 1.4604, 1.3901, 1.2728, 1.5333, 1.4106, 1.2252, 1.4405, 1.4343, 1.1353, 1.3523, 1.5533, 1.2596, 1.4074, 1.4343, 1.2596, 1.4074, 1.4343, 1.1353, 1.3523, 1.5533, 1.1442, 1.2973, 1.5533, 1.1442, 1.2973, 1.5743, 1.1353, 1.3523, 1.5743, 1.2596, 1.4074, 1.4343, 1.2596, 1.4074, 1.4343, 1.1353, 1.3523, 1.5743, 1.2252, 1.4405, 1.4343, 1.2596, 1.4074, 1.4343, 1.1442, 1.2973, 1.5533, 1.1442, 1.2973, 1.5743, 1.1353, 1.3523, 1.5743, 1.1353, 1.3523, 1.5533, 1.2252, 1.4405, 1.4343, 0.8591, 0.7409, 2.4829, 0.8591, 0.878, 2.1598, 1.1327, 0.7409, 2.4829, 1.1327, 0.7409, 2.4829, 0.8591, 0.878, 2.1598, 1.1327, 0.878, 2.1598, 0.8591, 0.4154, 2.6144, 0.8591, 0.7409, 2.4829, 1.1327, 0.4154, 2.6144, 1.1327, 0.4154, 2.6144, 0.8591, 0.7409, 2.4829, 1.1327, 0.7409, 2.4829, 0.8591, 0.0924, 2.4772, 0.8591, 0.4154, 2.6144, 1.1327, 0.0924, 2.4772, 1.1327, 0.0924, 2.4772, 0.8591, 0.4154, 2.6144, 1.1327, 0.4154, 2.6144, 0.8591, -0.0391, 2.1518, 0.8591, 0.0924, 2.4772, 1.1327, -0.0391, 2.1518, 1.1327, -0.0391, 2.1518, 0.8591, 0.0924, 2.4772, 1.1327, 0.0924, 2.4772, 0.8591, 0.098, 1.8287, 0.8591, -0.0391, 2.1518, 1.1327, 0.098, 1.8287, 1.1327, 0.098, 1.8287, 0.8591, -0.0391, 2.1518, 1.1327, -0.0391, 2.1518, 0.8591, 0.4235, 1.6972, 0.8591, 0.098, 1.8287, 1.1327, 0.4235, 1.6972, 1.1327, 0.4235, 1.6972, 0.8591, 0.098, 1.8287, 1.1327, 0.098, 1.8287, 0.8591, 0.7465, 1.8343, 0.8591, 0.4235, 1.6972, 1.1327, 0.7465, 1.8343, 1.1327, 0.7465, 1.8343, 0.8591, 0.4235, 1.6972, 1.1327, 0.4235, 1.6972, 0.8591, 0.878, 2.1598, 0.8591, 0.7465, 1.8343, 1.1327, 0.878, 2.1598, 1.1327, 0.878, 2.1598, 0.8591, 0.7465, 1.8343, 1.1327, 0.7465, 1.8343, 0.8591, 0.098, 1.8287, 0.8591, 0.4235, 1.6972, 0.8591, -0.0391, 2.1518, 0.8591, -0.0391, 2.1518, 0.8591, 0.4235, 1.6972, 0.8591, 0.878, 2.1598, 0.8591, 0.878, 2.1598, 0.8591, 0.4154, 2.6144, 0.8591, -0.0391, 2.1518, 0.8591, -0.0391, 2.1518, 0.8591, 0.4154, 2.6144, 0.8591, 0.0924, 2.4772, 0.8591, 0.7409, 2.4829, 0.8591, 0.4154, 2.6144, 0.8591, 0.878, 2.1598, 0.8591, 0.4235, 1.6972, 0.8591, 0.7465, 1.8343, 0.8591, 0.878, 2.1598, 1.1327, 0.4154, 2.6144, 1.1327, 0.7409, 2.4829, 1.1327, 0.0924, 2.4772, 1.1327, 0.0924, 2.4772, 1.1327, 0.7409, 2.4829, 1.1327, 0.7465, 1.8343, 1.1327, 0.7465, 1.8343, 1.1327, 0.098, 1.8287, 1.1327, 0.0924, 2.4772, 1.1327, 0.0924, 2.4772, 1.1327, 0.098, 1.8287, 1.1327, -0.0391, 2.1518, 1.1327, 0.4235, 1.6972, 1.1327, 0.098, 1.8287, 1.1327, 0.7465, 1.8343, 1.1327, 0.7409, 2.4829, 1.1327, 0.878, 2.1598, 1.1327, 0.7465, 1.8343, 0.8591, 0.4235, -1.0518, 0.8591, 0.7465, -1.1889, 1.1327, 0.4235, -1.0518, 1.1327, 0.4235, -1.0518, 0.8591, 0.7465, -1.1889, 1.1327, 0.7465, -1.1889, 0.8591, 0.098, -1.1833, 0.8591, 0.4235, -1.0518, 1.1327, 0.098, -1.1833, 1.1327, 0.098, -1.1833, 0.8591, 0.4235, -1.0518, 1.1327, 0.4235, -1.0518, 0.8591, -0.0391, -1.5064, 0.8591, 0.098, -1.1833, 1.1327, -0.0391, -1.5064, 1.1327, -0.0391, -1.5064, 0.8591, 0.098, -1.1833, 1.1327, 0.098, -1.1833, 0.8591, 0.0924, -1.8318, 0.8591, -0.0391, -1.5064, 1.1327, 0.0924, -1.8318, 1.1327, 0.0924, -1.8318, 0.8591, -0.0391, -1.5064, 1.1327, -0.0391, -1.5064, 0.8591, 0.4154, -1.9689, 0.8591, 0.0924, -1.8318, 1.1327, 0.4154, -1.9689, 1.1327, 0.4154, -1.9689, 0.8591, 0.0924, -1.8318, 1.1327, 0.0924, -1.8318, 0.8591, 0.7409, -1.8375, 0.8591, 0.4154, -1.9689, 1.1327, 0.7409, -1.8375, 1.1327, 0.7409, -1.8375, 0.8591, 0.4154, -1.9689, 1.1327, 0.4154, -1.9689, 0.8591, 0.878, -1.5144, 0.8591, 0.7409, -1.8375, 1.1327, 0.878, -1.5144, 1.1327, 0.878, -1.5144, 0.8591, 0.7409, -1.8375, 1.1327, 0.7409, -1.8375, 0.8591, 0.7465, -1.1889, 0.8591, 0.878, -1.5144, 1.1327, 0.7465, -1.1889, 1.1327, 0.7465, -1.1889, 0.8591, 0.878, -1.5144, 1.1327, 0.878, -1.5144, 0.8591, 0.4154, -1.9689, 0.8591, 0.7409, -1.8375, 0.8591, 0.0924, -1.8318, 0.8591, 0.0924, -1.8318, 0.8591, 0.7409, -1.8375, 0.8591, 0.7465, -1.1889, 0.8591, 0.7465, -1.1889, 0.8591, 0.098, -1.1833, 0.8591, 0.0924, -1.8318, 0.8591, 0.0924, -1.8318, 0.8591, 0.098, -1.1833, 0.8591, -0.0391, -1.5064, 0.8591, 0.4235, -1.0518, 0.8591, 0.098, -1.1833, 0.8591, 0.7465, -1.1889, 0.8591, 0.7409, -1.8375, 0.8591, 0.878, -1.5144, 0.8591, 0.7465, -1.1889, 1.1327, 0.098, -1.1833, 1.1327, 0.4235, -1.0518, 1.1327, -0.0391, -1.5064, 1.1327, -0.0391, -1.5064, 1.1327, 0.4235, -1.0518, 1.1327, 0.878, -1.5144, 1.1327, 0.878, -1.5144, 1.1327, 0.4154, -1.9689, 1.1327, -0.0391, -1.5064, 1.1327, -0.0391, -1.5064, 1.1327, 0.4154, -1.9689, 1.1327, 0.0924, -1.8318, 1.1327, 0.7409, -1.8375, 1.1327, 0.4154, -1.9689, 1.1327, 0.878, -1.5144, 1.1327, 0.4235, -1.0518, 1.1327, 0.7465, -1.1889, 1.1327, 0.878, -1.5144, -1.1327, 0.7465, 2.4772, -0.8591, 0.7465, 2.4772, -1.1327, 0.4235, 2.6144, -1.1327, 0.4235, 2.6144, -0.8591, 0.7465, 2.4772, -0.8591, 0.4235, 2.6144, -1.1327, 0.4235, 2.6144, -0.8591, 0.4235, 2.6144, -1.1327, 0.098, 2.4829, -1.1327, 0.098, 2.4829, -0.8591, 0.4235, 2.6144, -0.8591, 0.098, 2.4829, -1.1327, 0.098, 2.4829, -0.8591, 0.098, 2.4829, -1.1327, -0.0391, 2.1598, -1.1327, -0.0391, 2.1598, -0.8591, 0.098, 2.4829, -0.8591, -0.0391, 2.1598, -1.1327, -0.0391, 2.1598, -0.8591, -0.0391, 2.1598, -1.1327, 0.0924, 1.8343, -1.1327, 0.0924, 1.8343, -0.8591, -0.0391, 2.1598, -0.8591, 0.0924, 1.8343, -1.1327, 0.0924, 1.8343, -0.8591, 0.0924, 1.8343, -1.1327, 0.4154, 1.6972, -1.1327, 0.4154, 1.6972, -0.8591, 0.0924, 1.8343, -0.8591, 0.4154, 1.6972, -1.1327, 0.4154, 1.6972, -0.8591, 0.4154, 1.6972, -1.1327, 0.7409, 1.8287, -1.1327, 0.7409, 1.8287, -0.8591, 0.4154, 1.6972, -0.8591, 0.7409, 1.8287, -1.1327, 0.7409, 1.8287, -0.8591, 0.7409, 1.8287, -1.1327, 0.878, 2.1518, -1.1327, 0.878, 2.1518, -0.8591, 0.7409, 1.8287, -0.8591, 0.878, 2.1518, -1.1327, 0.878, 2.1518, -0.8591, 0.878, 2.1518, -1.1327, 0.7465, 2.4772, -1.1327, 0.7465, 2.4772, -0.8591, 0.878, 2.1518, -0.8591, 0.7465, 2.4772, -0.8591, 0.4235, 2.6144, -0.8591, 0.7465, 2.4772, -0.8591, 0.098, 2.4829, -0.8591, 0.098, 2.4829, -0.8591, 0.7465, 2.4772, -0.8591, 0.0924, 1.8343, -0.8591, -0.0391, 2.1598, -0.8591, 0.098, 2.4829, -0.8591, 0.0924, 1.8343, -0.8591, 0.7465, 2.4772, -0.8591, 0.7409, 1.8287, -0.8591, 0.0924, 1.8343, -0.8591, 0.0924, 1.8343, -0.8591, 0.7409, 1.8287, -0.8591, 0.4154, 1.6972, -0.8591, 0.7465, 2.4772, -0.8591, 0.878, 2.1518, -0.8591, 0.7409, 1.8287, -1.1327, 0.7409, 1.8287, -1.1327, 0.878, 2.1518, -1.1327, 0.4154, 1.6972, -1.1327, 0.4154, 1.6972, -1.1327, 0.878, 2.1518, -1.1327, -0.0391, 2.1598, -1.1327, 0.0924, 1.8343, -1.1327, 0.4154, 1.6972, -1.1327, -0.0391, 2.1598, -1.1327, 0.878, 2.1518, -1.1327, 0.4235, 2.6144, -1.1327, -0.0391, 2.1598, -1.1327, -0.0391, 2.1598, -1.1327, 0.4235, 2.6144, -1.1327, 0.098, 2.4829, -1.1327, 0.878, 2.1518, -1.1327, 0.7465, 2.4772, -1.1327, 0.4235, 2.6144, -1.1327, 0.878, -1.5064, -0.8591, 0.878, -1.5064, -1.1327, 0.7409, -1.1833, -1.1327, 0.7409, -1.1833, -0.8591, 0.878, -1.5064, -0.8591, 0.7409, -1.1833, -1.1327, 0.7409, -1.1833, -0.8591, 0.7409, -1.1833, -1.1327, 0.4154, -1.0518, -1.1327, 0.4154, -1.0518, -0.8591, 0.7409, -1.1833, -0.8591, 0.4154, -1.0518, -1.1327, 0.4154, -1.0518, -0.8591, 0.4154, -1.0518, -1.1327, 0.0924, -1.1889, -1.1327, 0.0924, -1.1889, -0.8591, 0.4154, -1.0518, -0.8591, 0.0924, -1.1889, -1.1327, 0.0924, -1.1889, -0.8591, 0.0924, -1.1889, -1.1327, -0.0391, -1.5144, -1.1327, -0.0391, -1.5144, -0.8591, 0.0924, -1.1889, -0.8591, -0.0391, -1.5144, -1.1327, -0.0391, -1.5144, -0.8591, -0.0391, -1.5144, -1.1327, 0.098, -1.8375, -1.1327, 0.098, -1.8375, -0.8591, -0.0391, -1.5144, -0.8591, 0.098, -1.8375, -1.1327, 0.098, -1.8375, -0.8591, 0.098, -1.8375, -1.1327, 0.4235, -1.9689, -1.1327, 0.4235, -1.9689, -0.8591, 0.098, -1.8375, -0.8591, 0.4235, -1.9689, -1.1327, 0.4235, -1.9689, -0.8591, 0.4235, -1.9689, -1.1327, 0.7465, -1.8318, -1.1327, 0.7465, -1.8318, -0.8591, 0.4235, -1.9689, -0.8591, 0.7465, -1.8318, -1.1327, 0.7465, -1.8318, -0.8591, 0.7465, -1.8318, -1.1327, 0.878, -1.5064, -1.1327, 0.878, -1.5064, -0.8591, 0.7465, -1.8318, -0.8591, 0.878, -1.5064, -0.8591, 0.7409, -1.1833, -0.8591, 0.878, -1.5064, -0.8591, 0.4154, -1.0518, -0.8591, 0.4154, -1.0518, -0.8591, 0.878, -1.5064, -0.8591, -0.0391, -1.5144, -0.8591, 0.0924, -1.1889, -0.8591, 0.4154, -1.0518, -0.8591, -0.0391, -1.5144, -0.8591, 0.878, -1.5064, -0.8591, 0.4235, -1.9689, -0.8591, -0.0391, -1.5144, -0.8591, -0.0391, -1.5144, -0.8591, 0.4235, -1.9689, -0.8591, 0.098, -1.8375, -0.8591, 0.878, -1.5064, -0.8591, 0.7465, -1.8318, -0.8591, 0.4235, -1.9689, -1.1327, 0.4235, -1.9689, -1.1327, 0.7465, -1.8318, -1.1327, 0.098, -1.8375, -1.1327, 0.098, -1.8375, -1.1327, 0.7465, -1.8318, -1.1327, 0.0924, -1.1889, -1.1327, -0.0391, -1.5144, -1.1327, 0.098, -1.8375, -1.1327, 0.0924, -1.1889, -1.1327, 0.7465, -1.8318, -1.1327, 0.7409, -1.1833, -1.1327, 0.0924, -1.1889, -1.1327, 0.0924, -1.1889, -1.1327, 0.7409, -1.1833, -1.1327, 0.4154, -1.0518, -1.1327, 0.7465, -1.8318, -1.1327, 0.878, -1.5064, -1.1327, 0.7409, -1.1833, -0.5747, 0.4022, 2.9159, -0.5747, 0.4022, 3.0472, -0.47, 0.4022, 2.9243, -0.47, 0.4022, 2.9243, -0.5747, 0.4022, 3.0472, -0.47, 0.4022, 3.0472, -0.47, 0.6838, 3.0682, -0.5747, 0.6838, 3.0682, -0.47, 0.6838, 2.9486, -0.47, 0.6838, 2.9486, -0.5747, 0.6838, 3.0682, -0.5747, 0.6838, 2.9403, -0.47, 0.4022, 3.0472, -0.5747, 0.4022, 3.0472, -0.47, 0.6838, 3.0682, -0.47, 0.6838, 3.0682, -0.5747, 0.4022, 3.0472, -0.5747, 0.6838, 3.0682, -0.47, 0.4022, 2.9243, -0.47, 0.4022, 3.0472, -0.47, 0.6838, 2.9486, -0.47, 0.6838, 2.9486, -0.47, 0.4022, 3.0472, -0.47, 0.6838, 3.0682, -0.5747, 0.4022, 2.9159, -0.47, 0.4022, 2.9243, -0.5747, 0.6838, 2.9403, -0.5747, 0.6838, 2.9403, -0.47, 0.4022, 2.9243, -0.47, 0.6838, 2.9486, -0.5747, 0.4022, 3.0472, -0.5747, 0.4022, 2.9159, -0.5747, 0.6838, 3.0682, -0.5747, 0.6838, 3.0682, -0.5747, 0.4022, 2.9159, -0.5747, 0.6838, 2.9403, 0.47, 0.4022, 3.0472, 0.5747, 0.4022, 3.0472, 0.47, 0.4022, 2.9243, 0.47, 0.4022, 2.9243, 0.5747, 0.4022, 3.0472, 0.5747, 0.4022, 2.9159, 0.5747, 0.6838, 2.9403, 0.5747, 0.6838, 3.0682, 0.47, 0.6838, 2.9486, 0.47, 0.6838, 2.9486, 0.5747, 0.6838, 3.0682, 0.47, 0.6838, 3.0682, 0.5747, 0.6838, 3.0682, 0.5747, 0.4022, 3.0472, 0.47, 0.6838, 3.0682, 0.47, 0.6838, 3.0682, 0.5747, 0.4022, 3.0472, 0.47, 0.4022, 3.0472, 0.47, 0.6838, 3.0682, 0.47, 0.4022, 3.0472, 0.47, 0.6838, 2.9486, 0.47, 0.6838, 2.9486, 0.47, 0.4022, 3.0472, 0.47, 0.4022, 2.9243, 0.47, 0.6838, 2.9486, 0.47, 0.4022, 2.9243, 0.5747, 0.6838, 2.9403, 0.5747, 0.6838, 2.9403, 0.47, 0.4022, 2.9243, 0.5747, 0.4022, 2.9159, 0.5747, 0.6838, 2.9403, 0.5747, 0.4022, 2.9159, 0.5747, 0.6838, 3.0682, 0.5747, 0.6838, 3.0682, 0.5747, 0.4022, 2.9159, 0.5747, 0.4022, 3.0472, -0.6577, 0.4022, -2.9774, -0.7623, 0.4022, -2.9774, -0.6577, 0.4022, -2.8545, -0.6577, 0.4022, -2.8545, -0.7623, 0.4022, -2.9774, -0.7623, 0.4022, -2.8462, -0.7623, 0.6838, -2.9542, -0.7623, 0.6838, -3.0821, -0.6577, 0.6838, -2.9625, -0.6577, 0.6838, -2.9625, -0.7623, 0.6838, -3.0821, -0.6577, 0.6838, -3.0821, -0.7623, 0.6838, -3.0821, -0.7623, 0.4022, -2.9774, -0.6577, 0.6838, -3.0821, -0.6577, 0.6838, -3.0821, -0.7623, 0.4022, -2.9774, -0.6577, 0.4022, -2.9774, -0.6577, 0.6838, -3.0821, -0.6577, 0.4022, -2.9774, -0.6577, 0.6838, -2.9625, -0.6577, 0.6838, -2.9625, -0.6577, 0.4022, -2.9774, -0.6577, 0.4022, -2.8545, -0.6577, 0.6838, -2.9625, -0.6577, 0.4022, -2.8545, -0.7623, 0.6838, -2.9542, -0.7623, 0.6838, -2.9542, -0.6577, 0.4022, -2.8545, -0.7623, 0.4022, -2.8462, -0.7623, 0.6838, -2.9542, -0.7623, 0.4022, -2.8462, -0.7623, 0.6838, -3.0821, -0.7623, 0.6838, -3.0821, -0.7623, 0.4022, -2.8462, -0.7623, 0.4022, -2.9774, 0.7623, 0.4022, -2.8462, 0.7623, 0.4022, -2.9774, 0.6577, 0.4022, -2.8545, 0.6577, 0.4022, -2.8545, 0.7623, 0.4022, -2.9774, 0.6577, 0.4022, -2.9774, 0.6577, 0.6838, -3.0821, 0.7623, 0.6838, -3.0821, 0.6577, 0.6838, -2.9625, 0.6577, 0.6838, -2.9625, 0.7623, 0.6838, -3.0821, 0.7623, 0.6838, -2.9542, 0.6577, 0.4022, -2.9774, 0.7623, 0.4022, -2.9774, 0.6577, 0.6838, -3.0821, 0.6577, 0.6838, -3.0821, 0.7623, 0.4022, -2.9774, 0.7623, 0.6838, -3.0821, 0.6577, 0.4022, -2.8545, 0.6577, 0.4022, -2.9774, 0.6577, 0.6838, -2.9625, 0.6577, 0.6838, -2.9625, 0.6577, 0.4022, -2.9774, 0.6577, 0.6838, -3.0821, 0.7623, 0.4022, -2.8462, 0.6577, 0.4022, -2.8545, 0.7623, 0.6838, -2.9542, 0.7623, 0.6838, -2.9542, 0.6577, 0.4022, -2.8545, 0.6577, 0.6838, -2.9625, 0.7623, 0.4022, -2.9774, 0.7623, 0.4022, -2.8462, 0.7623, 0.6838, -3.0821, 0.7623, 0.6838, -3.0821, 0.7623, 0.4022, -2.8462, 0.7623, 0.6838, -2.9542, 0, 1.1297, -2.8807, 0, 1.2344, -2.8182, -0.21, 1.1297, -2.7585, -0.21, 1.1297, -2.7585, 0, 1.2344, -2.8182, -0.21, 1.2344, -2.6878, 0.21, 1.2344, -2.6894, 0, 1.2344, -2.8182, 0.21, 1.1297, -2.7602, 0.21, 1.1297, -2.7602, 0, 1.2344, -2.8182, 0, 1.1297, -2.8807, 0.21, 1.1297, -2.7602, 0, 1.1297, -2.8807, -0.21, 1.1297, -2.7585, 0.21, 1.2344, -2.6894, -0.21, 1.2344, -2.6878, 0, 1.2344, -2.8182) [node name="Car" type="StaticBody3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0) script = ExtResource("1_wexwf") translation_keys_first_state = Array[String](["CAR"]) translation_keys_second_state = Array[String](["CAR_FLAT"]) diff --git a/scenes/item/receptacle/mesh/car.tscn b/scenes/item/receptacle/mesh/car.tscn index 1267aa1..e9f9fc5 100644 --- a/scenes/item/receptacle/mesh/car.tscn +++ b/scenes/item/receptacle/mesh/car.tscn @@ -4,5 +4,5 @@ [ext_resource type="Material" uid="uid://cisfqkqr8poc2" path="res://resources/materials/psx_car.tres" id="1_x7out"] [node name="CarMesh" type="MeshInstance3D"] -material_override = ExtResource("1_x7out") mesh = ExtResource("1_fy14n") +surface_material_override/0 = ExtResource("1_x7out") diff --git a/scenes/test.tscn b/scenes/test.tscn index 8c86963..9438a57 100644 --- a/scenes/test.tscn +++ b/scenes/test.tscn @@ -27,30 +27,8 @@ [ext_resource type="Script" path="res://addons/proton_scatter/src/shapes/box_shape.gd" id="13_xp0pf"] [ext_resource type="PackedScene" uid="uid://dsybu3fdgdwy2" path="res://scenes/street_light.tscn" id="14_q4q2k"] [ext_resource type="PackedScene" uid="uid://bdhbrxiu8lpx1" path="res://scenes/item/receptacle/door_house.tscn" id="14_s25uy"] -[ext_resource type="Shader" path="res://addons/gpsx/example/materials/shaders/misc/gpsx_sky.gdshader" id="14_uxwmh"] [ext_resource type="PackedScene" uid="uid://cxdasewpcpnsb" path="res://scenes/item/receptacle/fuse_box.tscn" id="15_f7r8g"] -[sub_resource type="ShaderMaterial" id="ShaderMaterial_74i28"] -shader = ExtResource("14_uxwmh") -shader_parameter/mixer = Color(0.290196, 0.282353, 1, 1) -shader_parameter/tex = ExtResource("6_e3amk") -shader_parameter/dithering = true -shader_parameter/banding = true - -[sub_resource type="Sky" id="Sky_xvdyl"] -sky_material = SubResource("ShaderMaterial_74i28") - -[sub_resource type="Environment" id="Environment_7ofk6"] -background_mode = 2 -sky = SubResource("Sky_xvdyl") -ambient_light_color = Color(1, 1, 1, 1) -ambient_light_sky_contribution = 0.9 -tonemap_mode = 2 -glow_enabled = true -volumetric_fog_enabled = true -volumetric_fog_density = 0.0 -volumetric_fog_sky_affect = 0.3 - [sub_resource type="BoxMesh" id="BoxMesh_egctf"] size = Vector3(8, 4, 4) @@ -167,9 +145,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.395, 0) [node name="Lighting" type="Node" parent="."] -[node name="WorldEnvironment" type="WorldEnvironment" parent="Lighting"] -environment = SubResource("Environment_7ofk6") - [node name="DirectionalLight3D" type="DirectionalLight3D" parent="Lighting"] transform = Transform3D(-0.572263, 0.516061, -0.637335, -0.151768, 0.697101, 0.700726, 0.805904, 0.497727, -0.320604, 0, 16.7255, 0) shadow_enabled = true diff --git a/scripts/build_info.gd b/scripts/build_info.gd index 5942e9c..2aeb851 100644 --- a/scripts/build_info.gd +++ b/scripts/build_info.gd @@ -1,11 +1,14 @@ @tool extends Label +const BuildInfo := preload("res://addons/export-build-info/build_info.gd") + func _ready(): - var build_version = ProjectSettings.get_setting("build_info/package/version") - var build_commit = ProjectSettings.get_setting("build_info/source/commit") + var build_version = ProjectSettings.get_setting(BuildInfo.BUILD_INFO_VERSION) + var build_commit = ProjectSettings.get_setting(BuildInfo.BUILD_INFO_COMMIT) + if build_version and build_commit: - set_text("v" + build_version + "@" + build_commit.left(7)) + set_text("v%s @ %s" % [build_version, build_commit.left(7)]) else: set_text("") diff --git a/shaders/vignette.gdshader b/shaders/vignette.gdshader index 3b3e591..81cd846 100644 --- a/shaders/vignette.gdshader +++ b/shaders/vignette.gdshader @@ -1,6 +1,6 @@ shader_type canvas_item; -uniform float alpha = 1.0; +uniform float alpha = 0.0; uniform float inner_radius = 0.0; uniform float outer_radius = 1.0;