automerge, fucking git

This commit is contained in:
Ententerminator committed 2020-02-01 16:26:32 +01:00
commit c6f6fbfac8
19 files changed
+28 -30

No files matched your search

-1
View File
@@ -5,7 +5,6 @@
[sub_resource type="SphereShape" id=2]
[node name="AttachmentPoint" type="Spatial"]
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0 )
[node name="Mesh" type="MeshInstance" parent="."]
transform = Transform( 0.3, 0, 0, 0, 0.3, 0, 0, 0, 0.3, 0, 0, 0 )
+2 -2
View File
@@ -5,7 +5,7 @@
[sub_resource type="CapsuleMesh" id=1]
[sub_resource type="CapsuleShape" id=2]
[sub_resource type="CapsuleShape" id=1]
[node name="Torso" type="RigidBody"]
script = ExtResource( 1 )
@@ -16,7 +16,7 @@ material/0 = null
[node name="TorsoCollider" type="CollisionShape" parent="."]
transform = Transform( 0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, 0, 0 )
shape = SubResource( 2 )
shape = SubResource( 1 )
[node name="FrontLeft" parent="." instance=ExtResource( 2 )]
transform = Transform( 0.5, -1.62921e-07, -0.866025, -3.25841e-07, -1, 0, -0.866025, 2.82187e-07, -0.5, 0.6, 0, 1 )