Merge branch 'main' of github.com:outfrost/ld49

outfrost · Oct 2, 2021 · 58adef5 · 58adef5
2 parents 9e1b865 + ed44c64
commit 58adef5
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 97 deletions.
diff --git a/assets/imports/single_espresso_exportPrep.gltf b/assets/imports/single_espresso_exportPrep.gltf
diff --git a/assets/single_espressomachine.tscn b/assets/single_espressomachine.tscn
@@ -3,6 +3,4 @@
 [ext_resource path="res://assets/imports/single_espresso_exportPrep.gltf" type="PackedScene" id=1]
 
 [node name="single_espresso_exportPrep" instance=ExtResource( 1 )]
-
-[node name="EspressoMachine" parent="." index="0"]
 transform = Transform( 0.35, 0, 0, 0, 0.35, 0, 0, 0, 0.35, 0, 0, 0 )
diff --git a/level/Cafe.tscn b/level/Cafe.tscn
@@ -560,10 +560,10 @@ light_energy = 0.5
 omni_range = 10.0
 
 [node name="single_espresso_exportPrep" parent="." instance=ExtResource( 1 )]
-transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -3, 0.925, 10.325 )
+transform = Transform( -1.5299e-08, 0, -0.35, 0, 0.35, 0, 0.35, 0, -1.5299e-08, -3, 0.925, 10.325 )
 
 [node name="single_espresso_exportPrep2" parent="." instance=ExtResource( 1 )]
-transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -3, 0.925, 9.325 )
+transform = Transform( -1.5299e-08, 0, -0.35, 0, 0.35, 0, 0.35, 0, -1.5299e-08, -3, 0.925, 9.325 )
 
 [node name="single_espresso_exportPrep3" parent="." instance=ExtResource( 1 )]
-transform = Transform( -4.37114e-08, 0, -1, 0, 1, 0, 1, 0, -4.37114e-08, -3, 0.925, 8.325 )
+transform = Transform( -1.5299e-08, 0, -0.35, 0, 0.35, 0, 0.35, 0, -1.5299e-08, -3, 0.925, 8.325 )