Merge branch 'master' of https://git.sjkillen.ca/sjkillen/ABGJ-23

godot/Models/grape_man.tscn

@@ -4,6 +4,7 @@
 [ext_resource type="Script" path="res://Models/grape_man.gd" id="2_ksje8"]
 
 [node name="grape_man" instance=ExtResource("1_fh5yr")]
+transform = Transform3D(0.065, 0, 0, 0, 0.065, 0, 0, 0, 0.065, 0, 0, 0)
 script = ExtResource("2_ksje8")
 
 [node name="Skeleton3D" parent="rig" index="0"]

godot/Models/slime.tscn

@@ -26,17 +26,17 @@ states/Walk/position = Vector2(329, 155)
 transitions = ["Walk", "Idle", SubResource("AnimationNodeStateMachineTransition_n3s05"), "Idle", "Walk", SubResource("AnimationNodeStateMachineTransition_fbi2x"), "Start", "Idle", SubResource("AnimationNodeStateMachineTransition_srcja")]
 
 [node name="slime" instance=ExtResource("1_jttw0")]
+transform = Transform3D(0.035, 0, 0, 0, 0.035, 0, 0, 0, 0.035, 0, 0, 0)
 script = ExtResource("2_xo27e")
 
 [node name="Skeleton3D" parent="Armature" index="0"]
-bones/1/position = Vector3(0, 0.264857, 0)
-bones/2/position = Vector3(0.028393, 0.513056, 0.0124737)
-bones/2/rotation = Quaternion(-0.178538, 0.0193832, -0.211014, 0.960844)
-bones/3/rotation = Quaternion(0.109512, -0.695192, 0.00400734, 0.710422)
-bones/7/rotation = Quaternion(-0.347763, 2.02718e-09, 2.9685e-09, 0.937583)
-bones/8/rotation = Quaternion(-0.091967, -7.45328e-10, -7.10578e-10, 0.995762)
-bones/10/rotation = Quaternion(0.0144373, -4.10082e-08, -1.82391e-09, 0.999896)
-bones/11/rotation = Quaternion(-0.373719, 8.36829e-08, 6.89615e-08, 0.927542)
+bones/1/position = Vector3(0, 0.408076, 0)
+bones/2/rotation = Quaternion(-0.0627444, 0.00212883, -0.213248, 0.974979)
+bones/3/rotation = Quaternion(0.100834, -0.698956, 0.0125015, 0.707911)
+bones/7/rotation = Quaternion(-0.275892, 2.28845e-09, 2.79242e-09, 0.961189)
+bones/8/rotation = Quaternion(0.131738, -8.57356e-10, -5.26868e-10, 0.991285)
+bones/10/rotation = Quaternion(0.275768, -5.73458e-08, -4.54648e-08, 0.961224)
+bones/11/rotation = Quaternion(-0.131755, 8.86793e-08, 4.46748e-08, 0.991282)
 
 [node name="AnimationTree" type="AnimationTree" parent="." index="2"]
 tree_root = SubResource("AnimationNodeStateMachine_prt7l")

godot/project.godot

@@ -14,6 +14,14 @@ config/name="abgj23"
 config/features=PackedStringArray("4.1", "Forward Plus")
 config/icon="res://icon.svg"
 
+[display]
+
+window/size/viewport_width=512
+window/size/viewport_height=512
+window/size/mode=3
+window/stretch/mode="viewport"
+window/stretch/aspect="expand"
+
 [filesystem]
 
 import/fbx/enabled=false

godot/tests/test_grape_man_animation.tscn

@@ -51,7 +51,7 @@ layout_mode = 2
 text = "Walk"
 
 [node name="Camera3D" type="Camera3D" parent="."]
-transform = Transform3D(0.551151, 0, 0.834406, 0, 1, 0, -0.834406, 0, 0.551151, 10.2206, 6.04514, 5.32455)
+transform = Transform3D(0.551151, 0, 0.834406, 0, 1, 0, -0.834406, 0, 0.551151, 1.041, 0.45, 0.03)
 
 [connection signal="pressed" from="CanvasLayer/Control/VBoxContainer/Pickup" to="." method="_on_pickup_pressed"]
 [connection signal="pressed" from="CanvasLayer/Control/VBoxContainer/Hold" to="." method="_on_hold_pressed"]

godot/tests/test_slime_animation.tscn

@@ -39,7 +39,7 @@ layout_mode = 2
 text = "Walk"
 
 [node name="Camera3D" type="Camera3D" parent="."]
-transform = Transform3D(0.999682, 0, -0.0251998, 0, 1, 0, 0.0251998, 0, 0.999682, 0.262823, 2.33598, 7.32455)
+transform = Transform3D(0.999682, 0, -0.0251998, 0, 1, 0, 0.0251998, 0, 0.999682, 0, 0.138, 0.315)
 current = true
 
 [connection signal="pressed" from="CanvasLayer/Control/VBoxContainer/Idle" to="." method="_on_idle_pressed"]