Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI into aron/dev
# Conflicts: # source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp
No related branches found
No related tags found
Showing
- etc/doxygen/pages/Tutorials.dox 0 additions, 2 deletionsetc/doxygen/pages/Tutorials.dox
- etc/doxygen/pages/tutorials/TutorialMoveRobotWithGui.dox 0 additions, 10 deletionsetc/doxygen/pages/tutorials/TutorialMoveRobotWithGui.dox
- scenarios/ArMemExample/config/ExampleMemory.cfg 0 additions, 16 deletionsscenarios/ArMemExample/config/ExampleMemory.cfg
- scenarios/ArMemExample/config/ExampleMemoryClient.cfg 0 additions, 8 deletionsscenarios/ArMemExample/config/ExampleMemoryClient.cfg
- scenarios/ArMemObjectMemory/ArMemObjectMemory.scx 2 additions, 2 deletionsscenarios/ArMemObjectMemory/ArMemObjectMemory.scx
- scenarios/ArMemObjectMemory/config/ArVizStorage.cfg 2 additions, 2 deletionsscenarios/ArMemObjectMemory/config/ArVizStorage.cfg
- scenarios/ArMemObjectMemory/config/ArticulatedObjectExampleMemoryWriterClient.cfg 0 additions, 251 deletions...ory/config/ArticulatedObjectExampleMemoryWriterClient.cfg
- scenarios/ArMemObjectMemory/config/ArticulatedObjectLocalizerExample.cfg 10 additions, 11 deletions...ObjectMemory/config/ArticulatedObjectLocalizerExample.cfg
- scenarios/ArMemObjectMemory/config/ArticulatedObjectLocalizerExample.instance1.cfg 0 additions, 254 deletions...ry/config/ArticulatedObjectLocalizerExample.instance1.cfg
- scenarios/ArMemObjectMemory/config/DebugObserver.cfg 1 addition, 1 deletionscenarios/ArMemObjectMemory/config/DebugObserver.cfg
- scenarios/ArMemObjectMemory/config/MemoryNameSystem.cfg 1 addition, 1 deletionscenarios/ArMemObjectMemory/config/MemoryNameSystem.cfg
- scenarios/ArMemObjectMemory/config/ObjectMemory.cfg 233 additions, 143 deletionsscenarios/ArMemObjectMemory/config/ObjectMemory.cfg
- scenarios/ArMemObjectMemory/config/ObjectPoseClientExample.cfg 25 additions, 1 deletion...rios/ArMemObjectMemory/config/ObjectPoseClientExample.cfg
- scenarios/ArMemObjectMemory/config/ObjectPoseProviderExample.cfg 1 addition, 1 deletion...os/ArMemObjectMemory/config/ObjectPoseProviderExample.cfg
- scenarios/ArMemObjectMemory/config/RemoteGuiProviderApp.cfg 1 addition, 1 deletionscenarios/ArMemObjectMemory/config/RemoteGuiProviderApp.cfg
- scenarios/ArMemObjectMemory/config/SimpleVirtualRobot.cfg 38 additions, 37 deletionsscenarios/ArMemObjectMemory/config/SimpleVirtualRobot.cfg
- scenarios/ArViz/config/ArVizStorage.cfg 1 addition, 1 deletionscenarios/ArViz/config/ArVizStorage.cfg
- scenarios/ArVizExample/config/ArVizStorage.cfg 1 addition, 1 deletionscenarios/ArVizExample/config/ArVizStorage.cfg
- scenarios/ArmemGraspMemory/ArmemGraspMemory.scx 1 addition, 0 deletionsscenarios/ArmemGraspMemory/ArmemGraspMemory.scx
- scenarios/ArmemGraspMemory/config/DebugObserver.cfg 1 addition, 1 deletionscenarios/ArmemGraspMemory/config/DebugObserver.cfg
Loading
Please register or sign in to comment