Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

RobotAPI
- Activity
- Members
- Labels
- Terraform modules

Snippets Groups Projects

339ae814

Commit 339ae814 authored 9 years ago by Mirko Wächter

Downloads
- Plain Diff

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

parents 61e45389 b44372e3

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 1 addition, 1 deletion

CMakeLists.txt
data/RobotAPI/robots/Armar3/ArmarIII-Head.xml 1 addition, 1 deletion

data/RobotAPI/robots/Armar3/ArmarIII-Head.xml
data/RobotAPI/robots/Armar3/ArmarIII-LeftArm.xml 1 addition, 1 deletion

data/RobotAPI/robots/Armar3/ArmarIII-LeftArm.xml
source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp 171 additions, 1 deletion

.../RobotAPI/components/DebugDrawer/DebugDrawerComponent.cpp
source/RobotAPI/components/DebugDrawer/DebugDrawerComponent.h 13 additions, 0 deletions

...ce/RobotAPI/components/DebugDrawer/DebugDrawerComponent.h
source/RobotAPI/components/units/ForceTorqueObserver.cpp 1 addition, 1 deletion

source/RobotAPI/components/units/ForceTorqueObserver.cpp
source/RobotAPI/components/units/HeadIKUnit.cpp 2 additions, 2 deletions

source/RobotAPI/components/units/HeadIKUnit.cpp
source/RobotAPI/components/units/HeadIKUnit.h 1 addition, 0 deletions

source/RobotAPI/components/units/HeadIKUnit.h
source/RobotAPI/gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.cpp 1 addition, 1 deletion

.../gui-plugins/PlatformUnitPlugin/PlatformUnitGuiPlugin.cpp
source/RobotAPI/interface/visualization/DebugDrawerInterface.ice 17 additions, 0 deletions

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

with 209 additions and 8 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