Merge branch 'master' of https://gitlab.hexaquo.at/ggjg20/bodypartfighter
This commit is contained in:
commit
f7cc3b8ddf
9 files changed
+96
-26
No files matched your search
@@ -11,10 +11,14 @@ var current_angle : float
|
||||
func on_ingame():
|
||||
ground = get_parent().get_node("Arena").get_node("ground")
|
||||
ingame = true
|
||||
axis_lock_linear_x = true
|
||||
|
||||
|
||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
||||
func _process(delta):
|
||||
if ingame:
|
||||
current_angle = translation.angle_to(ground.translation)
|
||||
print(current_angle)
|
||||
current_angle = ((-transform.basis.z).angle_to(ground.transform.basis.y))
|
||||
|
||||
var rot_vector = (-transform.basis.z).cross(ground.transform.basis.y)
|
||||
|
||||
if current_angle > 0.2:
|
||||
apply_torque_impulse(rot_vector * current_angle * 14)
|
||||
@@ -12,6 +12,8 @@ height = 1.48749
|
||||
"Player",
|
||||
]]
|
||||
transform = Transform( 1, 0, 0, 0, -1.62921e-07, -1, 0, 1, -1.62921e-07, 0, 0, 0 )
|
||||
mass = 1.5
|
||||
gravity_scale = 1.5
|
||||
script = ExtResource( 1 )
|
||||
|
||||
[node name="TorsoCollider" type="CollisionShape" parent="."]
|
||||
|
||||
@@ -22,7 +22,7 @@ func action():
|
||||
func push(body):
|
||||
# We multiply by 0.1 because we only want it to spin slightly, it should mostly go up
|
||||
var offset = transform.basis.xform(Vector3.ZERO) #transform.basis.xform(touch_area.global_transform.origin - base.global_transform.origin) * 0.5
|
||||
var direction = (base.transform.basis.y - base.transform.basis.z).normalized() * 5.0
|
||||
var direction = (base.transform.basis.y - base.transform.basis.z).normalized() * 10.0
|
||||
|
||||
base.apply_impulse(offset, direction)
|
||||
|
||||
|
||||
Reference in new issue
Block a user