Commit c2d61262 authored 3 years ago by Fabian Reister

Merge branch 'master' of gitlab.com:ArmarX/RobotAPI

parents d12ed873 f650efc4

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.cpp 4 additions, 3 deletions

...ectLocalizerExample/ArticulatedObjectLocalizerExample.cpp
source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.h 1 addition, 1 deletion

...bjectLocalizerExample/ArticulatedObjectLocalizerExample.h
source/RobotAPI/components/armem/MemoryNameSystem/CMakeLists.txt 3 additions, 1 deletion

...RobotAPI/components/armem/MemoryNameSystem/CMakeLists.txt
source/RobotAPI/components/armem/MemoryNameSystem/MemoryNameSystem.cpp 12 additions, 16 deletions

...PI/components/armem/MemoryNameSystem/MemoryNameSystem.cpp
source/RobotAPI/components/armem/MemoryNameSystem/MemoryNameSystem.h 12 additions, 32 deletions

...tAPI/components/armem/MemoryNameSystem/MemoryNameSystem.h
source/RobotAPI/components/armem/client/ExampleMemoryClient/CMakeLists.txt 6 additions, 0 deletions

...omponents/armem/client/ExampleMemoryClient/CMakeLists.txt
source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp 78 additions, 28 deletions

.../armem/client/ExampleMemoryClient/ExampleMemoryClient.cpp
source/RobotAPI/components/armem/client/ExampleMemoryClient/ExampleMemoryClient.h 11 additions, 10 deletions

...ts/armem/client/ExampleMemoryClient/ExampleMemoryClient.h
source/RobotAPI/components/armem/client/VirtualRobotReaderExampleClient/VirtualRobotReaderExampleClient.cpp 1 addition, 1 deletion

...otReaderExampleClient/VirtualRobotReaderExampleClient.cpp
source/RobotAPI/components/armem/client/VirtualRobotReaderExampleClient/VirtualRobotReaderExampleClient.h 1 addition, 1 deletion

...obotReaderExampleClient/VirtualRobotReaderExampleClient.h
source/RobotAPI/components/armem/server/ExampleMemory/CMakeLists.txt 0 additions, 1 deletion

...tAPI/components/armem/server/ExampleMemory/CMakeLists.txt
source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.cpp 9 additions, 11 deletions

...I/components/armem/server/ExampleMemory/ExampleMemory.cpp
source/RobotAPI/components/armem/server/ExampleMemory/ExampleMemory.h 3 additions, 7 deletions

...API/components/armem/server/ExampleMemory/ExampleMemory.h
source/RobotAPI/components/armem/server/ExampleMemory/aron/ExampleData.xml 98 additions, 81 deletions

...omponents/armem/server/ExampleMemory/aron/ExampleData.xml
source/RobotAPI/components/armem/server/GeneralPurposeMemory/GeneralPurposeMemory.cpp 6 additions, 9 deletions

...rmem/server/GeneralPurposeMemory/GeneralPurposeMemory.cpp
source/RobotAPI/components/armem/server/GeneralPurposeMemory/GeneralPurposeMemory.h 14 additions, 10 deletions

.../armem/server/GeneralPurposeMemory/GeneralPurposeMemory.h
source/RobotAPI/components/armem/server/MotionMemory/MotionMemory.cpp 9 additions, 11 deletions

...API/components/armem/server/MotionMemory/MotionMemory.cpp
source/RobotAPI/components/armem/server/MotionMemory/MotionMemory.h 5 additions, 4 deletions

...otAPI/components/armem/server/MotionMemory/MotionMemory.h
source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.cpp 13 additions, 17 deletions

...API/components/armem/server/ObjectMemory/ObjectMemory.cpp
source/RobotAPI/components/armem/server/ObjectMemory/ObjectMemory.h 3 additions, 3 deletions

...otAPI/components/armem/server/ObjectMemory/ObjectMemory.h

with 289 additions and 247 deletions

Please register or to comment