Merge branch 'armem/dev' into 'master'
armem/dev -> master See merge request ArmarX/RobotAPI!140
No related branches found
No related tags found
Showing
- data/RobotAPI/VariantInfo-RobotAPI.xml 8 additions, 8 deletionsdata/RobotAPI/VariantInfo-RobotAPI.xml
- scenarios/ArMemExample/ArMemExample.scx 3 additions, 3 deletionsscenarios/ArMemExample/ArMemExample.scx
- scenarios/ArMemExample/config/ExampleMemory.cfg 74 additions, 58 deletionsscenarios/ArMemExample/config/ExampleMemory.cfg
- scenarios/ArMemExample/config/ExampleMemoryClient.cfg 61 additions, 53 deletionsscenarios/ArMemExample/config/ExampleMemoryClient.cfg
- scenarios/ArMemExample/config/MemoryNameSystem.cfg 35 additions, 35 deletionsscenarios/ArMemExample/config/MemoryNameSystem.cfg
- scenarios/ArMemObjectMemory/ArMemObjectMemory.scx 8 additions, 6 deletionsscenarios/ArMemObjectMemory/ArMemObjectMemory.scx
- scenarios/ArMemObjectMemory/config/ArVizStorage.cfg 0 additions, 0 deletionsscenarios/ArMemObjectMemory/config/ArVizStorage.cfg
- scenarios/ArMemObjectMemory/config/DebugObserver.cfg 0 additions, 0 deletionsscenarios/ArMemObjectMemory/config/DebugObserver.cfg
- scenarios/ArMemObjectMemory/config/MemoryNameSystem.cfg 196 additions, 0 deletionsscenarios/ArMemObjectMemory/config/MemoryNameSystem.cfg
- scenarios/ArMemObjectMemory/config/ObjectMemory.cfg 148 additions, 80 deletionsscenarios/ArMemObjectMemory/config/ObjectMemory.cfg
- scenarios/ArMemObjectMemory/config/ObjectPoseClientExample.cfg 212 additions, 0 deletions...rios/ArMemObjectMemory/config/ObjectPoseClientExample.cfg
- scenarios/ArMemObjectMemory/config/ObjectPoseProviderExample.cfg 1 addition, 1 deletion...os/ArMemObjectMemory/config/ObjectPoseProviderExample.cfg
- scenarios/ArMemObjectMemory/config/RemoteGuiProviderApp.cfg 0 additions, 0 deletionsscenarios/ArMemObjectMemory/config/RemoteGuiProviderApp.cfg
- scenarios/ArMemObjectMemory/config/RobotStateComponent.cfg 0 additions, 0 deletionsscenarios/ArMemObjectMemory/config/RobotStateComponent.cfg
- scenarios/ArMemObjectMemory/config/RobotToArVizApp.cfg 0 additions, 0 deletionsscenarios/ArMemObjectMemory/config/RobotToArVizApp.cfg
- scenarios/ArMemObjectMemory/config/global.cfg 1 addition, 1 deletionscenarios/ArMemObjectMemory/config/global.cfg
- source/RobotAPI/components/ArViz/CMakeLists.txt 3 additions, 0 deletionssource/RobotAPI/components/ArViz/CMakeLists.txt
- source/RobotAPI/components/ArViz/Client/Elements.cpp 9 additions, 0 deletionssource/RobotAPI/components/ArViz/Client/Elements.cpp
- source/RobotAPI/components/ArViz/Client/Elements.h 2 additions, 1 deletionsource/RobotAPI/components/ArViz/Client/Elements.h
- source/RobotAPI/components/CMakeLists.txt 1 addition, 1 deletionsource/RobotAPI/components/CMakeLists.txt
Loading
Please register or sign in to comment