Merge branch 'master' into feature/torso-joint-four-bar
# Conflicts: # VirtualRobot/CMakeLists.txt
No related branches found
No related tags found
Showing
- SimoxUtility/json/eigen_conversion.cpp 2 additions, 4 deletionsSimoxUtility/json/eigen_conversion.cpp
- SimoxUtility/json/eigen_conversion.h 64 additions, 6 deletionsSimoxUtility/json/eigen_conversion.h
- SimoxUtility/json/json.hpp 17686 additions, 13323 deletionsSimoxUtility/json/json.hpp
- VirtualRobot/CMakeLists.txt 4 additions, 2 deletionsVirtualRobot/CMakeLists.txt
- VirtualRobot/IK/CompositeDiffIK/CompositeDiffIK.cpp 0 additions, 4 deletionsVirtualRobot/IK/CompositeDiffIK/CompositeDiffIK.cpp
- VirtualRobot/IK/DifferentialIK.cpp 11 additions, 51 deletionsVirtualRobot/IK/DifferentialIK.cpp
- VirtualRobot/Nodes/HemisphereJoint/CachedMaths.cpp 15 additions, 0 deletionsVirtualRobot/Nodes/HemisphereJoint/CachedMaths.cpp
- VirtualRobot/Nodes/HemisphereJoint/CachedMaths.h 34 additions, 0 deletionsVirtualRobot/Nodes/HemisphereJoint/CachedMaths.h
- VirtualRobot/Nodes/HemisphereJoint/Maths.cpp 122 additions, 0 deletionsVirtualRobot/Nodes/HemisphereJoint/Maths.cpp
- VirtualRobot/Nodes/HemisphereJoint/Maths.h 5 additions, 5 deletionsVirtualRobot/Nodes/HemisphereJoint/Maths.h
- VirtualRobot/Nodes/RobotNodeHemisphere.cpp 117 additions, 84 deletionsVirtualRobot/Nodes/RobotNodeHemisphere.cpp
- VirtualRobot/Nodes/RobotNodeHemisphere.h 55 additions, 41 deletionsVirtualRobot/Nodes/RobotNodeHemisphere.h
- VirtualRobot/Nodes/RobotNodeHemisphereFactory.cpp 20 additions, 15 deletionsVirtualRobot/Nodes/RobotNodeHemisphereFactory.cpp
- VirtualRobot/XML/RobotIO.cpp 1 addition, 1 deletionVirtualRobot/XML/RobotIO.cpp
- VirtualRobot/examples/HemisphereJoint/main.cpp 4 additions, 7 deletionsVirtualRobot/examples/HemisphereJoint/main.cpp
Loading
Please register or sign in to comment