Merge remote-tracking branch 'origin/master' into...
Merge remote-tracking branch 'origin/master' into 72-add-gui-actions-to-grasp-memory-to-visualize-grasps
No related branches found
No related tags found
Showing
- source/RobotAPI/components/ArViz/ArVizStorage.cpp 4 additions, 4 deletionssource/RobotAPI/components/ArViz/ArVizStorage.cpp
- source/RobotAPI/components/ArViz/ArVizStorage.h 2 additions, 2 deletionssource/RobotAPI/components/ArViz/ArVizStorage.h
- source/RobotAPI/components/ArViz/Coin/VisualizationObject.cpp 2 additions, 2 deletions...ce/RobotAPI/components/ArViz/Coin/VisualizationObject.cpp
- source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp 26 additions, 0 deletions.../armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
- source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.h 2 additions, 1 deletion...ts/armem/client/ExampleMemoryClient/ExampleMemoryClient.h
- source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.cpp 8 additions, 10 deletions...I/components/armem/server/ExampleMemory/ExampleMemory.cpp
- source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.h 0 additions, 2 deletions...API/components/armem/server/ExampleMemory/ExampleMemory.h
- source/RobotAPI/components/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp 1 addition, 1 deletion...nts/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp
- source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp 4 additions, 12 deletions...API/components/armem/server/ObjectMemory/ObjectMemory.cpp
- source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.h 0 additions, 1 deletion...otAPI/components/armem/server/ObjectMemory/ObjectMemory.h
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp 6 additions, 0 deletions...s/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.cpp
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h 1 addition, 1 deletion...ins/ArMemMemoryViewer/ArMemMemoryViewerWidgetController.h
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/CMakeLists.txt 4 additions, 2 deletionssource/RobotAPI/gui-plugins/ArMemMemoryViewer/CMakeLists.txt
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/icons.qrc 7 additions, 0 deletionssource/RobotAPI/gui-plugins/ArMemMemoryViewer/icons.qrc
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/icons/memory-128.png 0 additions, 0 deletions...botAPI/gui-plugins/ArMemMemoryViewer/icons/memory-128.png
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/icons/memory-256.png 0 additions, 0 deletions...botAPI/gui-plugins/ArMemMemoryViewer/icons/memory-256.png
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/icons/memory-64.png 0 additions, 0 deletions...obotAPI/gui-plugins/ArMemMemoryViewer/icons/memory-64.png
- source/RobotAPI/gui-plugins/ArMemMemoryViewer/icons/memory.svg 84 additions, 0 deletions...e/RobotAPI/gui-plugins/ArMemMemoryViewer/icons/memory.svg
- source/RobotAPI/interface/armem/server/PredictingMemoryInterface.ice 1 addition, 1 deletion...tAPI/interface/armem/server/PredictingMemoryInterface.ice
- source/RobotAPI/libraries/ArmarXObjects/predictions.cpp 1 addition, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/predictions.cpp
Loading
Please register or sign in to comment