Skip to content
Snippets Groups Projects
Commit ed27bf81 authored by Mirko Wächter's avatar Mirko Wächter
Browse files

Merge branch 'master' of gitlab.com:Simox/simox

parents 0b106747 9fb9970e
No related branches found
No related tags found
No related merge requests found
......@@ -56,8 +56,8 @@ Then proceed with one of the following steps:
### Releasing a new Simox version
1. check out or update the `master' branch
2. icrease the version number X.Y.Z in the file config.cmake
2. increase the version number X.Y.Z in the file config.cmake
3. commit the changed config.cmake file
4. add a tag with 'git tag -a "vX.Y.Z" -m"vX.Y.Z"'
5. push with 'git push --tags'
5. push with 'git push && git push --tags'
6. The H2T jenkins server will automatically build a new simox package
\ No newline at end of file
......@@ -374,6 +374,7 @@ namespace SimDynamics
}
btVector3 btVel = BulletEngine::getVecBullet(force, false);
rigidBody->activate();
rigidBody->applyCentralForce(btVel);
}
......@@ -387,6 +388,7 @@ namespace SimDynamics
}
btVector3 btVel = BulletEngine::getVecBullet(torque, false) * BulletObject::ScaleFactor;
rigidBody->activate();
rigidBody->applyTorque(btVel);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment