diff --git a/assets/props/Spyglass/sm_spyglass.mesh b/assets/props/Spyglass/sm_spyglass.mesh deleted file mode 100644 index a334ba6..0000000 Binary files a/assets/props/Spyglass/sm_spyglass.mesh and /dev/null differ diff --git a/assets/props/Spyglass/materials/MA_spyglass.material b/assets/props/spyglass/materials/MA_spyglass.material similarity index 100% rename from assets/props/Spyglass/materials/MA_spyglass.material rename to assets/props/spyglass/materials/MA_spyglass.material diff --git a/assets/props/spyglass/sm_spyglass.mesh b/assets/props/spyglass/sm_spyglass.mesh new file mode 100644 index 0000000..41ee152 Binary files /dev/null and b/assets/props/spyglass/sm_spyglass.mesh differ diff --git a/assets/props/Spyglass/spyglass.gltf b/assets/props/spyglass/spyglass.gltf similarity index 100% rename from assets/props/Spyglass/spyglass.gltf rename to assets/props/spyglass/spyglass.gltf diff --git a/assets/props/Spyglass/spyglass.gltf.import b/assets/props/spyglass/spyglass.gltf.import similarity index 100% rename from assets/props/Spyglass/spyglass.gltf.import rename to assets/props/spyglass/spyglass.gltf.import diff --git a/scenes/levels/warcraft/WarCraft.tscn b/scenes/levels/warcraft/WarCraft.tscn index 3f0b70c..98ea45f 100644 --- a/scenes/levels/warcraft/WarCraft.tscn +++ b/scenes/levels/warcraft/WarCraft.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=57 format=2] +[gd_scene load_steps=52 format=2] [ext_resource path="res://assets/props/candle/sm_candle_top.mesh" type="ArrayMesh" id=1] [ext_resource path="res://scenes/levels/warcraft/WarCraft.gd" type="Script" id=2] @@ -28,9 +28,7 @@ [ext_resource path="res://assets/props/fiole/materials/MA_fiole_green.material" type="Material" id=26] [ext_resource path="res://assets/props/fiole/materials/MA_fiole_red.material" type="Material" id=27] [ext_resource path="res://assets/props/fiole/materials/MA_fiole_blue.material" type="Material" id=28] -[ext_resource path="res://assets/props/spyglass/sm_spyglass.mesh" type="ArrayMesh" id=29] [ext_resource path="res://assets/props/stack gold/sm_stackgold.mesh" type="ArrayMesh" id=30] -[ext_resource path="res://assets/props/spyglass/materials/MA_spyglass.material" type="Material" id=31] [ext_resource path="res://assets/props/stack gold/materials/MA_gold.material" type="Material" id=32] [ext_resource path="res://assets/props/pinte beer/materials/MA_pinte_beer.material" type="Material" id=33] [ext_resource path="res://assets/props/weapon gun/materials/MA_weapon_gun.material" type="Material" id=34] @@ -570,8 +568,6 @@ shape = SubResource( 8 ) [node name="sm_spyglass" type="MeshInstance" parent="Hidden Objects Items"] transform = Transform( 0.665919, -0.0332091, 0.63579, 1.34429e-08, 0.920039, 0.0480562, -0.636656, -0.0347355, 0.665013, -2.88265, -0.329537, -0.428369 ) -mesh = ExtResource( 29 ) -material/0 = ExtResource( 31 ) [node name="Area2" type="Area" parent="Hidden Objects Items/sm_spyglass"]