Skip to content
Snippets Groups Projects

Location graph editor

Merged Location graph editor
location-graph-editor into master
Merged Rainer Kartmann requested to merge location-graph-editor into master
  1. Sep 06, 2021
    • Rainer Kartmann's avatar
      Merge branch 'master' into location-graph-editor · 501b145a
      Rainer Kartmann authored 
      # 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
      501b145a
    • Rainer Kartmann's avatar
      Add GraphImportExport scenario · 8f5ead1f
      Rainer Kartmann authored
      8f5ead1f
  3. Sep 02, 2021