Merge branch 'master' of gitlab.com:Simox/simox
Showing
- CMakeLists.txt 1 addition, 1 deletionCMakeLists.txt
- CMakeModules/SimoxConfig.cmake.in 11 additions, 7 deletionsCMakeModules/SimoxConfig.cmake.in
- GraspPlanning/ApproachMovementGenerator.cpp 6 additions, 0 deletionsGraspPlanning/ApproachMovementGenerator.cpp
- GraspPlanning/ApproachMovementGenerator.h 4 additions, 0 deletionsGraspPlanning/ApproachMovementGenerator.h
- GraspPlanning/ApproachMovementSurfaceNormal.cpp 4 additions, 4 deletionsGraspPlanning/ApproachMovementSurfaceNormal.cpp
- GraspPlanning/ApproachMovementSurfaceNormal.h 2 additions, 1 deletionGraspPlanning/ApproachMovementSurfaceNormal.h
- GraspPlanning/CMakeLists.txt 10 additions, 6 deletionsGraspPlanning/CMakeLists.txt
- GraspPlanning/GraspPlanner/GenericGraspPlanner.cpp 8 additions, 1 deletionGraspPlanning/GraspPlanner/GenericGraspPlanner.cpp
- GraspPlanning/GraspPlanner/GenericGraspPlanner.h 3 additions, 1 deletionGraspPlanning/GraspPlanner/GenericGraspPlanner.h
- MotionPlanning/CMakeLists.txt 13 additions, 4 deletionsMotionPlanning/CMakeLists.txt
- SimDynamics/CMakeLists.txt 8 additions, 3 deletionsSimDynamics/CMakeLists.txt
- SimDynamics/DynamicsEngine/BulletEngine/BulletObject.cpp 19 additions, 4 deletionsSimDynamics/DynamicsEngine/BulletEngine/BulletObject.cpp
- SimDynamics/DynamicsEngine/BulletEngine/BulletRobot.cpp 31 additions, 22 deletionsSimDynamics/DynamicsEngine/BulletEngine/BulletRobot.cpp
- SimDynamics/DynamicsEngine/BulletEngine/BulletRobot.h 5 additions, 2 deletionsSimDynamics/DynamicsEngine/BulletEngine/BulletRobot.h
- SimDynamics/DynamicsEngine/DynamicsRobot.cpp 16 additions, 0 deletionsSimDynamics/DynamicsEngine/DynamicsRobot.cpp
- SimDynamics/DynamicsEngine/DynamicsRobot.h 2 additions, 1 deletionSimDynamics/DynamicsEngine/DynamicsRobot.h
- VirtualRobot/BoundingBox.cpp 24 additions, 0 deletionsVirtualRobot/BoundingBox.cpp
- VirtualRobot/BoundingBox.h 2 additions, 0 deletionsVirtualRobot/BoundingBox.h
- VirtualRobot/CMakeLists.txt 29 additions, 16 deletionsVirtualRobot/CMakeLists.txt
- VirtualRobot/EndEffector/EndEffector.cpp 34 additions, 0 deletionsVirtualRobot/EndEffector/EndEffector.cpp
Loading
Please register or sign in to comment