Merge branch 'armem/dev' into 'master'
armem/dev See merge request ArmarX/RobotAPI!235
Showing
- source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.cpp 3 additions, 2 deletions...I/components/armem/server/ExampleMemory/ExampleMemory.cpp
- 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 1 addition, 1 deletion...API/components/armem/server/ObjectMemory/ObjectMemory.cpp
- 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/libraries/armem/client/MemoryNameSystem.cpp 4 additions, 1 deletionsource/RobotAPI/libraries/armem/client/MemoryNameSystem.cpp
- source/RobotAPI/libraries/armem/client/Query.cpp 1 addition, 1 deletionsource/RobotAPI/libraries/armem/client/Query.cpp
- source/RobotAPI/libraries/armem/client/plugins/ListeningPlugin.cpp 2 additions, 1 deletion...botAPI/libraries/armem/client/plugins/ListeningPlugin.cpp
- source/RobotAPI/libraries/armem/client/plugins/ListeningPluginUser.cpp 0 additions, 1 deletion...PI/libraries/armem/client/plugins/ListeningPluginUser.cpp
- source/RobotAPI/libraries/armem/client/query/selectors.cpp 1 addition, 1 deletionsource/RobotAPI/libraries/armem/client/query/selectors.cpp
- source/RobotAPI/libraries/armem/client/util/MemoryListener.cpp 22 additions, 3 deletions...e/RobotAPI/libraries/armem/client/util/MemoryListener.cpp
- source/RobotAPI/libraries/armem/client/util/MemoryListener.h 15 additions, 1 deletionsource/RobotAPI/libraries/armem/client/util/MemoryListener.h
- source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h 23 additions, 11 deletionssource/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h
- source/RobotAPI/libraries/armem/core/base/EntityBase.h 47 additions, 12 deletionssource/RobotAPI/libraries/armem/core/base/EntityBase.h
Loading
Please register or sign in to comment