Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

d7eeb9c5

Commit d7eeb9c5 authored 4 years ago by Fabian Paus

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/Armar6Demo'

parents 0ba10125 828e381c

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

data/RobotAPI/obstacle_avoidance/2d_scene_obstacles.json 12 additions, 12 deletions

data/RobotAPI/obstacle_avoidance/2d_scene_obstacles.json
source/RobotAPI/components/units/ObstacleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.cpp 4 additions, 1 deletion

...acleAvoidingPlatformUnit/ObstacleAvoidingPlatformUnit.cpp
source/RobotAPI/libraries/DSControllers/DSRTBimanualController.cpp 1 addition, 1 deletion

...botAPI/libraries/DSControllers/DSRTBimanualController.cpp

with 17 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