Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

07705037

Commit 07705037 authored 2 years ago by Fabian Tërnava

Downloads
- Plain Diff

Merge branch 'master' of https://git.h2t.iar.kit.edu/sw/simox/simox

parents 97db03b6 3ac424cc

1 merge request!147Add eos horus and fix assimp issue

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

VirtualRobot/Nodes/RobotNode.cpp 7 additions, 7 deletions

VirtualRobot/Nodes/RobotNode.cpp
VirtualRobot/Nodes/RobotNode.h 2 additions, 1 deletion

VirtualRobot/Nodes/RobotNode.h
VirtualRobot/Primitive.h 30 additions, 0 deletions

VirtualRobot/Primitive.h
VirtualRobot/Robot.cpp 5 additions, 5 deletions

VirtualRobot/Robot.cpp
VirtualRobot/Robot.h 5 additions, 4 deletions

VirtualRobot/Robot.h
VirtualRobot/RobotFactory.cpp 74 additions, 0 deletions

VirtualRobot/RobotFactory.cpp
VirtualRobot/RobotFactory.h 15 additions, 0 deletions

VirtualRobot/RobotFactory.h
VirtualRobot/SceneObject.cpp 16 additions, 0 deletions

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

VirtualRobot/SceneObject.h

with 156 additions and 17 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