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

fa09469e

Commit fa09469e authored 3 years ago by Fabian Reister

Downloads
- Plain Diff

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

parents d4f6ec85 82627ab8

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

source/armarx/navigation/algorithms/Costmap.h 2 additions, 0 deletions

source/armarx/navigation/algorithms/Costmap.h
source/armarx/navigation/components/Navigator/Navigator.cpp 2 additions, 2 deletions

source/armarx/navigation/components/Navigator/Navigator.cpp
source/armarx/navigation/global_planning/optimization/OrientationOptimizer.h 2 additions, 0 deletions

...ation/global_planning/optimization/OrientationOptimizer.h
source/armarx/navigation/gui-plugins/LocationGraphEditor/widgets/VertexTableWidget.cpp 4 additions, 4 deletions

...plugins/LocationGraphEditor/widgets/VertexTableWidget.cpp
source/armarx/navigation/server/Navigator.cpp 8 additions, 9 deletions

source/armarx/navigation/server/Navigator.cpp

with 18 additions and 15 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