Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

a8d377d1

Commit a8d377d1 authored 8 years ago by Mirko Wächter

Downloads
- Plain Diff

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

parents 6d4f496b 2b736571

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

VirtualRobot/CMakeLists.txt 19 additions, 18 deletions

VirtualRobot/CMakeLists.txt
VirtualRobot/EndEffector/EndEffector.cpp 5 additions, 0 deletions

VirtualRobot/EndEffector/EndEffector.cpp
VirtualRobot/IK/ConstrainedIK.cpp 1 addition, 1 deletion

VirtualRobot/IK/ConstrainedIK.cpp
VirtualRobot/IK/constraints/JointLimitAvoidanceConstraint.cpp 3 additions, 3 deletions

...ualRobot/IK/constraints/JointLimitAvoidanceConstraint.cpp
VirtualRobot/IK/constraints/PoseConstraint.cpp 4 additions, 1 deletion

VirtualRobot/IK/constraints/PoseConstraint.cpp
VirtualRobot/IK/constraints/TSRConstraint.cpp 1 addition, 1 deletion

VirtualRobot/IK/constraints/TSRConstraint.cpp
VirtualRobot/ManipulationObject.cpp 1 addition, 1 deletion

VirtualRobot/ManipulationObject.cpp
VirtualRobot/SceneObject.cpp 2 additions, 0 deletions

VirtualRobot/SceneObject.cpp
VirtualRobot/Visualization/VisualizationFactory.h 1 addition, 1 deletion

VirtualRobot/Visualization/VisualizationFactory.h
config.cmake 1 addition, 1 deletion

config.cmake

with 38 additions and 27 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