Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

54a59b6b

Commit 54a59b6b authored 5 years ago by Mirko Wächter

Downloads
- Plain Diff

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

parents e05104f5 2273db53

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

VirtualRobot/CollisionDetection/CollisionModel.h 8 additions, 0 deletions

VirtualRobot/CollisionDetection/CollisionModel.h
VirtualRobot/Grasping/Grasp.h 1 addition, 1 deletion

VirtualRobot/Grasping/Grasp.h
VirtualRobot/Import/MeshImport/AssimpReader.cpp 80 additions, 52 deletions

VirtualRobot/Import/MeshImport/AssimpReader.cpp
VirtualRobot/Import/MeshImport/AssimpReader.h 25 additions, 16 deletions

VirtualRobot/Import/MeshImport/AssimpReader.h
VirtualRobot/Visualization/CoinVisualization/CoinVisualizationFactory.cpp 7 additions, 8 deletions

...ualization/CoinVisualization/CoinVisualizationFactory.cpp
VirtualRobot/XML/ObjectIO.h 4 additions, 0 deletions

VirtualRobot/XML/ObjectIO.h

with 125 additions and 77 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