Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI into armem/ltm/dev
# Conflicts: # source/RobotAPI/libraries/skills/provider/SpecializedSkill.h
No related branches found
No related tags found
Showing
- data/RobotAPI/VariantInfo-RobotAPI.xml 29 additions, 1 deletiondata/RobotAPI/VariantInfo-RobotAPI.xml
- source/RobotAPI/components/armem/server/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/components/armem/server/CMakeLists.txt
- source/RobotAPI/components/armem/server/ReasoningMemory/CMakeLists.txt 28 additions, 0 deletions...PI/components/armem/server/ReasoningMemory/CMakeLists.txt
- source/RobotAPI/components/armem/server/ReasoningMemory/ReasoningMemory.cpp 77 additions, 0 deletions...mponents/armem/server/ReasoningMemory/ReasoningMemory.cpp
- source/RobotAPI/components/armem/server/ReasoningMemory/ReasoningMemory.h 55 additions, 0 deletions...components/armem/server/ReasoningMemory/ReasoningMemory.h
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.cpp 5 additions, 0 deletions...t/NJointControllers/NJointCartesianWaypointController.cpp
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.h 1 addition, 0 deletions...nit/NJointControllers/NJointCartesianWaypointController.h
- source/RobotAPI/gui-plugins/SkillManagerPlugin/CMakeLists.txt 7 additions, 1 deletion...ce/RobotAPI/gui-plugins/SkillManagerPlugin/CMakeLists.txt
- source/RobotAPI/interface/units/RobotUnit/NJointCartesianWaypointController.ice 1 addition, 0 deletions...ace/units/RobotUnit/NJointCartesianWaypointController.ice
- source/RobotAPI/libraries/ArmarXObjects/CMakeLists.txt 4 additions, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/CMakeLists.txt
- source/RobotAPI/libraries/ArmarXObjects/ObjectPoseClient.cpp 21 additions, 3 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectPoseClient.cpp
- source/RobotAPI/libraries/ArmarXObjects/ObjectPoseClient.h 66 additions, 8 deletionssource/RobotAPI/libraries/ArmarXObjects/ObjectPoseClient.h
- source/RobotAPI/libraries/ArmarXObjects/util.cpp 88 additions, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/util.cpp
- source/RobotAPI/libraries/ArmarXObjects/util.h 36 additions, 0 deletionssource/RobotAPI/libraries/ArmarXObjects/util.h
- source/RobotAPI/libraries/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/libraries/CMakeLists.txt
- source/RobotAPI/libraries/armem_reasoning/CMakeLists.txt 25 additions, 0 deletionssource/RobotAPI/libraries/armem_reasoning/CMakeLists.txt
- source/RobotAPI/libraries/armem_reasoning/aron/Anticipation.xml 20 additions, 0 deletions.../RobotAPI/libraries/armem_reasoning/aron/Anticipation.xml
- source/RobotAPI/libraries/armem_reasoning/aron_conversions.cpp 28 additions, 0 deletions...e/RobotAPI/libraries/armem_reasoning/aron_conversions.cpp
- source/RobotAPI/libraries/armem_reasoning/aron_conversions.h 31 additions, 0 deletionssource/RobotAPI/libraries/armem_reasoning/aron_conversions.h
- source/RobotAPI/libraries/armem_reasoning/server/AnticipationSegment.cpp 39 additions, 0 deletions.../libraries/armem_reasoning/server/AnticipationSegment.cpp
Loading
Please register or sign in to comment