-
- Downloads
Merge branch 'master' into armem/memory
# Conflicts: # source/RobotAPI/components/armem/ArMemExampleClient/ArMemExampleClient.cpp # source/RobotAPI/libraries/armem/component/MemoryComponentPlugin.cpp
Showing
- source/RobotAPI/components/ArViz/Client/Client.h 16 additions, 3 deletionssource/RobotAPI/components/ArViz/Client/Client.h
- source/RobotAPI/components/CMakeLists.txt 1 addition, 1 deletionsource/RobotAPI/components/CMakeLists.txt
- source/RobotAPI/components/DynamicObstacleManager/ManagedObstacle.cpp 1 addition, 0 deletions...API/components/DynamicObstacleManager/ManagedObstacle.cpp
- source/RobotAPI/components/RobotState/RobotStateComponent.cpp 1 addition, 1 deletion...ce/RobotAPI/components/RobotState/RobotStateComponent.cpp
- source/RobotAPI/components/units/ForceTorqueObserver.cpp 1 addition, 1 deletionsource/RobotAPI/components/units/ForceTorqueObserver.cpp
- source/RobotAPI/components/units/GraspCandidateObserver.cpp 15 additions, 3 deletionssource/RobotAPI/components/units/GraspCandidateObserver.cpp
- source/RobotAPI/components/units/GraspCandidateObserver.h 17 additions, 16 deletionssource/RobotAPI/components/units/GraspCandidateObserver.h
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.cpp 0 additions, 3 deletions...t/NJointControllers/NJointCartesianWaypointController.cpp
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointCartesianWaypointController.h 1 addition, 1 deletion...nit/NJointControllers/NJointCartesianWaypointController.h
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.cpp 1 addition, 1 deletion...ts/units/RobotUnit/NJointControllers/NJointController.cpp
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointController.ipp 1 addition, 1 deletion...ts/units/RobotUnit/NJointControllers/NJointController.ipp
- source/RobotAPI/components/units/RobotUnit/NJointControllers/NJointKinematicUnitPassThroughController.h 2 additions, 1 deletion...intControllers/NJointKinematicUnitPassThroughController.h
- source/RobotAPI/components/units/RobotUnit/RobotUnitModules/RobotUnitModuleBase.cpp 2 additions, 2 deletions.../units/RobotUnit/RobotUnitModules/RobotUnitModuleBase.cpp
- source/RobotAPI/components/units/RobotUnit/util/ControlThreadOutputBuffer.h 1 addition, 1 deletion...mponents/units/RobotUnit/util/ControlThreadOutputBuffer.h
- source/RobotAPI/components/units/RobotUnit/util/introspection/ClassMemberInfo.h 1 addition, 1 deletion...ents/units/RobotUnit/util/introspection/ClassMemberInfo.h
- source/RobotAPI/gui-plugins/BoxToGraspCandidates/BoxToGraspCandidatesWidgetController.cpp 41 additions, 23 deletions...oGraspCandidates/BoxToGraspCandidatesWidgetController.cpp
- source/RobotAPI/gui-plugins/BoxToGraspCandidates/BoxToGraspCandidatesWidgetController.h 4 additions, 0 deletions...xToGraspCandidates/BoxToGraspCandidatesWidgetController.h
- source/RobotAPI/gui-plugins/RobotUnitPlugin/CMakeLists.txt 1 addition, 0 deletionssource/RobotAPI/gui-plugins/RobotUnitPlugin/CMakeLists.txt
- source/RobotAPI/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.cpp 1 addition, 1 deletion...PI/gui-plugins/RobotViewerPlugin/RobotViewerGuiPlugin.cpp
- source/RobotAPI/interface/observers/GraspCandidateObserverInterface.ice 1 addition, 0 deletions...I/interface/observers/GraspCandidateObserverInterface.ice
Loading
Please register or sign in to comment