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

667d2f5d

Commit 667d2f5d authored 2 years ago by Fabian Reister

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into feature/costmap-origin

parents 4fd15859 7c4b601b

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

.gitmodules 0 additions, 3 deletions

.gitmodules
CMakeLists.txt 1 addition, 17 deletions

CMakeLists.txt
external/CMakeLists.txt 0 additions, 1 deletion

external/CMakeLists.txt
external/range-v3 0 additions, 1 deletion

external/range-v3
scenarios/Armar3Navigation/Armar3Navigation.scx 5 additions, 0 deletions

scenarios/Armar3Navigation/Armar3Navigation.scx
scenarios/Armar3Navigation/config/global.cfg 4 additions, 0 deletions

scenarios/Armar3Navigation/config/global.cfg
scenarios/Armar3Navigation/config/navigation_memory.cfg 409 additions, 0 deletions

scenarios/Armar3Navigation/config/navigation_memory.cfg
source/armarx/navigation/components/Navigator/Navigator.cpp 2 additions, 0 deletions

source/armarx/navigation/components/Navigator/Navigator.cpp
source/armarx/navigation/core/CMakeLists.txt 13 additions, 14 deletions

source/armarx/navigation/core/CMakeLists.txt
source/armarx/navigation/global_planning/CMakeLists.txt 10 additions, 11 deletions

source/armarx/navigation/global_planning/CMakeLists.txt
source/armarx/navigation/server/CMakeLists.txt 2 additions, 3 deletions

source/armarx/navigation/server/CMakeLists.txt

with 446 additions and 50 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