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
This commit is part of merge request !327. Comments created here will be created in the context of that merge request.
Showing
- scenarios/ArMemExample/config/ExampleMemory.cfg 3 additions, 106 deletionsscenarios/ArMemExample/config/ExampleMemory.cfg
- scenarios/SkillProviderTest/config/SkillsMemory.cfg 3 additions, 106 deletionsscenarios/SkillProviderTest/config/SkillsMemory.cfg
- source/RobotAPI/components/ArViz/Client/Elements.cpp 2 additions, 2 deletionssource/RobotAPI/components/ArViz/Client/Elements.cpp
- source/RobotAPI/components/ArViz/Example/ArVizExample.cpp 8 additions, 3 deletionssource/RobotAPI/components/ArViz/Example/ArVizExample.cpp
- source/RobotAPI/components/skills/SkillProviderExample/SkillProviderExample.cpp 2 additions, 0 deletions...ents/skills/SkillProviderExample/SkillProviderExample.cpp
- source/RobotAPI/components/skills/SkillProviderExample/aron/HelloWorldAcceptedType.xml 28 additions, 0 deletions...ills/SkillProviderExample/aron/HelloWorldAcceptedType.xml
- source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleLogging.cpp 416 additions, 386 deletions...its/RobotUnit/RobotUnitModules/RobotUnitModuleLogging.cpp
- source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleLogging.h 13 additions, 1 deletion...units/RobotUnit/RobotUnitModules/RobotUnitModuleLogging.h
- source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModulePublisher.cpp 4 additions, 0 deletions...s/RobotUnit/RobotUnitModules/RobotUnitModulePublisher.cpp
- source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.cpp 4 additions, 0 deletions...onents/units/RobotUnit/util/ControlThreadOutputBuffer.cpp
- source/RobotAPI/gui-plugins/SkillManagerPlugin/CMakeLists.txt 22 additions, 11 deletions...ce/RobotAPI/gui-plugins/SkillManagerPlugin/CMakeLists.txt
- source/RobotAPI/gui-plugins/SkillManagerPlugin/ColorPalettes.cpp 32 additions, 0 deletions...RobotAPI/gui-plugins/SkillManagerPlugin/ColorPalettes.cpp
- source/RobotAPI/gui-plugins/SkillManagerPlugin/ColorPalettes.h 11 additions, 0 deletions...e/RobotAPI/gui-plugins/SkillManagerPlugin/ColorPalettes.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui 150 additions, 108 deletions...i-plugins/SkillManagerPlugin/SkillManagerMonitorWidget.ui
- source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.cpp 143 additions, 105 deletions...killManagerPlugin/SkillManagerMonitorWidgetController.cpp
- source/RobotAPI/gui-plugins/SkillManagerPlugin/SkillManagerMonitorWidgetController.h 13 additions, 11 deletions.../SkillManagerPlugin/SkillManagerMonitorWidgetController.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/TODO 3 additions, 0 deletionssource/RobotAPI/gui-plugins/SkillManagerPlugin/TODO
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetController.cpp 119 additions, 16 deletions...ManagerPlugin/aronTreeWidget/AronTreeWidgetController.cpp
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetController.h 27 additions, 9 deletions...llManagerPlugin/aronTreeWidget/AronTreeWidgetController.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetItem.cpp 182 additions, 9 deletions.../SkillManagerPlugin/aronTreeWidget/AronTreeWidgetItem.cpp
Loading
Please register or sign in to comment