-
- Downloads
Merge branch 'pull_upstream' into feature/offlineElevationData
Conflicts: src/Terrain.cc
No related branches found
No related tags found
Showing
- libs/mavlink/include/mavlink/v2.0 1 addition, 1 deletionlibs/mavlink/include/mavlink/v2.0
- src/Audio/AudioOutput.cc 1 addition, 1 deletionsrc/Audio/AudioOutput.cc
- src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml 6 additions, 5 deletionssrc/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml
- src/FlightDisplay/FlightDisplayViewMap.qml 1 addition, 1 deletionsrc/FlightDisplay/FlightDisplayViewMap.qml
- src/FlightMap/Widgets/MapFitFunctions.qml 0 additions, 4 deletionssrc/FlightMap/Widgets/MapFitFunctions.qml
- src/Joystick/Joystick.cc 32 additions, 12 deletionssrc/Joystick/Joystick.cc
- src/Joystick/Joystick.h 10 additions, 2 deletionssrc/Joystick/Joystick.h
- src/JsonHelper.cc 1 addition, 1 deletionsrc/JsonHelper.cc
- src/JsonHelper.h 1 addition, 1 deletionsrc/JsonHelper.h
- src/MissionManager/MissionController.cc 36 additions, 18 deletionssrc/MissionManager/MissionController.cc
- src/MissionManager/MissionController.h 5 additions, 1 deletionsrc/MissionManager/MissionController.h
- src/MissionManager/MissionManager.h 0 additions, 4 deletionssrc/MissionManager/MissionManager.h
- src/MissionManager/PlanMasterController.h 6 additions, 2 deletionssrc/MissionManager/PlanMasterController.h
- src/MissionManager/QGCMapPolygon.cc 14 additions, 3 deletionssrc/MissionManager/QGCMapPolygon.cc
- src/MissionManager/QGCMapPolygon.h 1 addition, 0 deletionssrc/MissionManager/QGCMapPolygon.h
- src/MissionManager/QGCMapPolygonVisuals.qml 5 additions, 2 deletionssrc/MissionManager/QGCMapPolygonVisuals.qml
- src/MissionManager/SimpleMissionItem.cc 197 additions, 129 deletionssrc/MissionManager/SimpleMissionItem.cc
- src/MissionManager/SimpleMissionItem.h 44 additions, 29 deletionssrc/MissionManager/SimpleMissionItem.h
- src/MissionManager/SimpleMissionItemTest.cc 35 additions, 33 deletionssrc/MissionManager/SimpleMissionItemTest.cc
- src/MissionManager/SimpleMissionItemTest.h 7 additions, 5 deletionssrc/MissionManager/SimpleMissionItemTest.h
Loading
Please register or sign in to comment