-
- Downloads
Merge branch 'armem/dev' into armem/resolve-memory-link-in-gui
# Conflicts: # source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp # source/RobotAPI/libraries/armem/CMakeLists.txt # source/RobotAPI/libraries/armem/core/base/CoreSegmentBase.h # source/RobotAPI/libraries/armem_gui/CMakeLists.txt # source/RobotAPI/libraries/armem_gui/instance/sanitize_typename.cpp
No related branches found
No related tags found
Showing
- .gitlab/CODEOWNERS 8 additions, 0 deletions.gitlab/CODEOWNERS
- etc/cmake/Findlibbson-1.0.cmake 48 additions, 0 deletionsetc/cmake/Findlibbson-1.0.cmake
- etc/cmake/Findlibmongoc-1.0 47 additions, 0 deletionsetc/cmake/Findlibmongoc-1.0
- etc/mongocxx/install_mongocxx.sh 40 additions, 0 deletionsetc/mongocxx/install_mongocxx.sh
- etc/mongocxx/mongo-cxx-driver-r3.2.1.tar.gz 0 additions, 0 deletionsetc/mongocxx/mongo-cxx-driver-r3.2.1.tar.gz
- source/RobotAPI/applications/AronCodeGenerator/main.cpp 1 addition, 1 deletionsource/RobotAPI/applications/AronCodeGenerator/main.cpp
- source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp 1 addition, 0 deletions.../armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
- source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.cpp 2 additions, 1 deletion...I/components/armem/server/ExampleMemory/ExampleMemory.cpp
- source/RobotAPI/components/armem/server/ExampleMemory/aron/ExampleData.xml 1 addition, 1 deletion...omponents/armem/server/ExampleMemory/aron/ExampleData.xml
- 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/RobotStateMemory/RobotStateMemory.cpp 0 additions, 1 deletion...onents/armem/server/RobotStateMemory/RobotStateMemory.cpp
- source/RobotAPI/components/armem/server/SkillsMemory/SkillsMemory.cpp 2 additions, 2 deletions...API/components/armem/server/SkillsMemory/SkillsMemory.cpp
- source/RobotAPI/interface/aron/Aron.ice 31 additions, 11 deletionssource/RobotAPI/interface/aron/Aron.ice
- source/RobotAPI/libraries/ArmarXObjects/aron_conversions/objpose.cpp 2 additions, 2 deletions...tAPI/libraries/ArmarXObjects/aron_conversions/objpose.cpp
- source/RobotAPI/libraries/armem/CMakeLists.txt 37 additions, 7 deletionssource/RobotAPI/libraries/armem/CMakeLists.txt
- source/RobotAPI/libraries/armem/core/aron_conversions.cpp 2 additions, 2 deletionssource/RobotAPI/libraries/armem/core/aron_conversions.cpp
- source/RobotAPI/libraries/armem/core/diskmemory/EntityInstance.cpp 22 additions, 75 deletions...botAPI/libraries/armem/core/diskmemory/EntityInstance.cpp
- source/RobotAPI/libraries/armem/core/diskmemory/EntityInstance.h 3 additions, 9 deletions...RobotAPI/libraries/armem/core/diskmemory/EntityInstance.h
- source/RobotAPI/libraries/armem/core/diskmemory/EntitySnapshot.cpp 18 additions, 2 deletions...botAPI/libraries/armem/core/diskmemory/EntitySnapshot.cpp
- source/RobotAPI/libraries/armem/core/diskmemory/ProviderSegment.cpp 25 additions, 2 deletions...otAPI/libraries/armem/core/diskmemory/ProviderSegment.cpp
Loading
Please register or sign in to comment