-
- Downloads
Merge branch 'master' into 60-add-joint-type-for-cornelius-joint-mechanism
# Conflicts: # VirtualRobot/Nodes/RobotNode.cpp
No related branches found
No related tags found
Showing
- GraspPlanning/GraspQuality/GraspEvaluationPoseUncertainty.cpp 3 additions, 3 deletions...pPlanning/GraspQuality/GraspEvaluationPoseUncertainty.cpp
- GraspPlanning/GraspQuality/GraspEvaluationPoseUncertainty.h 3 additions, 3 deletionsGraspPlanning/GraspQuality/GraspEvaluationPoseUncertainty.h
- GraspPlanning/examples/GraspPlanner/GraspPlanner.ui 82 additions, 79 deletionsGraspPlanning/examples/GraspPlanner/GraspPlanner.ui
- GraspPlanning/examples/GraspPlanner/GraspPlannerWindow.cpp 39 additions, 1 deletionGraspPlanning/examples/GraspPlanner/GraspPlannerWindow.cpp
- GraspPlanning/examples/GraspPlanner/GraspPlannerWindow.h 3 additions, 2 deletionsGraspPlanning/examples/GraspPlanner/GraspPlannerWindow.h
- SimoxUtility/algorithm/string/string_tools.cpp 19 additions, 0 deletionsSimoxUtility/algorithm/string/string_tools.cpp
- SimoxUtility/algorithm/string/string_tools.h 4 additions, 0 deletionsSimoxUtility/algorithm/string/string_tools.h
- SimoxUtility/filesystem/make_relative.h 2 additions, 2 deletionsSimoxUtility/filesystem/make_relative.h
- SimoxUtility/tests/algorithm/string_tools.cpp 7 additions, 0 deletionsSimoxUtility/tests/algorithm/string_tools.cpp
- SimoxUtility/xml/rapidxml/RapidXMLWrapper.h 105 additions, 31 deletionsSimoxUtility/xml/rapidxml/RapidXMLWrapper.h
- VirtualRobot/CMakeLists.txt 4 additions, 0 deletionsVirtualRobot/CMakeLists.txt
- VirtualRobot/GraspableSensorizedObject.cpp 205 additions, 0 deletionsVirtualRobot/GraspableSensorizedObject.cpp
- VirtualRobot/GraspableSensorizedObject.h 102 additions, 0 deletionsVirtualRobot/GraspableSensorizedObject.h
- VirtualRobot/Grasping/ChainedGrasp.cpp 453 additions, 0 deletionsVirtualRobot/Grasping/ChainedGrasp.cpp
- VirtualRobot/Grasping/ChainedGrasp.h 149 additions, 0 deletionsVirtualRobot/Grasping/ChainedGrasp.h
- VirtualRobot/Grasping/Grasp.cpp 16 additions, 10 deletionsVirtualRobot/Grasping/Grasp.cpp
- VirtualRobot/Grasping/Grasp.h 4 additions, 3 deletionsVirtualRobot/Grasping/Grasp.h
- VirtualRobot/Grasping/GraspEditor/GraspEditor.ui 472 additions, 237 deletionsVirtualRobot/Grasping/GraspEditor/GraspEditor.ui
- VirtualRobot/Grasping/GraspEditor/GraspEditorWindow.cpp 196 additions, 94 deletionsVirtualRobot/Grasping/GraspEditor/GraspEditorWindow.cpp
- VirtualRobot/Grasping/GraspEditor/GraspEditorWindow.h 18 additions, 6 deletionsVirtualRobot/Grasping/GraspEditor/GraspEditorWindow.h
Loading
Please register or sign in to comment