diff options
| author | AndreaCatania <info@andreacatania.com> | 2017-10-03 18:49:32 +0200 |
|---|---|---|
| committer | Andrea Catania <info@andreacatania.com> | 2018-05-07 21:03:16 +0200 |
| commit | 9e57a07fb60fcd6c55bd51cf63d4c3cf4c6a3b26 (patch) | |
| tree | ccf404b982a662dfba1c3c5d663ba16b6f7ba2e3 /modules | |
| parent | 8c30337565326f313e398f6428eda5cb17614f14 (diff) | |
Implemented ragdoll
Implementing ragdoll
Implementing ragdoll
Implementing ragdoll
Implementing ragdoll
Implementing ragdoll
a
Implemented implicit hierarchy.
Improved
Added some physics properties
Added bone offset to preserve COM, partially fixed scaling
work in progress
WIP
wip
Implemented Joint Gizmos
Implemented pin joint joint
Implemented all joints
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/bullet/godot_result_callbacks.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/bullet/godot_result_callbacks.cpp b/modules/bullet/godot_result_callbacks.cpp index 1bf259da84..197550d686 100644 --- a/modules/bullet/godot_result_callbacks.cpp +++ b/modules/bullet/godot_result_callbacks.cpp @@ -110,7 +110,7 @@ bool GodotKinClosestConvexResultCallback::needsCollision(btBroadphaseProxy *prox if (gObj->getType() == CollisionObjectBullet::TYPE_AREA) return false; - if (m_self_object->has_collision_exception(gObj)) + if (m_self_object->has_collision_exception(gObj) || gObj->has_collision_exception(m_self_object)) return false; } return true; |