Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
This commit is contained in:
commit
f608c44c02
21 files changed
+108
-35
No files matched your search
@@ -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 )
|
||||
@@ -24,3 +23,5 @@ omni_range = 1.8
|
||||
[node name="CollisionShape" type="CollisionShape" parent="Area"]
|
||||
transform = Transform( 0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 0, 0, 0 )
|
||||
shape = SubResource( 2 )
|
||||
|
||||
[node name="Limb" type="Spatial" parent="."]
|
||||
@@ -4,14 +4,16 @@
|
||||
[ext_resource path="res://BodyParts/BodyBase/AttachmentPoint.tscn" type="PackedScene" id=2]
|
||||
[ext_resource path="res://3D Input/Fertige GLBs/Torso.glb" type="PackedScene" id=3]
|
||||
|
||||
[sub_resource type="CapsuleShape" id=2]
|
||||
[sub_resource type="CapsuleShape" id=1]
|
||||
|
||||
[node name="Torso" type="RigidBody"]
|
||||
[node name="Torso" type="RigidBody" groups=[
|
||||
"Player",
|
||||
]]
|
||||
script = ExtResource( 1 )
|
||||
|
||||
[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 )
|
||||
|
||||
Reference in new issue
Block a user