Merge branch 'stable2'

godot/.gitignore

@@ -1,8 +1,8 @@
 # Godot 4+ specific ignores
 .godot/
-*.blend1
-*.blend2
-*.blend3
-*.blend4
-*.blend5
-*.blend6
+blends/*.blend1
+blends/*.blend2
+blends/*.blend3
+blends/*.blend4
+blends/*.blend5
+blends/*.blend6

godot/Models/grape_man.tscn

@@ -154,7 +154,7 @@ 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"]
-bones/0/rotation = Quaternion(0.0897714, 0, 0, 0.995962)
+bones/0/rotation = Quaternion(0.0889611, 0, 0, 0.996035)
 bones/1/rotation = Quaternion(-0.0891896, 1.18734e-07, -1.06322e-08, 0.996015)
 bones/2/rotation = Quaternion(0.0133933, -1.19199e-07, 1.5966e-09, 0.99991)
 bones/3/rotation = Quaternion(-0.00997737, 0.100365, -0.694951, 0.711948)

godot/player.tscn

@@ -4,11 +4,14 @@
 [ext_resource type="PackedScene" uid="uid://bgoo1lbt28na" path="res://Models/grape_man.tscn" id="2_hg0av"]
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kb4ms"]
+radius = 0.06
+height = 0.43
 
 [node name="Player" type="CharacterBody3D"]
 script = ExtResource("1_7gpdp")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="."]
+transform = Transform3D(0.225, 0, 0, 0, 0.225, 0, 0, 0, 0.145, 0, 0.21, 0)
 shape = SubResource("CapsuleShape3D_kb4ms")
 
 [node name="grape_man" parent="." instance=ExtResource("2_hg0av")]