diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ec1f595..a83155c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -22,6 +22,8 @@ jobs: - uses: olegtarasov/get-tag@v2.1.2 id: get_version - uses: actions/checkout@v4 + with: + lfs: 'true' - uses: dtolnay/rust-toolchain@stable with: targets: wasm32-unknown-unknown @@ -68,6 +70,8 @@ jobs: - uses: olegtarasov/get-tag@v2.1.2 id: get_version - uses: actions/checkout@v4 + with: + lfs: 'true' - uses: dtolnay/rust-toolchain@stable with: targets: x86_64-unknown-linux-gnu @@ -115,6 +119,8 @@ jobs: - uses: olegtarasov/get-tag@v2.1.2 id: get_version - uses: actions/checkout@v4 + with: + lfs: 'true' - uses: dtolnay/rust-toolchain@stable with: targets: x86_64-pc-windows-msvc @@ -158,6 +164,8 @@ jobs: - uses: olegtarasov/get-tag@v2.1.2 id: get_version - uses: actions/checkout@v4 + with: + lfs: 'true' - uses: dtolnay/rust-toolchain@stable with: targets: x86_64-apple-darwin @@ -202,6 +210,8 @@ jobs: - uses: olegtarasov/get-tag@v2.1.2 id: get_version - uses: actions/checkout@v4 + with: + lfs: 'true' - uses: dtolnay/rust-toolchain@stable with: targets: aarch64-apple-darwin diff --git a/assets/assets_game.assets.ron b/assets/assets_game.assets.ron index 6447822..f36c3fd 100644 --- a/assets/assets_game.assets.ron +++ b/assets/assets_game.assets.ron @@ -1,5 +1,5 @@ ({ - "levels":Files (paths: ["levels/level_1.gltf", "levels/level_2.gltf", "levels/level_3.gltf", "levels/level_4.gltf", "levels/level_5.gltf"]), + "levels":Files (paths: ["levels/level_1.gltf", "levels/level_2.gltf", "levels/level_3.gltf", "levels/level_4.gltf", "levels/level_5.gltf", "levels/level_6.gltf"]), "menu": File(path: "levels/menu.gltf"), "environment_diffuse": File(path: "environments/diffuse.png"), @@ -12,7 +12,7 @@ "sfx":Files (paths: ["audio/sfx/roll.ogg", "audio/sfx/score.ogg"]), "music": Files(paths:["audio/music/music.ogg"]), - + "background": File ( path: "my-background.ogg", ), diff --git a/assets/levels/level_2.bin b/assets/levels/level_2.bin index 6260330..2f9a8d6 100644 --- a/assets/levels/level_2.bin +++ b/assets/levels/level_2.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f5ca5e8aa8d56517430922acfd918c3cffeb8210d2c78790b8dca811bb77770 -size 265080 +oid sha256:36e34d9e43b63d49ac1fc6ec06d8009282370a8cd700347dec93a74908791d81 +size 264312 diff --git a/assets/levels/level_2.gltf b/assets/levels/level_2.gltf index f848da8..8921cd3 100644 --- a/assets/levels/level_2.gltf +++ b/assets/levels/level_2.gltf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fde2765f2d0643f0d3c80dfa471e6381d8219694c27e6f2d984d553069d503ec -size 146825 +oid sha256:5547899c557bed54e8403624271f5361b0e20eafc288c61623bd6b3dac0122bd +size 145573 diff --git a/assets/levels/level_3.bin b/assets/levels/level_3.bin index 4b0b680..d087e0f 100644 --- a/assets/levels/level_3.bin +++ b/assets/levels/level_3.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:20f79a29d6c0d6adcaf234d6dfa1dc50cd277f3bd9e8faa22b56f8dccb9954c9 -size 241804 +oid sha256:b903d89284dd27cea4d0eb98a1ace7b712c3385d210e8bc9016523bf4ef02509 +size 236644 diff --git a/assets/levels/level_3.gltf b/assets/levels/level_3.gltf index 16ea163..28221bf 100644 --- a/assets/levels/level_3.gltf +++ b/assets/levels/level_3.gltf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0097041f7426ad37948836f8a66d3e83208cf21ca36f7b0b7e81cf6c72196db3 -size 78839 +oid sha256:2003703e539e0f66a4ccdb1de19454734f7559f9b85e7b2a276b740409e82d01 +size 90692 diff --git a/assets/levels/level_5.bin b/assets/levels/level_5.bin index f5a7b45..dfd0422 100644 --- a/assets/levels/level_5.bin +++ b/assets/levels/level_5.bin @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:215084a4d5990fae20c514167e9668b3408ba93184eb3328d8bbdd4ae417e4de -size 14616 +oid sha256:e2debc396f0ad67b2c52f5614e7a7c452315cf61f228c2dc64357411de508f0b +size 38832 diff --git a/assets/levels/level_5.gltf b/assets/levels/level_5.gltf index 9442b9e..bd29195 100644 --- a/assets/levels/level_5.gltf +++ b/assets/levels/level_5.gltf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52efc6f173a3ae657b810b017fdfaada05a3ebd9d125bdf94f063afe0455b239 -size 47814 +oid sha256:f8d15303344699bfecf92d435f234f7b8189168faf893cf163f877c0fd12ca50 +size 104931 diff --git a/assets/levels/level_6.bin b/assets/levels/level_6.bin new file mode 100644 index 0000000..f5a7b45 --- /dev/null +++ b/assets/levels/level_6.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:215084a4d5990fae20c514167e9668b3408ba93184eb3328d8bbdd4ae417e4de +size 14616 diff --git a/assets/levels/level_6.gltf b/assets/levels/level_6.gltf new file mode 100644 index 0000000..fc96693 --- /dev/null +++ b/assets/levels/level_6.gltf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b0227f41f2f3f4b1941c33cd3afbb2e5b61d73326a712ba1416f24e9e18ab83 +size 47814 diff --git a/assets/library.blend b/assets/library.blend index 21bc020..46c329e 100644 --- a/assets/library.blend +++ b/assets/library.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e6b27a695ab6330f37bccdeed476ab5466eebed48fd48f04c3737ce985284db2 -size 3930792 +oid sha256:cdc9568626c2899488c3085164eb5ba78d6e3adc3ccaf419931fd67348ebd7ff +size 4297536 diff --git a/src/plugins/gameplay.rs b/src/plugins/gameplay.rs index ce97e0e..ad86d3d 100644 --- a/src/plugins/gameplay.rs +++ b/src/plugins/gameplay.rs @@ -1,5 +1,5 @@ use bevy::{audio::VolumeLevel, prelude::*}; -use bevy_gltf_blueprints::{BluePrintBundle, BlueprintName, GltfBlueprintsSet}; +use bevy_gltf_blueprints::GltfBlueprintsSet; use bevy_xpbd_3d::prelude::*; use leafwing_input_manager::prelude::*;