summaryrefslogtreecommitdiffstats
path: root/character
diff options
context:
space:
mode:
authordusoleil <howcansocksbereal@gmail.com>2022-09-16 03:11:11 -0400
committerdusoleil <howcansocksbereal@gmail.com>2022-09-16 03:11:11 -0400
commitbdf007968b86af4fbfc908251ea078158fe07d6f (patch)
tree759db74ff3fef5054fb428ba3a439d22d6b55448 /character
parent5a1d6a890d06f3d98cf0027c435ae23693cb81ae (diff)
parentd3ff9ce9ee3b4aff95e1cfbf74cd246d4cbc9f04 (diff)
downloadgodot_wildjam_49-bdf007968b86af4fbfc908251ea078158fe07d6f.tar.gz
godot_wildjam_49-bdf007968b86af4fbfc908251ea078158fe07d6f.zip
Merge branch 'ship-development' into mika-pr
Diffstat (limited to 'character')
-rw-r--r--character/fps_controller/fps_controller.tscn3
1 files changed, 2 insertions, 1 deletions
diff --git a/character/fps_controller/fps_controller.tscn b/character/fps_controller/fps_controller.tscn
index 1472f15..b1d9cdf 100644
--- a/character/fps_controller/fps_controller.tscn
+++ b/character/fps_controller/fps_controller.tscn
@@ -8,6 +8,7 @@ height = 2.0
[sub_resource type="CapsuleShape" id=2]
radius = 0.374691
+height = 0.0688557
[node name="fps_controller" type="KinematicBody"]
collision_mask = 20
@@ -30,7 +31,7 @@ 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 )
+transform = Transform( 1, 0, 0, 0, -1, -8.74228e-08, 0, 8.74228e-08, -1, 0, 0.0169024, -0.28562 )
shape = SubResource( 2 )
[connection signal="body_entered" from="ladder_detector" to="." method="_on_ladder_detector_body_entered"]