TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-12 07:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolves merging-order conflicts for the vehicle physics PR, as well as correcting cmake not blacklisting the componentGroup files if TORQUE_EXPERIMENTAL_EC was flipped off.

Browse source
This commit is contained in:
Areloch 2016-06-05 19:17:34 -05:00
commit 3a73344abb
36 changed files with 357 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/physics/physx3/px3Body.h
View file

@ -120,6 +120,8 @@ public:
virtual void findContact(SceneObject **contactObject, VectorF *contactNormal,
Vector<SceneObject*> *outOverlapObjects) const;
virtual void moveKinematicTo(const MatrixF &xfm);
};
#endif // _PX3BODY_H_