Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
This commit is contained in:
commit
d6d2240540
19 files changed
+61
-21
No files matched your search
@@ -17,9 +17,9 @@ material/0 = null
|
||||
[node name="OmniLight" type="OmniLight" parent="."]
|
||||
transform = Transform( 1, 3.12639e-13, -1.77715e-26, -3.12639e-13, 1, -5.68434e-14, 0, 5.68434e-14, 1, 0, 0, -1.5 )
|
||||
visible = false
|
||||
light_color = Color( 0.956863, 0.121569, 0.121569, 1 )
|
||||
light_energy = 3.86
|
||||
omni_range = 1.8
|
||||
light_color = Color( 0, 0.188235, 0.756863, 1 )
|
||||
light_energy = 10.0
|
||||
omni_range = 2.0
|
||||
|
||||
[node name="Area" type="Area" parent="."]
|
||||
|
||||
|
||||
@@ -20,14 +20,11 @@ func _physics_process(delta):
|
||||
|
||||
var rot_vector = (-transform.basis.z).cross(ground.transform.basis.y)
|
||||
|
||||
if current_angle > 0.3:
|
||||
apply_torque_impulse(rot_vector * current_angle * 7)
|
||||
elif current_angle > 0.05:
|
||||
apply_torque_impulse(-(rot_vector * current_angle * 20))
|
||||
else:
|
||||
for body in get_colliding_bodies():
|
||||
if body.name == "StaticBody":
|
||||
for body in get_colliding_bodies():
|
||||
if body.name == "StaticBody":
|
||||
if current_angle > 0.3:
|
||||
apply_torque_impulse(rot_vector * current_angle * 7)
|
||||
elif current_angle > 0.05:
|
||||
apply_torque_impulse(-(rot_vector * current_angle * 20))
|
||||
else:
|
||||
angular_velocity = Vector3.ZERO
|
||||
|
||||
print("deg: %s" % rad2deg(current_angle))
|
||||
print("rad: %s" % current_angle)
|
||||
@@ -71,6 +71,10 @@ transform = Transform( -0.870723, -0.384569, -0.26555, 1.84307e-07, -0.573576, 0
|
||||
key = 87
|
||||
id = 8
|
||||
|
||||
[node name="Head" parent="." instance=ExtResource( 2 )]
|
||||
transform = Transform( -0.986155, 3.25841e-07, 0, -3.2133e-07, -1, 0, 0, 0, 0.986155, 0, 0, -3.63054 )
|
||||
key = 87
|
||||
|
||||
[node name="Torso" parent="." instance=ExtResource( 3 )]
|
||||
transform = Transform( 0.5, 0, 0, 0, -2.18557e-08, 0.5, 0, -0.5, -2.18557e-08, 0, 0, 0 )
|
||||
|
||||
|
||||
Reference in new issue
Block a user