Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

6ce3a31c

Commit 6ce3a31c authored 4 years ago by Rainer Kartmann

Downloads
- Plain Diff

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

parents 5cb374ee 8b663e67

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

VirtualRobot/Import/MeshImport/AssimpReader.cpp 20 additions, 0 deletions

VirtualRobot/Import/MeshImport/AssimpReader.cpp
VirtualRobot/Import/MeshImport/AssimpReader.h 1 addition, 0 deletions

VirtualRobot/Import/MeshImport/AssimpReader.h
VirtualRobot/Nodes/RobotNode.cpp 1 addition, 1 deletion

VirtualRobot/Nodes/RobotNode.cpp
VirtualRobot/Nodes/RobotNode.h 16 additions, 0 deletions

VirtualRobot/Nodes/RobotNode.h
VirtualRobot/RobotNodeSet.cpp 21 additions, 0 deletions

VirtualRobot/RobotNodeSet.cpp
VirtualRobot/RobotNodeSet.h 2 additions, 0 deletions

VirtualRobot/RobotNodeSet.h
VirtualRobot/examples/RobotViewer/RobotViewer.ui 72 additions, 10 deletions

VirtualRobot/examples/RobotViewer/RobotViewer.ui
VirtualRobot/examples/RobotViewer/showRobotWindow.cpp 6 additions, 15 deletions

VirtualRobot/examples/RobotViewer/showRobotWindow.cpp

with 139 additions and 26 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