Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

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

Snippets Groups Projects

06934ee5

Commit 06934ee5 authored 1 year ago by Fabian Reister

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into armem/ltm/dev

parents 1ac4bc59 e3713eb4

No related branches found

No related tags found

2 merge requests!441Draft: Armem/ltm/dev,!346Armem/ltm/dev

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

source/RobotAPI/components/ArticulatedObjectLocalizerExample/ArticulatedObjectLocalizerExample.cpp 8 additions, 2 deletions

...ectLocalizerExample/ArticulatedObjectLocalizerExample.cpp
source/RobotAPI/libraries/armem_objects/client/articulated_object/Writer.cpp 1 addition, 0 deletions

...raries/armem_objects/client/articulated_object/Writer.cpp
source/RobotAPI/libraries/armem_objects/server/instance/Visu.cpp 11 additions, 0 deletions

...RobotAPI/libraries/armem_objects/server/instance/Visu.cpp
source/RobotAPI/libraries/skills/manager/SkillManagerComponentPlugin.cpp 76 additions, 29 deletions

.../libraries/skills/manager/SkillManagerComponentPlugin.cpp
source/RobotAPI/libraries/skills/provider/Skill.cpp 8 additions, 0 deletions

source/RobotAPI/libraries/skills/provider/Skill.cpp
source/RobotAPI/libraries/skills/provider/Skill.h 2 additions, 0 deletions

source/RobotAPI/libraries/skills/provider/Skill.h
source/RobotAPI/libraries/skills/provider/SkillProxy.cpp 7 additions, 0 deletions

source/RobotAPI/libraries/skills/provider/SkillProxy.cpp
source/RobotAPI/libraries/skills/provider/SkillProxy.h 2 additions, 0 deletions

source/RobotAPI/libraries/skills/provider/SkillProxy.h

with 115 additions and 31 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