diff --git a/.godot/imported/control_box_street_lamp_albedo000.png-5cbb543138142ece3ed16170b0eb1a83.ctex b/.godot/imported/control_box_street_lamp_albedo000.png-5cbb543138142ece3ed16170b0eb1a83.ctex new file mode 100644 index 0000000..028b6ec Binary files /dev/null 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 new file mode 100644 index 0000000..874b2ec --- /dev/null +++ b/.godot/imported/control_box_street_lamp_albedo000.png-5cbb543138142ece3ed16170b0eb1a83.md5 @@ -0,0 +1,2 @@ +source_md5="fd1796543637f98353085d28e7123a51" +dest_md5="aa08cbf0ff8784c863f662cd9204489d" diff --git a/.godot/imported/control_box_street_lamp_albedo002.png-cfe7ad10bc8499f18d9bbec2d94078b4.ctex b/.godot/imported/control_box_street_lamp_albedo002.png-cfe7ad10bc8499f18d9bbec2d94078b4.ctex new file mode 100644 index 0000000..fb7f88f Binary files /dev/null and b/.godot/imported/control_box_street_lamp_albedo002.png-cfe7ad10bc8499f18d9bbec2d94078b4.ctex differ diff --git a/.godot/imported/control_box_street_lamp_albedo002.png-cfe7ad10bc8499f18d9bbec2d94078b4.md5 b/.godot/imported/control_box_street_lamp_albedo002.png-cfe7ad10bc8499f18d9bbec2d94078b4.md5 new file mode 100644 index 0000000..3cbaa8b --- /dev/null +++ b/.godot/imported/control_box_street_lamp_albedo002.png-cfe7ad10bc8499f18d9bbec2d94078b4.md5 @@ -0,0 +1,2 @@ +source_md5="16df86ac9e0938168a909f31880f0584" +dest_md5="de1722ead4b526bc8d7b85062083e2be" diff --git a/.godot/imported/control_box_street_lamp_emission000.png-db4537906f5e241ff86fff7e24a48743.ctex b/.godot/imported/control_box_street_lamp_emission000.png-db4537906f5e241ff86fff7e24a48743.ctex new file mode 100644 index 0000000..4cf0b17 Binary files /dev/null and b/.godot/imported/control_box_street_lamp_emission000.png-db4537906f5e241ff86fff7e24a48743.ctex differ diff --git a/.godot/imported/control_box_street_lamp_emission000.png-db4537906f5e241ff86fff7e24a48743.md5 b/.godot/imported/control_box_street_lamp_emission000.png-db4537906f5e241ff86fff7e24a48743.md5 new file mode 100644 index 0000000..f1811f8 --- /dev/null +++ b/.godot/imported/control_box_street_lamp_emission000.png-db4537906f5e241ff86fff7e24a48743.md5 @@ -0,0 +1,2 @@ +source_md5="e78d0053aebc2fc620358b74fb152577" +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 new file mode 100644 index 0000000..bc5e093 Binary files /dev/null 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 new file mode 100644 index 0000000..bffe58d --- /dev/null +++ b/.godot/imported/control_box_street_lamp_normal000.png-783e35e7656ebd6ab22568618a8f6738.md5 @@ -0,0 +1,2 @@ +source_md5="6bd1f6db4caae88e964a5116e165ab38" +dest_md5="6e1e672628a3b90cc189407dab9bbb23" diff --git a/.godot/imported/control_box_street_lamp_orm000.png-b5647570894759eee0f3b26332b4108e.ctex b/.godot/imported/control_box_street_lamp_orm000.png-b5647570894759eee0f3b26332b4108e.ctex new file mode 100644 index 0000000..2172a4d Binary files /dev/null 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 new file mode 100644 index 0000000..a005004 --- /dev/null +++ b/.godot/imported/control_box_street_lamp_orm000.png-b5647570894759eee0f3b26332b4108e.md5 @@ -0,0 +1,2 @@ +source_md5="d937a77fa24bf411f131a60a092ff2b9" +dest_md5="c71745f428735ed19279d677d144165b" diff --git a/Justfile b/Justfile index 7f833e0..f4548b9 100644 --- a/Justfile +++ b/Justfile @@ -158,9 +158,12 @@ godot *ARGS: check-godot check-templates @install-addons: [ -f plug.gd ] && just godot --headless --script plug.gd install force || true +# Workaround from https://github.com/godotengine/godot/pull/68461 # Import game resources @import-resources: - just godot --editor --headless --quit || true + just godot --headless --export-pack null /dev/null + # timeout 60 just godot --editor || true + # just godot --headless --quit --editor # Open the Godot editor @editor: @@ -189,8 +192,11 @@ butler *ARGS: check-butler 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 + # Export game on Windows -export-windows: makedirs bump-version install-addons import-resources +export-windows: pre-export mkdir -p {{ build_dir }}/windows just godot --headless --export-release '"Windows Desktop"' {{ build_dir }}/windows/{{ game_name }}.exe (cd {{ build_dir }}/windows && zip {{ game_name }}-windows-v{{ game_version }}.zip -r .) @@ -198,11 +204,11 @@ export-windows: makedirs bump-version install-addons import-resources rm -rf {{ build_dir }}/windows # Export game on MacOS -export-mac: makedirs bump-version install-addons import-resources +export-mac: pre-export just godot --headless --export-release "macOS" {{ dist_dir }}/{{ game_name }}-mac-v{{ game_version }}.zip # Export game on Linux -export-linux: makedirs bump-version install-addons import-resources +export-linux: pre-export mkdir -p {{ build_dir }}/linux just godot --headless --export-release "Linux/X11" {{ build_dir }}/linux/{{ game_name }}.x86_64 (cd {{ build_dir }}/linux && zip {{ game_name }}-linux-v{{ game_version }}.zip -r .) @@ -210,7 +216,7 @@ export-linux: makedirs bump-version install-addons import-resources rm -rf {{ build_dir }}/linux # Export game for the web -export-web: makedirs bump-version install-addons import-resources +export-web: pre-export mkdir -p {{ build_dir }}/web just godot --headless --export-release "Web" {{ build_dir }}/web/index.html diff --git a/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_albedo000.png b/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_albedo000.png new file mode 100644 index 0000000..c681fc8 Binary files /dev/null and b/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_albedo000.png differ diff --git a/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_albedo000.png.import b/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_albedo000.png.import new file mode 100644 index 0000000..05e0006 --- /dev/null +++ b/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_albedo000.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://jxh5xbmhfk0q" +path="res://.godot/imported/control_box_street_lamp_albedo000.png-5cbb543138142ece3ed16170b0eb1a83.ctex" +metadata={ +"vram_texture": false +} +generator_parameters={} + +[deps] + +source_file="res://assets/models/lamp_post_bench_trashcan/control_box_street_lamp_albedo000.png" +dest_files=["res://.godot/imported/control_box_street_lamp_albedo000.png-5cbb543138142ece3ed16170b0eb1a83.ctex"] + +[params] + +compress/mode=0 +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=1 diff --git a/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_albedo002.png b/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_albedo002.png new file mode 100644 index 0000000..86709d5 Binary files /dev/null and b/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_albedo002.png differ diff --git a/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_albedo002.png.import b/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_albedo002.png.import new file mode 100644 index 0000000..655e672 --- /dev/null +++ b/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_albedo002.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://buqva1pid3i7s" +path="res://.godot/imported/control_box_street_lamp_albedo002.png-cfe7ad10bc8499f18d9bbec2d94078b4.ctex" +metadata={ +"vram_texture": false +} +generator_parameters={} + +[deps] + +source_file="res://assets/models/lamp_post_bench_trashcan/control_box_street_lamp_albedo002.png" +dest_files=["res://.godot/imported/control_box_street_lamp_albedo002.png-cfe7ad10bc8499f18d9bbec2d94078b4.ctex"] + +[params] + +compress/mode=0 +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=1 diff --git a/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_emission000.png b/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_emission000.png new file mode 100644 index 0000000..1d5b0d5 Binary files /dev/null and b/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_emission000.png differ diff --git a/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_emission000.png.import b/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_emission000.png.import new file mode 100644 index 0000000..3899077 --- /dev/null +++ b/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_emission000.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d2kxeymba7kk7" +path="res://.godot/imported/control_box_street_lamp_emission000.png-db4537906f5e241ff86fff7e24a48743.ctex" +metadata={ +"vram_texture": false +} +generator_parameters={} + +[deps] + +source_file="res://assets/models/lamp_post_bench_trashcan/control_box_street_lamp_emission000.png" +dest_files=["res://.godot/imported/control_box_street_lamp_emission000.png-db4537906f5e241ff86fff7e24a48743.ctex"] + +[params] + +compress/mode=0 +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=1 diff --git a/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_normal000.png b/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_normal000.png new file mode 100644 index 0000000..6e27768 Binary files /dev/null and b/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_normal000.png differ diff --git a/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_normal000.png.import b/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_normal000.png.import new file mode 100644 index 0000000..d7ebf82 --- /dev/null +++ b/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_normal000.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bftph3x1pgrd7" +path="res://.godot/imported/control_box_street_lamp_normal000.png-783e35e7656ebd6ab22568618a8f6738.ctex" +metadata={ +"vram_texture": false +} +generator_parameters={} + +[deps] + +source_file="res://assets/models/lamp_post_bench_trashcan/control_box_street_lamp_normal000.png" +dest_files=["res://.godot/imported/control_box_street_lamp_normal000.png-783e35e7656ebd6ab22568618a8f6738.ctex"] + +[params] + +compress/mode=0 +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=1 diff --git a/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_orm000.png b/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_orm000.png new file mode 100644 index 0000000..6ecf282 Binary files /dev/null and b/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_orm000.png differ diff --git a/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_orm000.png.import b/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_orm000.png.import new file mode 100644 index 0000000..d72f757 --- /dev/null +++ b/assets/models/lamp_post_bench_trashcan/control_box_street_lamp_orm000.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dn76m2nbbqoob" +path="res://.godot/imported/control_box_street_lamp_orm000.png-b5647570894759eee0f3b26332b4108e.ctex" +metadata={ +"vram_texture": false +} +generator_parameters={} + +[deps] + +source_file="res://assets/models/lamp_post_bench_trashcan/control_box_street_lamp_orm000.png" +dest_files=["res://.godot/imported/control_box_street_lamp_orm000.png-b5647570894759eee0f3b26332b4108e.ctex"] + +[params] + +compress/mode=0 +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=1