Merge branch 'master' of https://github.com/erwincoumans/bullet3

2018-07-08 11:24:37 +02:00
parent 127b82ec1b 2ce1e65b53
commit f8cc33f3a3
19 changed files with 5055 additions and 9 deletions
--- a/examples/SharedMemory/SharedMemoryPublic.h
+++ b/examples/SharedMemory/SharedMemoryPublic.h
@@ -752,6 +752,8 @@ enum eCONNECT_METHOD {
  eCONNECT_GUI_SERVER=7,
  eCONNECT_GUI_MAIN_THREAD=8,
  eCONNECT_SHARED_MEMORY_SERVER=9,
+  eCONNECT_DART=10,
+  eCONNECT_MUJOCO=11,
 };

 enum eURDF_Flags