Commits · 33082ffcbde52c047448d8d1f17b8c9b20a33e23 · Valentin Platzgummer / qgroundcontrol

16 Mar, 2018 2 commits
- Merge branch 'pull_upstream' into feature/offlineElevationData · 33082ffc
  Andreas Bircher authored Mar 16, 2018
```
Conflicts:
	src/Terrain.cc
```
  33082ffc
- Merge pull request #6225 from DonLakeFlyer/MissionTerrain · 2676fe2c
  Don Gagne authored Mar 15, 2018
```
Simple mission terrain support
```
  2676fe2c
15 Mar, 2018 15 commits
- Merge pull request #6220 from mavlink/pr-mavlink_update · 2abfa4aa
  Don Gagne authored Mar 15, 2018
```
Update mavlink v2.0 submodule Thu Mar 15 00:39:14 UTC 2018
```
  2abfa4aa
- Merge pull request #6176 from patrickelectric/audioOutput · a67223f1
  Don Gagne authored Mar 15, 2018
```
AudioOutput: Create text to speech in constructor
```
  a67223f1
- Merge pull request #6224 from DonLakeFlyer/StableMerge · a6e693d4
  Don Gagne authored Mar 15, 2018
```
Stable merge
```
  a6e693d4
- Compiler warning fix · 5e669797
  DonLakeFlyer authored Mar 15, 2018
  
  5e669797
- Simple mission terrain support · 85e0c56a
  DonLakeFlyer authored Mar 15, 2018
  
  85e0c56a
- Merge branch 'Stable_V3.3' of https://github.com/mavlink/qgroundcontrol into StableMerge · 4d835830
  DonLakeFlyer authored Mar 15, 2018
  
  4d835830
- Merge pull request #6223 from DonLakeFlyer/Terrain · 192653c3
  Don Gagne authored Mar 15, 2018
```
Update to new terrain url
```
  192653c3
- Update to new terrain url · 0f764dbe
  DonLakeFlyer authored Mar 15, 2018
  
  0f764dbe
- Merge pull request #6221 from DonLakeFlyer/KMLExtensions · 8f2e16fb
  Don Gagne authored Mar 15, 2018
```
Fix KML file extensions on mobile
```
  8f2e16fb
- compile fix · 6f474c99
  Andreas Bircher authored Mar 15, 2018
  
  6f474c99
- remove artefact · ec93ab96
  Andreas Bircher authored Mar 15, 2018
  
  ec93ab96
- Fix KML file extensions on mobile · 5429bd15
  DonLakeFlyer authored Mar 15, 2018
  
  5429bd15
- Update mavlink v2.0 submodule Thu Mar 15 00:39:14 UTC 2018 · e082ed29
  PX4 Jenkins authored Mar 15, 2018
  
  e082ed29
- Merge pull request #6218 from DonLakeFlyer/StableMerge · 9fb7a58c
  Don Gagne authored Mar 15, 2018
```
Stable merge
```
  9fb7a58c
- Merge pull request #6219 from DonLakeFlyer/MissingVTOL · 58139d00
  Don Gagne authored Mar 15, 2018
```
Add missing VTOL cases
```
  58139d00
14 Mar, 2018 17 commits
- Add missing VTOL cases · 57f3d6a8
  DonLakeFlyer authored Mar 14, 2018
  
  57f3d6a8
- Merge branch 'Stable_V3.3' of https://github.com/mavlink/qgroundcontrol into StableMerge · b9881d69
  DonLakeFlyer authored Mar 14, 2018
  
  b9881d69
- Merge pull request #6217 from DonLakeFlyer/TabletSizing · aad551c2
  Don Gagne authored Mar 14, 2018
```
Fix compass rose sizing
```
  aad551c2
- Merge pull request #6177 from bluerobotics/patrickelectric/digital_joystick · bf86d7fc
  Don Gagne authored Mar 14, 2018
```
Joystick: Add circle correction option
```
  bf86d7fc
- Merge pull request #6216 from DonLakeFlyer/LoadKMLMapMove · 5f39c6ab
  Don Gagne authored Mar 14, 2018
```
Reposition map after KML load
```
  5f39c6ab
- Fix compass rose sizing · 0d77a9cf
  DonLakeFlyer authored Mar 14, 2018
  
  0d77a9cf
- Merge pull request #6215 from DonLakeFlyer/LoadKMLMapMove · 47b25b13
  Don Gagne authored Mar 14, 2018
```
Reposition map after KML load
```
  47b25b13
- Merge branch 'pull_upstream' into feature/offlineElevationData · abfc1233
  Andreas Bircher authored Mar 14, 2018
```
Conflicts:
	src/Terrain.cc
	src/Terrain.h
```
  abfc1233
- Reposition map after KML load · 9a4cb390
  DonLakeFlyer authored Mar 14, 2018
  
  9a4cb390
- Merge pull request #6213 from DonLakeFlyer/StableMerge · 98071529
  Don Gagne authored Mar 14, 2018
```
Stable merge
```
  98071529
- Merge branch 'Stable_V3.3' of https://github.com/mavlink/qgroundcontrol into StableMerge · ba0dce20
  DonLakeFlyer authored Mar 14, 2018
  
  ba0dce20
- Merge pull request #6188 from mavlink/pr-px4_metadata · 78be63ea
  Don Gagne authored Mar 14, 2018
```
Update PX4 Firmware metadata Sat Mar 10 23:37:05 EST 2018
```
  78be63ea
- Merge pull request #6207 from DonLakeFlyer/ClearResumeMission · 2823a401
  Don Gagne authored Mar 14, 2018
```
Clear resume mission index
```
  2823a401
- Merge pull request #6209 from DonLakeFlyer/ConvexSurvey · 39e0e1ac
  Don Gagne authored Mar 14, 2018
```
Convex survey support
```
  39e0e1ac
- Merge pull request #6192 from mavlink/firmwareUpgrade · 5957f29e
  Gus Grubba authored Mar 14, 2018
```
Firmware Upgrade Fixes
```
  5957f29e
- Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into firmwareUpgrade · 25577109
  Gus Grubba authored Mar 14, 2018
  
  25577109
- Update PX4 Firmware metadata Wed Mar 14 00:40:47 EDT 2018 · 24424dd1
  PX4 Jenkins authored Mar 14, 2018
  
  24424dd1
13 Mar, 2018 6 commits
- New convex polygon transect intersection method · fd4c081d
  DonLakeFlyer authored Mar 13, 2018
  
  fd4c081d
- Better performance of KML loading · cf189597
  DonLakeFlyer authored Mar 13, 2018
  
  cf189597
- Add support for insert/append of multiple objects at a time · f622859b
  DonLakeFlyer authored Mar 13, 2018
```
For much better performance
```
  f622859b
- Joystick: Add circle correction option · 91ac7955
  Patrick José Pereira authored Mar 06, 2018
```
Some digital joysticks have already this correction
Add habilit to add or removecircle correction
Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>
```
  91ac7955
- Merge pull request #6206 from DonLakeFlyer/JoystickVTOL · e7914214
  Don Gagne authored Mar 13, 2018
```
Add support for VTOL transition from joystick buttons
```
  e7914214
- Remove duplicate signals · 0e15ab7d
  DonLakeFlyer authored Mar 13, 2018
```
These are defined in PlanManager. Having them here as well causes lost
signaling.
```
  0e15ab7d