-
- Downloads
Merge remote-tracking branch 'origin/master' into...
Merge remote-tracking branch 'origin/master' into feature/scenario-manager-armarx-package-autodiscovery
Showing
- .gitlab-ci.yml 99 additions, 0 deletions.gitlab-ci.yml
- .gitlab/CODEOWNERS 0 additions, 0 deletions.gitlab/CODEOWNERS
- .gitlab/ci/armarx-workspace.json 17 additions, 0 deletions.gitlab/ci/armarx-workspace.json
- source/ArmarXGui/applications/ArmarXGui/ArmarXGuiApp.cpp 1 addition, 1 deletionsource/ArmarXGui/applications/ArmarXGui/ArmarXGuiApp.cpp
- source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp 2 additions, 1 deletionsource/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
- source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h 1 addition, 0 deletionssource/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h
- source/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.cpp 2 additions, 1 deletion...ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.cpp
- source/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.h 1 addition, 0 deletions...e/ArmarXGui/applications/ArmarXGui/Widgets/ViewerWidget.h
- source/ArmarXGui/gui-plugins/RemoteGuiPlugin/RemoteGuiWidgetController.cpp 5 additions, 0 deletions...gui-plugins/RemoteGuiPlugin/RemoteGuiWidgetController.cpp
- source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.cpp 209 additions, 135 deletions...ugins/ScenarioManager/ScenarioManagerWidgetController.cpp
- source/ArmarXGui/gui-plugins/ScenarioManager/ScenarioManagerWidgetController.h 1 addition, 0 deletions...plugins/ScenarioManager/ScenarioManagerWidgetController.h
- source/ArmarXGui/gui-plugins/ScenarioManager/controller/ScenarioListController.cpp 4 additions, 2 deletions...ins/ScenarioManager/controller/ScenarioListController.cpp
- source/ArmarXGui/gui-plugins/ScenarioManager/controller/SettingsController.cpp 23 additions, 16 deletions...plugins/ScenarioManager/controller/SettingsController.cpp
- source/ArmarXGui/gui-plugins/ScenarioManager/controller/openscenariocontroller.cpp 18 additions, 12 deletions...ins/ScenarioManager/controller/openscenariocontroller.cpp
- source/ArmarXGui/gui-plugins/ScenarioManager/gui/OptionalEdit.cpp 11 additions, 7 deletions...rmarXGui/gui-plugins/ScenarioManager/gui/OptionalEdit.cpp
- source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StatechartEditorController.cpp 311 additions, 144 deletions...ins/StatechartEditorPlugin/StatechartEditorController.cpp
- source/ArmarXGui/gui-plugins/StatechartEditorPlugin/StatechartEditorController.h 1 addition, 1 deletion...ugins/StatechartEditorPlugin/StatechartEditorController.h
- source/ArmarXGui/gui-plugins/StatechartEditorPlugin/io/GroupXmlReader.cpp 46 additions, 30 deletions.../gui-plugins/StatechartEditorPlugin/io/GroupXmlReader.cpp
- source/ArmarXGui/gui-plugins/StatechartEditorPlugin/model/StatechartGroup.cpp 0 additions, 1 deletion...-plugins/StatechartEditorPlugin/model/StatechartGroup.cpp
- source/ArmarXGui/gui-plugins/StatechartEditorPlugin/view/dialogs/StatechartEditorSettingsDialog.cpp 20 additions, 14 deletions...torPlugin/view/dialogs/StatechartEditorSettingsDialog.cpp
Loading
Please register or sign in to comment