Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Container Registry
- Model registry

Snippets Groups Projects

7a41b4a7

Commit 7a41b4a7 authored 9 years ago by Nikolaus Vahrenkamp

Downloads
- Plain Diff

Merge branch 'master' of https://gitlab.com/ArmarX/RobotAPI

parents 0bc42c5b 3ab21b57

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

data/RobotAPI/robots/Armar3/ArmarIII-Head.xml 15 additions, 0 deletions

data/RobotAPI/robots/Armar3/ArmarIII-Head.xml
source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp 70 additions, 45 deletions

.../RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp
source/RobotAPI/components/units/PlatformUnitObserver.h 2 additions, 2 deletions

source/RobotAPI/components/units/PlatformUnitObserver.h
source/RobotAPI/components/units/PlatformUnitSimulation.h 2 additions, 2 deletions

source/RobotAPI/components/units/PlatformUnitSimulation.h
source/RobotAPI/gui-plugins/HapticUnitPlugin/MatrixDatafieldDisplayWidget.h 2 additions, 2 deletions

...i-plugins/HapticUnitPlugin/MatrixDatafieldDisplayWidget.h
source/RobotAPI/interface/visualization/DebugDrawerInterface.ice 16 additions, 5 deletions

...RobotAPI/interface/visualization/DebugDrawerInterface.ice

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