Merge branch 'master' into feat/hand-controls
No related branches found
No related tags found
Showing
- source/RobotAPI/components/armem/server/GraspMemory/GraspMemory.cpp 54 additions, 9 deletions...otAPI/components/armem/server/GraspMemory/GraspMemory.cpp
- source/RobotAPI/components/armem/server/GraspMemory/GraspMemory.h 4 additions, 0 deletions...obotAPI/components/armem/server/GraspMemory/GraspMemory.h
- source/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp 0 additions, 2 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectFinder.cpp
- source/RobotAPI/libraries/RobotUnitDataStreamingReceiver/RobotUnitDataStreamingReceiver.cpp 1 addition, 1 deletion...tDataStreamingReceiver/RobotUnitDataStreamingReceiver.cpp
- source/RobotAPI/libraries/armem/server/ltm/processors/converter/data/image/png/PngConverter.cpp 1 addition, 0 deletions.../ltm/processors/converter/data/image/png/PngConverter.cpp
- source/RobotAPI/libraries/armem_grasping/aron/KnownGraspCandidate.xml 4 additions, 0 deletions...API/libraries/armem_grasping/aron/KnownGraspCandidate.xml
- source/RobotAPI/libraries/armem_grasping/server/KnownGraspProviderSegment.cpp 106 additions, 6 deletions...aries/armem_grasping/server/KnownGraspProviderSegment.cpp
- source/RobotAPI/libraries/armem_grasping/server/KnownGraspProviderSegment.h 4 additions, 0 deletions...braries/armem_grasping/server/KnownGraspProviderSegment.h
- source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectReader.cpp 13 additions, 22 deletions...cts/client/articulated_object/ArticulatedObjectReader.cpp
- source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectWriter.cpp 3 additions, 2 deletions...cts/client/articulated_object/ArticulatedObjectWriter.cpp
- source/RobotAPI/libraries/armem_objects/client/articulated_object/ArticulatedObjectWriter.h 3 additions, 3 deletions...jects/client/articulated_object/ArticulatedObjectWriter.h
- source/RobotAPI/libraries/armem_objects/client/articulated_object/Reader.cpp 14 additions, 9 deletions...raries/armem_objects/client/articulated_object/Reader.cpp
- source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.cpp 15 additions, 6 deletions...raries/armem_objects/client/articulated_object/Writer.cpp
- source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.h 2 additions, 2 deletions...ibraries/armem_objects/client/articulated_object/Writer.h
- source/RobotAPI/libraries/armem_objects/client/articulated_object/interfaces.h 1 addition, 1 deletion...ries/armem_objects/client/articulated_object/interfaces.h
- source/RobotAPI/libraries/armem_objects/server/familiar_object_instance/Segment.cpp 0 additions, 1 deletion...armem_objects/server/familiar_object_instance/Segment.cpp
- source/RobotAPI/libraries/armem_objects/server/familiar_object_instance/Visu.cpp 9 additions, 1 deletion...es/armem_objects/server/familiar_object_instance/Visu.cpp
- source/RobotAPI/libraries/obstacle_avoidance/CollisionModelHelper.cpp 2 additions, 3 deletions...API/libraries/obstacle_avoidance/CollisionModelHelper.cpp
- source/RobotAPI/libraries/skills/core/Skill.cpp 2 additions, 0 deletionssource/RobotAPI/libraries/skills/core/Skill.cpp
- source/RobotAPI/libraries/skills/core/Skill.h 0 additions, 3 deletionssource/RobotAPI/libraries/skills/core/Skill.h
Loading
Please register or sign in to comment