Merge branch 'armem/dev' of https://gitlab.com/ArmarX/RobotAPI into armem/dev
# Conflicts: # source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.cpp
No related branches found
No related tags found
Showing
- scenarios/ArMemObjectMemory/config/ObjectMemory.cfg 18 additions, 2 deletionsscenarios/ArMemObjectMemory/config/ObjectMemory.cfg
- source/RobotAPI/components/ArViz/CMakeLists.txt 3 additions, 0 deletionssource/RobotAPI/components/ArViz/CMakeLists.txt
- source/RobotAPI/components/ArViz/Client/drawer/ArVizDrawerBase.cpp 29 additions, 0 deletions...botAPI/components/ArViz/Client/drawer/ArVizDrawerBase.cpp
- source/RobotAPI/components/ArViz/Client/drawer/ArVizDrawerBase.h 62 additions, 0 deletions...RobotAPI/components/ArViz/Client/drawer/ArVizDrawerBase.h
- source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.cpp 10 additions, 12 deletions...onents/armem/server/RobotStateMemory/RobotStateMemory.cpp
- source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp 77 additions, 66 deletions...raries/armem_objects/client/articulated_object/Reader.cpp
- source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.cpp 1 addition, 1 deletion...raries/armem_objects/client/articulated_object/Writer.cpp
- source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.h 1 addition, 1 deletion...ibraries/armem_objects/client/articulated_object/Writer.h
- source/RobotAPI/libraries/armem_objects/server/instance/Segment.h 2 additions, 1 deletion...obotAPI/libraries/armem_objects/server/instance/Segment.h
- source/RobotAPI/libraries/armem_robot/robot_conversions.cpp 3 additions, 3 deletionssource/RobotAPI/libraries/armem_robot/robot_conversions.cpp
- source/RobotAPI/libraries/armem_robot_state/server/localization/Segment.cpp 19 additions, 13 deletions...braries/armem_robot_state/server/localization/Segment.cpp
Loading
Please register or sign in to comment