summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--character/fps_controller/fps_controller.gd2
-rw-r--r--character/fps_controller/fps_controller.tscn2
2 files changed, 3 insertions, 1 deletions
diff --git a/character/fps_controller/fps_controller.gd b/character/fps_controller/fps_controller.gd
index a344139..8d5af12 100644
--- a/character/fps_controller/fps_controller.gd
+++ b/character/fps_controller/fps_controller.gd
@@ -54,7 +54,7 @@ func handle_movement():
velocity.y += gravity
if velocity.y < term_velocity:
velocity.y = term_velocity
- velocity = move_and_slide_with_snap(velocity, Vector3.DOWN, Vector3.UP, true, 4, PI/4, false)
+ velocity = move_and_slide_with_snap(velocity, Vector3.DOWN if velocity.y <= 0.0 else Vector3.ZERO, Vector3.UP, true, 4, PI/4, false)
func _input(event):
#Handle mouse movement for camera
diff --git a/character/fps_controller/fps_controller.tscn b/character/fps_controller/fps_controller.tscn
index d878068..1472f15 100644
--- a/character/fps_controller/fps_controller.tscn
+++ b/character/fps_controller/fps_controller.tscn
@@ -26,6 +26,8 @@ cast_to = Vector3( 0, 0, -3 )
collision_mask = 2
[node name="ladder_detector" type="Area" parent="."]
+collision_layer = 0
+collision_mask = 16
[node name="CollisionShape" type="CollisionShape" parent="ladder_detector"]
transform = Transform( 1, 0, 0, 0, -1, -8.74228e-08, 0, 8.74228e-08, -1, 0, 0.0169024, -0.58521 )