Merge remote-tracking branch 'origin/master' into aron/dev
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/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
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetItem.h 41 additions, 15 deletions...ns/SkillManagerPlugin/aronTreeWidget/AronTreeWidgetItem.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/ListDictHelper.cpp 28 additions, 0 deletions...gins/SkillManagerPlugin/aronTreeWidget/ListDictHelper.cpp
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/ListDictHelper.h 8 additions, 0 deletions...lugins/SkillManagerPlugin/aronTreeWidget/ListDictHelper.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/aronTreeWidget/modal/dict/AronTreeWidgetDictInputModalController.cpp 6 additions, 3 deletions...get/modal/dict/AronTreeWidgetDictInputModalController.cpp
Loading
Please register or sign in to comment