Merge branch 'master' into...
Merge branch 'master' into 54-armem-servers-viewer-add-general-framework-to-allow-visualization-and-other-operations-triggered # Conflicts: # source/RobotAPI/libraries/armem_gui/MemoryViewer.cpp # source/RobotAPI/libraries/armem_gui/instance/InstanceView.cpp
No related branches found
No related tags found
Showing
- scenarios/ArMemCore/config/ArVizStorage.cfg 1 addition, 1 deletionscenarios/ArMemCore/config/ArVizStorage.cfg
- scenarios/ArMemCore/config/DebugObserver.cfg 1 addition, 1 deletionscenarios/ArMemCore/config/DebugObserver.cfg
- scenarios/ArMemCore/config/MemoryNameSystem.cfg 1 addition, 1 deletionscenarios/ArMemCore/config/MemoryNameSystem.cfg
- scenarios/ArMemCore/config/RemoteGuiProviderApp.cfg 1 addition, 1 deletionscenarios/ArMemCore/config/RemoteGuiProviderApp.cfg
- scenarios/ArMemExample/config/DebugObserver.cfg 1 addition, 1 deletionscenarios/ArMemExample/config/DebugObserver.cfg
- scenarios/ArMemExample/config/ExampleMemory.cfg 12 additions, 4 deletionsscenarios/ArMemExample/config/ExampleMemory.cfg
- scenarios/ArMemExample/config/ExampleMemoryClient.cfg 2 additions, 2 deletionsscenarios/ArMemExample/config/ExampleMemoryClient.cfg
- scenarios/ArMemExample/config/MemoryNameSystem.cfg 1 addition, 1 deletionscenarios/ArMemExample/config/MemoryNameSystem.cfg
- scenarios/ArMemExample/config/RemoteGuiProviderApp.cfg 1 addition, 1 deletionscenarios/ArMemExample/config/RemoteGuiProviderApp.cfg
- scenarios/ArVizExample/config/ArVizExample.cfg 8 additions, 0 deletionsscenarios/ArVizExample/config/ArVizExample.cfg
- scenarios/ArVizInteractExample/ArVizInteractExample.scx 7 additions, 0 deletionsscenarios/ArVizInteractExample/ArVizInteractExample.scx
- scenarios/ArVizInteractExample/config/ArVizInteractExample.cfg 204 additions, 0 deletions...rios/ArVizInteractExample/config/ArVizInteractExample.cfg
- scenarios/ArVizInteractExample/config/ArVizStorage.cfg 212 additions, 0 deletionsscenarios/ArVizInteractExample/config/ArVizStorage.cfg
- scenarios/ArVizInteractExample/config/DebugObserver.cfg 221 additions, 0 deletionsscenarios/ArVizInteractExample/config/DebugObserver.cfg
- scenarios/ArVizInteractExample/config/global.cfg 4 additions, 0 deletionsscenarios/ArVizInteractExample/config/global.cfg
- source/RobotAPI/components/ArViz/ArVizStorage.cpp 16 additions, 2 deletionssource/RobotAPI/components/ArViz/ArVizStorage.cpp
- source/RobotAPI/components/ArViz/Coin/Visualizer.cpp 15 additions, 5 deletionssource/RobotAPI/components/ArViz/Coin/Visualizer.cpp
- source/RobotAPI/components/ArViz/Example/ArVizInteractExample.cpp 47 additions, 17 deletions...obotAPI/components/ArViz/Example/ArVizInteractExample.cpp
- source/RobotAPI/components/CMakeLists.txt 1 addition, 4 deletionssource/RobotAPI/components/CMakeLists.txt
- source/RobotAPI/components/SkillObserver/CMakeLists.txt 0 additions, 15 deletionssource/RobotAPI/components/SkillObserver/CMakeLists.txt
Loading
Please register or sign in to comment