Merge branch 'armem/dev' into 'master'
armem/dev => master See merge request ArmarX/RobotAPI!157
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- data/RobotAPI/VariantInfo-RobotAPI.xml 8 additions, 0 deletionsdata/RobotAPI/VariantInfo-RobotAPI.xml
- scenarios/ArMemObjectMemory/ArMemObjectMemory.scx 1 addition, 0 deletionsscenarios/ArMemObjectMemory/ArMemObjectMemory.scx
- scenarios/ArMemObjectMemory/config/ArticulatedObjectExampleMemoryWriterClient.cfg 251 additions, 0 deletions...ory/config/ArticulatedObjectExampleMemoryWriterClient.cfg
- scenarios/ArMemObjectMemory/config/ArticulatedObjectLocalizerExample.cfg 254 additions, 0 deletions...ObjectMemory/config/ArticulatedObjectLocalizerExample.cfg
- scenarios/ArMemObjectMemory/config/ArticulatedObjectStateProviderExample.cfg 204 additions, 0 deletions...ctMemory/config/ArticulatedObjectStateProviderExample.cfg
- scenarios/ArMemObjectMemory/config/ObjectMemory.cfg 113 additions, 5 deletionsscenarios/ArMemObjectMemory/config/ObjectMemory.cfg
- scenarios/RobotSkillsMemory/RobotSkillsMemory.scx 7 additions, 0 deletionsscenarios/RobotSkillsMemory/RobotSkillsMemory.scx
- scenarios/RobotSkillsMemory/config/MemoryNameSystem.cfg 196 additions, 0 deletionsscenarios/RobotSkillsMemory/config/MemoryNameSystem.cfg
- scenarios/RobotSkillsMemory/config/RemoteGuiProviderApp.cfg 196 additions, 0 deletionsscenarios/RobotSkillsMemory/config/RemoteGuiProviderApp.cfg
- scenarios/RobotSkillsMemory/config/SkillsMemory.cfg 262 additions, 0 deletionsscenarios/RobotSkillsMemory/config/SkillsMemory.cfg
- scenarios/RobotSkillsMemory/config/global.cfg 4 additions, 0 deletionsscenarios/RobotSkillsMemory/config/global.cfg
- source/RobotAPI/components/ArViz/Client/Client.h 2 additions, 0 deletionssource/RobotAPI/components/ArViz/Client/Client.h
- source/RobotAPI/components/ArViz/Client/ScopedClient.cpp 1 addition, 0 deletionssource/RobotAPI/components/ArViz/Client/ScopedClient.cpp
- source/RobotAPI/components/ArViz/Client/ScopedClient.h 2 additions, 1 deletionsource/RobotAPI/components/ArViz/Client/ScopedClient.h
- source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.cpp 172 additions, 0 deletions...ectLocalizerExample/ArticulatedObjectLocalizerExample.cpp
- source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.h 81 additions, 0 deletions...bjectLocalizerExample/ArticulatedObjectLocalizerExample.h
- source/RobotAPI/components/ArticulatedObjectLocalizerExample/CMakeLists.txt 25 additions, 0 deletions...mponents/ArticulatedObjectLocalizerExample/CMakeLists.txt
- source/RobotAPI/components/ArticulatedObjectLocalizerExample/test/ArticulatedObjectLocalizerExampleTest.cpp 37 additions, 0 deletions...zerExample/test/ArticulatedObjectLocalizerExampleTest.cpp
- source/RobotAPI/components/ArticulatedObjectLocalizerExample/test/CMakeLists.txt 5 additions, 0 deletions...nts/ArticulatedObjectLocalizerExample/test/CMakeLists.txt
Loading
Please register or sign in to comment