summaryrefslogtreecommitdiff
path: root/scene/3d
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2017-11-09 17:58:32 -0300
committerJuan Linietsky <reduzio@gmail.com>2017-11-09 17:58:32 -0300
commit9e6f9742f4443b0fdb7593ea1fc1b3a7dd46409c (patch)
tree3bb91ec03e5be540e607306766f2dbfa7aec58c5 /scene/3d
parent0416ca2fd22506689cd93e00fe6bd61e4e0841d1 (diff)
adjust min stop to horizontal velocity
Diffstat (limited to 'scene/3d')
-rw-r--r--scene/3d/physics_body.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp
index 362421a534..bc089e5b41 100644
--- a/scene/3d/physics_body.cpp
+++ b/scene/3d/physics_body.cpp
@@ -995,7 +995,7 @@ Vector3 KinematicBody::move_and_slide(const Vector3 &p_linear_velocity, const Ve
Transform gt = get_global_transform();
gt.origin -= collision.travel;
set_global_transform(gt);
- return Vector3();
+ return floor_velocity;
}
} else if (collision.normal.dot(-p_floor_direction) >= Math::cos(p_floor_max_angle)) { //ceiling
on_ceiling = true;