Merge branch 'main' of github.com-personal:Back777space/among-me

2025-04-05 16:46:12 +02:00
parent 96b3f15292 bce5e53ecf
commit 61bf81ab34
8 changed files with 3 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@ target/
 # nixos
 .direnv
 *.blend1
--- a/assets/scene/level.blend
+++ b/assets/scene/level.blend
--- a/assets/levels/World.glb
+++ b/assets/levels/World.glb
--- a/assets/levels/World.meta.ron
+++ b/assets/levels/World.meta.ron
--- a/assets/materials/Dots
+++ b/assets/materials/Dots
--- a/assets/materials/Material.glb
+++ b/assets/materials/Material.glb
--- a/assets/scene/level.blend1
+++ b/assets/scene/level.blend1
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,7 +15,7 @@ fn main() -> AppExit {
 fn setup(mut commands: Commands) {
    commands.spawn((
-        BlueprintInfo::from_path("scenes/World.glb"),
+        BlueprintInfo::from_path("levels/World.glb"),
        SpawnBlueprint,
        HideUntilReady,
        GameWorldTag,