Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

N

Navigation
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

441b0d4c

Commit 441b0d4c authored 2 years ago by Corvin-N

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/feature/human-library' into feature/human-tracker

parents da681818 1dbc8494

No related branches found

No related tags found

2 merge requests!38human tracker skeleton,!28Draft: Dev -> Main

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

source/armarx/navigation/human/CMakeLists.txt 7 additions, 1 deletion

source/armarx/navigation/human/CMakeLists.txt
source/armarx/navigation/human/aron/Human.xml 34 additions, 0 deletions

source/armarx/navigation/human/aron/Human.xml
source/armarx/navigation/human/aron_conversions.cpp 69 additions, 0 deletions

source/armarx/navigation/human/aron_conversions.cpp
source/armarx/navigation/human/aron_conversions.h 46 additions, 0 deletions

source/armarx/navigation/human/aron_conversions.h
source/armarx/navigation/human/shapes.h 48 additions, 0 deletions

source/armarx/navigation/human/shapes.h
source/armarx/navigation/human/types.cpp 14 additions, 0 deletions

source/armarx/navigation/human/types.cpp
source/armarx/navigation/human/types.h 5 additions, 1 deletion

source/armarx/navigation/human/types.h

with 223 additions and 2 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