Merge branch 'master' into location-graph-editor
# Conflicts: # source/Navigation/components/Navigator/Navigator.cpp # source/armarx/navigation/client/NavigationStackConfig.cpp # source/armarx/navigation/components/GraphImportExport/GraphImportExport.h # source/armarx/navigation/components/NavigationMemory/NavigationMemory.cpp # source/armarx/navigation/components/NavigationMemory/NavigationMemory.h # source/armarx/navigation/components/Navigator/Navigator.h # source/armarx/navigation/factories/NavigationStackFactory.cpp # source/armarx/navigation/global_planning/AStar.cpp # source/armarx/navigation/gui-plugins/LocationGraphEditor/widgets/ConnectDialog.h # source/armarx/navigation/server/event_publishing/MemoryPublisher.h # source/armarx/navigation/server/monitoring/GoalReachedMonitor.cpp
No related branches found
No related tags found
Showing
- .clangd 3 additions, 3 deletions.clangd
- CMakeLists.txt 17 additions, 19 deletionsCMakeLists.txt
- README.md 2 additions, 0 deletionsREADME.md
- README.txt 0 additions, 3 deletionsREADME.txt
- data/navigation/VariantInfo-navigation.xml 0 additions, 0 deletionsdata/navigation/VariantInfo-navigation.xml
- scenarios/NavigationSimulation/NavigationSimulation.scx 50 additions, 50 deletionsscenarios/NavigationSimulation/NavigationSimulation.scx
- scenarios/NavigationSimulation/config/ArticulatedObjectLocalizerDynamicSimulation.cfg 17 additions, 2 deletions...on/config/ArticulatedObjectLocalizerDynamicSimulation.cfg
- scenarios/NavigationSimulation/config/ObjectMemory.cfg 37 additions, 69 deletionsscenarios/NavigationSimulation/config/ObjectMemory.cfg
- scenarios/NavigationSimulation/config/RobotStateMemory.cfg 62 additions, 78 deletionsscenarios/NavigationSimulation/config/RobotStateMemory.cfg
- source/CMakeLists.txt 1 addition, 1 deletionsource/CMakeLists.txt
- source/Navigation/CMakeLists.txt 0 additions, 10 deletionssource/Navigation/CMakeLists.txt
- source/Navigation/components/ExampleClient/ExampleClient.cpp 0 additions, 185 deletionssource/Navigation/components/ExampleClient/ExampleClient.cpp
- source/Navigation/components/NavigationMemory/test/CMakeLists.txt 0 additions, 5 deletions...avigation/components/NavigationMemory/test/CMakeLists.txt
- source/Navigation/components/NavigationMemory/test/NavigationMemoryTest.cpp 0 additions, 38 deletions...components/NavigationMemory/test/NavigationMemoryTest.cpp
- source/Navigation/components/Navigator/Navigator.cpp 0 additions, 369 deletionssource/Navigation/components/Navigator/Navigator.cpp
- source/Navigation/libraries/algorithms/test/CMakeLists.txt 0 additions, 6 deletionssource/Navigation/libraries/algorithms/test/CMakeLists.txt
- source/Navigation/libraries/client.h 0 additions, 10 deletionssource/Navigation/libraries/client.h
- source/Navigation/libraries/client/test/CMakeLists.txt 0 additions, 9 deletionssource/Navigation/libraries/client/test/CMakeLists.txt
- source/Navigation/libraries/conversions/CMakeLists.txt 0 additions, 25 deletionssource/Navigation/libraries/conversions/CMakeLists.txt
- source/Navigation/libraries/conversions/test/CMakeLists.txt 0 additions, 6 deletionssource/Navigation/libraries/conversions/test/CMakeLists.txt
Loading
Please register or sign in to comment