Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
This commit is contained in:
commit
b93ffa733c
3 files changed
+23
-43
No files matched your search
@@ -1,13 +1,14 @@
|
||||
extends Spatial
|
||||
|
||||
|
||||
onready var player1 = get_parent().get_node("Torso")
|
||||
onready var player2 = get_parent().get_node("Torso2")
|
||||
|
||||
onready var camera = get_node("Camera")
|
||||
|
||||
|
||||
func _process(delta: float) -> void:
|
||||
var player1 = get_parent().get_child(3)
|
||||
var player2 = get_parent().get_child(4)
|
||||
|
||||
if not player1 and player2: return
|
||||
|
||||
var center = player2.transform.origin + (player1.transform.origin - player2.transform.origin) / 2.0
|
||||
var distance = (player1.transform.origin - player2.transform.origin).length()
|
||||
|
||||
|
||||
+1
-33
@@ -1,12 +1,9 @@
|
||||
[gd_scene load_steps=8 format=2]
|
||||
[gd_scene load_steps=5 format=2]
|
||||
|
||||
[ext_resource path="res://BodyParts/Arm.tscn" type="PackedScene" id=1]
|
||||
[ext_resource path="res://UI/UI.tscn" type="PackedScene" id=2]
|
||||
[ext_resource path="res://BodyParts/BodyBase/BodyBase.tscn" type="PackedScene" id=3]
|
||||
[ext_resource path="res://Ingame/Ingame.gd" type="Script" id=4]
|
||||
[ext_resource path="res://Ingame/Arena.tscn" type="PackedScene" id=5]
|
||||
[ext_resource path="res://Ingame/CameraFocus.gd" type="Script" id=6]
|
||||
[ext_resource path="res://BodyParts/HumanLeg.tscn" type="PackedScene" id=7]
|
||||
|
||||
[node name="InGame" type="Spatial"]
|
||||
script = ExtResource( 4 )
|
||||
@@ -15,37 +12,8 @@ script = ExtResource( 4 )
|
||||
|
||||
[node name="Arena" parent="." instance=ExtResource( 5 )]
|
||||
|
||||
[node name="Torso" parent="." instance=ExtResource( 3 )]
|
||||
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 17.8512, 2, 0 )
|
||||
|
||||
[node name="Torso2" parent="." instance=ExtResource( 3 )]
|
||||
transform = Transform( -1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 2, -10 )
|
||||
|
||||
[node name="HumanLeg" parent="Torso2/DownFrontLeft/Limb" index="0" instance=ExtResource( 7 )]
|
||||
|
||||
[node name="Arm" parent="Torso2/DownFrontRight/Limb" index="0" instance=ExtResource( 1 )]
|
||||
key = 83
|
||||
|
||||
[node name="Arm" parent="Torso2/DownBackRight/Limb" index="0" instance=ExtResource( 1 )]
|
||||
key = 81
|
||||
|
||||
[node name="Arm" parent="Torso2/DownBackLeft/Limb" index="0" instance=ExtResource( 1 )]
|
||||
key = 80
|
||||
|
||||
[node name="CameraFocus" type="Spatial" parent="."]
|
||||
script = ExtResource( 6 )
|
||||
|
||||
[node name="Camera" type="Camera" parent="CameraFocus"]
|
||||
transform = Transform( -4.2222e-08, -0.707107, 0.707107, -1.13133e-08, 0.707107, 0.707107, -1, 2.18557e-08, -3.78552e-08, 19, 17, -2 )
|
||||
|
||||
[editable path="Torso"]
|
||||
|
||||
[editable path="Torso2"]
|
||||
|
||||
[editable path="Torso2/DownFrontLeft"]
|
||||
|
||||
[editable path="Torso2/DownFrontRight"]
|
||||
|
||||
[editable path="Torso2/DownBackRight"]
|
||||
|
||||
[editable path="Torso2/DownBackLeft"]
|
||||
Reference in new issue
Block a user