Merge remote-tracking branch 'bp/master'

2016-10-19 07:43:46 -07:00
parent 3b8090fcc1 6584bd8a97
commit eda400d14c
18 changed files with 730 additions and 77 deletions
--- a/examples/SharedMemory/SharedMemoryPublic.h
+++ b/examples/SharedMemory/SharedMemoryPublic.h
@@ -7,6 +7,7 @@ enum EnumSharedMemoryClientCommand
 {
    CMD_LOAD_SDF,
 	CMD_LOAD_URDF,
+    CMD_LOAD_BUNNY,
        CMD_SEND_BULLET_DATA_STREAM,
        CMD_CREATE_BOX_COLLISION_SHAPE,
 //      CMD_DELETE_BOX_COLLISION_SHAPE,