Merge pull request #309 from erwincoumans/master

minor fixes (GL2, preSwapFileNameOut), improved URDF/btMultiBody (work in progress), basic debug drawing for btMultiBody
This commit is contained in:
erwincoumans
2015-01-27 13:33:37 -08:00
45 changed files with 1662 additions and 866 deletions

View File

@@ -43,6 +43,11 @@ static btClock gProfileClock;
#include <Xtl.h>
#else //_XBOX
#include <windows.h>
#if WINVER < 0x0600
ULONGLONG GetTickCount64() { return GetTickCount(); }
#endif
#endif //_XBOX
#include <time.h>