Merge remote-tracking branch 'origin/master' into...
Merge remote-tracking branch 'origin/master' into feature/move-laser-scanner-feature-extraction-to-navigation
No related branches found
No related tags found
Showing
- scenarios/ArMemExample/config/ExampleMemory.cfg 12 additions, 4 deletionsscenarios/ArMemExample/config/ExampleMemory.cfg
- scenarios/RobotSkillsMemory/RobotSkillsMemory.scx 2 additions, 0 deletionsscenarios/RobotSkillsMemory/RobotSkillsMemory.scx
- scenarios/RobotSkillsMemory/config/ArVizStorage.cfg 212 additions, 0 deletionsscenarios/RobotSkillsMemory/config/ArVizStorage.cfg
- scenarios/RobotSkillsMemory/config/DebugObserver.cfg 221 additions, 0 deletionsscenarios/RobotSkillsMemory/config/DebugObserver.cfg
- scenarios/RobotSkillsMemory/config/MemoryNameSystem.cfg 1 addition, 1 deletionscenarios/RobotSkillsMemory/config/MemoryNameSystem.cfg
- scenarios/RobotSkillsMemory/config/RemoteGuiProviderApp.cfg 1 addition, 1 deletionscenarios/RobotSkillsMemory/config/RemoteGuiProviderApp.cfg
- scenarios/RobotSkillsMemory/config/SkillsMemory.cfg 49 additions, 32 deletionsscenarios/RobotSkillsMemory/config/SkillsMemory.cfg
- scenarios/SkillProviderTest/config/SkillsMemory.cfg 12 additions, 4 deletionsscenarios/SkillProviderTest/config/SkillsMemory.cfg
- source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.cpp 8 additions, 2 deletions...ectLocalizerExample/ArticulatedObjectLocalizerExample.cpp
- source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp 1 addition, 1 deletion...API/components/armem/server/ObjectMemory/ObjectMemory.cpp
- source/RobotAPI/components/skills/SkillProviderExample/SkillProviderExample.cpp 18 additions, 0 deletions...ents/skills/SkillProviderExample/SkillProviderExample.cpp
- source/RobotAPI/components/skills/SkillProviderExample/SkillProviderExample.h 4 additions, 7 deletions...onents/skills/SkillProviderExample/SkillProviderExample.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui 18 additions, 4 deletions...i-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui
- source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp 140 additions, 108 deletions...killManagerPlugin/SkillManagerMonitorWidgetController.cpp
- source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.h 9 additions, 12 deletions.../SkillManagerPlugin/SkillManagerMonitorWidgetController.h
- source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.cpp 2 additions, 0 deletions...raries/armem_objects/client/articulated_object/Writer.cpp
- source/RobotAPI/libraries/armem_objects/server/instance/Visu.cpp 11 additions, 0 deletions...RobotAPI/libraries/armem_objects/server/instance/Visu.cpp
- source/RobotAPI/libraries/aron/converter/eigen/EigenConverter.h 2 additions, 2 deletions.../RobotAPI/libraries/aron/converter/eigen/EigenConverter.h
- source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.cpp 102 additions, 28 deletions...ries/aron_component_config/PropertyDefinitionVisitors.cpp
- source/RobotAPI/libraries/aron_component_config/PropertyDefinitionVisitors.h 12 additions, 2 deletions...raries/aron_component_config/PropertyDefinitionVisitors.h
Loading
Please register or sign in to comment