Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Simox
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules

Snippets Groups Projects

239f56dd

Commit 239f56dd authored 7 years ago by Raphael Grimm

Downloads
- Plain Diff

Merge branch 'floorfriction' into 'master'

the friction coefficient of the floor plane can be modified; more meaningful…

See merge request Simox/simox!25

parents 7c62e236 55f9dbb1

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

SimDynamics/DynamicsWorld.cpp 2 additions, 2 deletions

SimDynamics/DynamicsWorld.cpp
SimDynamics/DynamicsWorld.h 1 addition, 1 deletion

SimDynamics/DynamicsWorld.h
VirtualRobot/IK/ConstrainedHierarchicalIK.cpp 10 additions, 3 deletions

VirtualRobot/IK/ConstrainedHierarchicalIK.cpp
VirtualRobot/IK/ConstrainedIK.cpp 2 additions, 0 deletions

VirtualRobot/IK/ConstrainedIK.cpp
VirtualRobot/RobotNodeSet.cpp 3 additions, 1 deletion

VirtualRobot/RobotNodeSet.cpp

with 18 additions and 7 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment