Merge branch 'master' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into...
Merge branch 'master' of https://git.h2t.iar.kit.edu/sw/armarx/robot-api into test/merge-branch-skills-to-master
Showing
- source/RobotAPI/components/ArViz/Client/Elements.cpp 2 additions, 2 deletionssource/RobotAPI/components/ArViz/Client/Elements.cpp
- source/RobotAPI/components/ArViz/Example/ArVizExample.cpp 8 additions, 3 deletionssource/RobotAPI/components/ArViz/Example/ArVizExample.cpp
- source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.cpp 3 additions, 0 deletions...onents/armem/server/RobotStateMemory/RobotStateMemory.cpp
- source/RobotAPI/components/armem/server/RobotStateMemory/RobotStateMemory.h 4 additions, 0 deletions...mponents/armem/server/RobotStateMemory/RobotStateMemory.h
- source/RobotAPI/components/units/HandUnit.h 1 addition, 1 deletionsource/RobotAPI/components/units/HandUnit.h
- source/RobotAPI/interface/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/interface/CMakeLists.txt
- source/RobotAPI/interface/aron/test/AronConversionTestInterface.ice 61 additions, 0 deletions...otAPI/interface/aron/test/AronConversionTestInterface.ice
- source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp 1 addition, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp
- source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp 50 additions, 8 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectInfo.cpp
- source/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h 8 additions, 3 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectInfo.h
- source/RobotAPI/libraries/ArmarXObjects/json_conversions.cpp 2 additions, 1 deletionsource/RobotAPI/libraries/ArmarXObjects/json_conversions.cpp
- source/RobotAPI/libraries/armem/client/util/MemoryListener.h 5 additions, 1 deletionsource/RobotAPI/libraries/armem/client/util/MemoryListener.h
- source/RobotAPI/libraries/armem_laser_scans/client/common/Reader.cpp 69 additions, 55 deletions...tAPI/libraries/armem_laser_scans/client/common/Reader.cpp
- source/RobotAPI/libraries/armem_laser_scans/client/common/Reader.h 2 additions, 1 deletion...botAPI/libraries/armem_laser_scans/client/common/Reader.h
- source/RobotAPI/libraries/armem_laser_scans/server/Visu.cpp 2 additions, 3 deletionssource/RobotAPI/libraries/armem_laser_scans/server/Visu.cpp
- source/RobotAPI/libraries/armem_objects/aron/ObjectClass.xml 16 additions, 0 deletionssource/RobotAPI/libraries/armem_objects/aron/ObjectClass.xml
- source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectReader.cpp 1 addition, 1 deletion...cts/client/articulated_object/ArticulatedObjectReader.cpp
- source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectWriter.cpp 32 additions, 23 deletions...cts/client/articulated_object/ArticulatedObjectWriter.cpp
- source/RobotAPI/libraries/armem_objects/server/class/Segment.cpp 4 additions, 0 deletions...RobotAPI/libraries/armem_objects/server/class/Segment.cpp
- source/RobotAPI/libraries/armem_objects/server/instance/Segment.cpp 12 additions, 4 deletions...otAPI/libraries/armem_objects/server/instance/Segment.cpp
Loading
Please register or sign in to comment