diff --git a/Player.gd b/Player.gd index 04410b2..faa16d3 100644 --- a/Player.gd +++ b/Player.gd @@ -118,15 +118,10 @@ func _physics_process(delta): AudioMegaSlap.play() else: isSlap = false; - - if isSlap: - if slap >= slapkill: - AudioMegaSlap.play() - else: - AudioSlap.play() - hitbox.monitorable = true - hitbox.slap_level = slap - hitbox.slap_vector = point_to.get_global_transform().origin - camera.get_global_transform().origin + AudioSlap.play() + hitbox.monitorable = true + hitbox.slap_level = slap + hitbox.slap_vector = point_to.get_global_transform().origin - camera.get_global_transform().origin if (chargeSlap): slap += delta * 1.5; diff --git a/Player.tscn b/Player.tscn index 8150fd6..3f65003 100644 --- a/Player.tscn +++ b/Player.tscn @@ -22,7 +22,6 @@ height = 3.0 extents = Vector3( 0.797679, 1, 1 ) [sub_resource type="SpatialMaterial" id=4] -flags_no_depth_test = true albedo_texture = ExtResource( 3 ) uv1_triplanar = true diff --git a/project.godot b/project.godot index 6f142cb..a6517de 100644 --- a/project.godot +++ b/project.godot @@ -91,18 +91,6 @@ escape={ "events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } -crouch={ -"deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777238,"physical_scancode":0,"unicode":0,"echo":false,"script":null) - ] -} - -[layer_names] - -3d_render/layer_1="world" -3d_render/layer_2="hitboxes" -3d_physics/layer_1="world" -3d_physics/layer_2="hitboxes" [physics]