Merge branch 'armem/dev' into 'master'
Periodic merge of armem/dev into master See merge request ArmarX/RobotAPI!171
No related branches found
No related tags found
Showing
- .gitlab/CODEOWNERS 8 additions, 0 deletions.gitlab/CODEOWNERS
- CMakeLists.txt 18 additions, 0 deletionsCMakeLists.txt
- etc/cmake/Findlibbson-1.0.cmake 48 additions, 0 deletionsetc/cmake/Findlibbson-1.0.cmake
- etc/cmake/Findlibmongoc-1.0 47 additions, 0 deletionsetc/cmake/Findlibmongoc-1.0
- etc/mongocxx/install_mongocxx.sh 164 additions, 0 deletionsetc/mongocxx/install_mongocxx.sh
- etc/mongocxx/mongo-cxx-driver-r3.2.1.tar.gz 0 additions, 0 deletionsetc/mongocxx/mongo-cxx-driver-r3.2.1.tar.gz
- scenarios/ArMemCore/ArMemCore.scx 8 additions, 0 deletionsscenarios/ArMemCore/ArMemCore.scx
- scenarios/ArMemCore/config/ArVizStorage.cfg 212 additions, 0 deletionsscenarios/ArMemCore/config/ArVizStorage.cfg
- scenarios/ArMemCore/config/DebugObserver.cfg 221 additions, 0 deletionsscenarios/ArMemCore/config/DebugObserver.cfg
- scenarios/ArMemCore/config/MemoryNameSystem.cfg 196 additions, 0 deletionsscenarios/ArMemCore/config/MemoryNameSystem.cfg
- scenarios/ArMemCore/config/RemoteGuiProviderApp.cfg 196 additions, 0 deletionsscenarios/ArMemCore/config/RemoteGuiProviderApp.cfg
- scenarios/ArMemCore/config/global.cfg 4 additions, 0 deletionsscenarios/ArMemCore/config/global.cfg
- scenarios/ArMemExample/config/ExampleMemory.cfg 38 additions, 6 deletionsscenarios/ArMemExample/config/ExampleMemory.cfg
- scenarios/ArMemExample/config/ExampleMemoryClient.cfg 10 additions, 2 deletionsscenarios/ArMemExample/config/ExampleMemoryClient.cfg
- scenarios/ArMemObjectMemory/ArMemObjectMemory.scx 7 additions, 7 deletionsscenarios/ArMemObjectMemory/ArMemObjectMemory.scx
- scenarios/ArMemObjectMemory/config/ObjectMemory.cfg 88 additions, 14 deletionsscenarios/ArMemObjectMemory/config/ObjectMemory.cfg
- scenarios/ArMemObjectMemory/config/ObjectPoseProviderExample.cfg 9 additions, 0 deletions...os/ArMemObjectMemory/config/ObjectPoseProviderExample.cfg
- source/RobotAPI/applications/AronCodeGenerator/main.cpp 1 addition, 1 deletionsource/RobotAPI/applications/AronCodeGenerator/main.cpp
- source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.cpp 17 additions, 6 deletions...ectLocalizerExample/ArticulatedObjectLocalizerExample.cpp
- source/RobotAPI/components/ObjectPoseProviderExample/ObjectPoseProviderExample.cpp 7 additions, 0 deletions...s/ObjectPoseProviderExample/ObjectPoseProviderExample.cpp
Loading
Please register or sign in to comment