Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

3f9aab98

Commit 3f9aab98 authored 5 years ago by Mirko Wächter

Downloads
- Plain Diff

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

parents b1d8ba4f ccb0f4a0

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

VirtualRobot/CMakeLists.txt 1 addition, 0 deletions

VirtualRobot/CMakeLists.txt
VirtualRobot/Obstacle.cpp 2 additions, 2 deletions

VirtualRobot/Obstacle.cpp
VirtualRobot/RuntimeEnvironment.h 13 additions, 1 deletion

VirtualRobot/RuntimeEnvironment.h
VirtualRobot/SceneObjectSet.cpp 28 additions, 10 deletions

VirtualRobot/SceneObjectSet.cpp
VirtualRobot/SceneObjectSet.h 3 additions, 0 deletions

VirtualRobot/SceneObjectSet.h
VirtualRobot/Visualization/CoinVisualization/CoinVisualizationNode.cpp 3 additions, 1 deletion

...Visualization/CoinVisualization/CoinVisualizationNode.cpp
VirtualRobot/Visualization/CoinVisualization/CoinVisualizationNode.h 1 addition, 0 deletions

...t/Visualization/CoinVisualization/CoinVisualizationNode.h
VirtualRobot/mjcf.h 5 additions, 0 deletions

VirtualRobot/mjcf.h

with 56 additions and 14 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