Merge branch 'master' of gitlab.com:ArmarX/RobotAPI
# Conflicts: # source/RobotAPI/libraries/armem/mns/ClientPlugin.cpp # source/RobotAPI/libraries/armem/mns/ClientPlugin.h
No related branches found
No related tags found
Showing
- source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp 2 additions, 5 deletions...omponents/armem/ArMemExampleClient/ArMemExampleClient.cpp
- source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.h 0 additions, 7 deletions.../components/armem/ArMemExampleClient/ArMemExampleClient.h
- source/RobotAPI/components/armem/ArMemExampleClient/CMakeLists.txt 1 addition, 4 deletions...botAPI/components/armem/ArMemExampleClient/CMakeLists.txt
- source/RobotAPI/components/units/SpeechObserver.cpp 0 additions, 2 deletionssource/RobotAPI/components/units/SpeechObserver.cpp
- source/RobotAPI/components/units/SpeechObserver.h 1 addition, 1 deletionsource/RobotAPI/components/units/SpeechObserver.h
- source/RobotAPI/libraries/armem/client/ComponentPlugin.h 4 additions, 2 deletionssource/RobotAPI/libraries/armem/client/ComponentPlugin.h
- source/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h 1 addition, 0 deletions...e/RobotAPI/libraries/armem/client/ReaderComponentPlugin.h
- source/RobotAPI/libraries/armem/client/Writer.cpp 34 additions, 0 deletionssource/RobotAPI/libraries/armem/client/Writer.cpp
- source/RobotAPI/libraries/armem/client/Writer.h 5 additions, 0 deletionssource/RobotAPI/libraries/armem/client/Writer.h
- source/RobotAPI/libraries/armem/client/WriterComponentPlugin.cpp 1 addition, 0 deletions...RobotAPI/libraries/armem/client/WriterComponentPlugin.cpp
- source/RobotAPI/libraries/armem/client/WriterComponentPlugin.h 1 addition, 0 deletions...e/RobotAPI/libraries/armem/client/WriterComponentPlugin.h
- source/RobotAPI/libraries/armem/core/EntityInstance.cpp 1 addition, 1 deletionsource/RobotAPI/libraries/armem/core/EntityInstance.cpp
- source/RobotAPI/libraries/armem/core/EntitySnapshot.cpp 25 additions, 0 deletionssource/RobotAPI/libraries/armem/core/EntitySnapshot.cpp
- source/RobotAPI/libraries/armem/core/EntitySnapshot.h 10 additions, 0 deletionssource/RobotAPI/libraries/armem/core/EntitySnapshot.h
- source/RobotAPI/libraries/armem/core/MemoryID.cpp 21 additions, 3 deletionssource/RobotAPI/libraries/armem/core/MemoryID.cpp
- source/RobotAPI/libraries/armem/core/MemoryID.h 2 additions, 0 deletionssource/RobotAPI/libraries/armem/core/MemoryID.h
- source/RobotAPI/libraries/armem/core/io/DiskReader/DiskReader.cpp 43 additions, 12 deletions...obotAPI/libraries/armem/core/io/DiskReader/DiskReader.cpp
- source/RobotAPI/libraries/armem/core/io/DiskReader/DiskReader.h 8 additions, 2 deletions.../RobotAPI/libraries/armem/core/io/DiskReader/DiskReader.h
- source/RobotAPI/libraries/armem/core/io/DiskReader/NlohmannJSONDiskReader/NlohmannJSONDiskReader.cpp 4 additions, 4 deletions...kReader/NlohmannJSONDiskReader/NlohmannJSONDiskReader.cpp
- source/RobotAPI/libraries/armem/core/io/DiskReader/NlohmannJSONDiskReader/NlohmannJSONDiskReader.h 2 additions, 2 deletions...iskReader/NlohmannJSONDiskReader/NlohmannJSONDiskReader.h
Loading
Please register or sign in to comment