abeck70
e8b09e88e2
Merge branch 'rel-15.05' into next
2015-05-22 22:16:08 +10:00
abeck70
42b1e12646
HITL segv fix
2015-05-22 21:26:20 +10:00
abeck70
b77a7d1116
Merge branch 'rel-15.05' into next
2015-05-21 22:47:39 +10:00
samguns
40acc2c7ea
OP-1897 Minor change after code review
2015-05-21 09:47:44 +08:00
samguns
501e2e09de
OP-1897 Adopt FTT's suggestion that make warning dialog for Ground Vehicle when it's neccesary and omit confusing texts
2015-05-20 15:50:25 +08:00
Laurent Lalanne
81361af7b6
Rcpanel hot fix (Roll can't move)
2015-05-19 15:21:31 +02:00
abeck70
5b49aa092f
Merge branch 'rel-15.05' into next
2015-05-19 22:02:34 +10:00
abeck70
a00ce7a551
Merge branch 'rel-15.05' of ssh://git.openpilot.org/OpenPilot into parched/OP-1853_Ground_build_tidy
2015-05-19 21:53:20 +10:00
abeck70
869bfaaee5
Merge branch 'rel-15.05' into next
2015-05-19 18:20:06 +10:00
abeck70
053bd9ebb7
Map update code review comments
2015-05-19 18:17:21 +10:00
Kevin Finisterre
bf96bfac74
Remove redundant entry
2015-05-19 18:17:21 +10:00
Kevin Finisterre
8f8b2fccfc
Add Statkart Topo2 aka... I scratch YOUR back, you scratch mine!
...
17f68c3be6
2015-05-19 18:17:20 +10:00
Kevin Finisterre
d7fef72b4d
disable printing of the image header, was used for debugging only
2015-05-19 18:17:20 +10:00
Kevin Finisterre
f98a9e6319
Depreciate MapsLT map source
2015-05-19 18:17:20 +10:00
Kevin Finisterre
17fa6341c3
Depreciate Yandex maps
2015-05-19 18:17:20 +10:00
Kevin Finisterre
13b0eac79f
Depreciate Pergo maps
2015-05-19 18:17:20 +10:00
Kevin Finisterre
361bb26212
attempt to get Pergo Turkish maps working. Still buggy. Unable to search and auto zoom. Initial map render works mostly
2015-05-19 18:17:19 +10:00
Kevin Finisterre
2c3f3f6a49
Attempt to fix ArcGIS_MapsLT_* map types, Successfully fix ArcGIS_ShadedRelief by limiting the max tiles.
...
Tiles 11, 12 and 13 are invalid here http://server.arcgisonline.com/arcgis/rest/services/World_Shaded_Relief/MapServer
Set maxtiles to 10 for ArcGIS_ShadedRelief map type
2015-05-19 18:17:19 +10:00
Kevin Finisterre
666b63c1d7
Update old mapsurfer interface... mapsurfer.net changed to mapsurfernet.com and was depreciated all together. Use GIScience (Geoinformatics) Research Group, Heidelberg University mirror
2015-05-19 18:17:19 +10:00
Kevin Finisterre
c1cc21da94
Fix SigPacSpainMap & Google*Korea map types
2015-05-19 18:17:19 +10:00
Kevin Finisterre
3a95dd9b78
Fix GoogleMapsKorea, GoogleMapsKoreaHybrid & GoogleMapsKoreaSatellite, Still need to fix the Labels mapset
...
SSL bug in QT, workaround used in url generation code as well
2015-05-19 18:17:19 +10:00
Kevin Finisterre
01a00ccafd
Continue debugging troublesome maps... remove the Dragons from the map!!! https://progress.openpilot.org/browse/OP-392 was more annoying than useful.
...
Attempt to change HTTP request method to debug failed tile downloads.
2015-05-19 18:17:19 +10:00
abeck70
9bfc68ca62
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into kfinisterre/WiresharkPlugin
2015-05-18 23:00:29 +10:00
abeck70
f5547c6cd5
Merge branch 'rel-15.05' of ssh://git.openpilot.org/OpenPilot into kfinisterre/Xplane10_plugin
2015-05-18 17:46:48 +10:00
abeck70
7a61c381c6
Merge branch 'kfinisterre/Xplane10_plugin' of ssh://git.openpilot.org/OpenPilot into kfinisterre/Xplane10_plugin
2015-05-18 17:46:14 +10:00
Kevin Finisterre
266128d5a6
This closes https://progress.openpilot.org/browse/OP-1888
2015-05-17 19:15:45 -04:00
James Duley
5048ece1b7
Merge remote-tracking branch 'dev/next' into parched/OP-1853_Ground_build_tidy_TEST
2015-05-17 22:52:01 +01:00
James Duley
28a42dade6
OP-1853 Ground build tidy: Make consistent uavobjgenerator output dir.
...
Because on windows its normally different for release and debug
2015-05-17 21:27:16 +01:00
abeck70
add7fe8502
Merge branch 'rel-15.05' of ssh://git.openpilot.org/OpenPilot into laurent/OP-1887_PFD_update
2015-05-17 20:28:54 +10:00
Laurent Lalanne
d4b0541bc9
OP-1337 Translations updates for rel-15.05
2015-05-15 11:13:40 +02:00
Laurent Lalanne
bbe98d1147
OP-1887 Oups, QuadH resurrected...
2015-05-14 17:52:09 +02:00
Laurent Lalanne
3ea01e0fb9
OP-1887 GPS tooltip info : Remove decimals
2015-05-14 14:41:29 +02:00
Laurent Lalanne
888df0cb30
OP-1887 Add Receiver quality
2015-05-14 14:16:42 +02:00
Laurent Lalanne
76b8450333
Merge branch 'next' into laurent/OP-1887_PFD_update
2015-05-14 13:25:24 +02:00
abeck70
f74300c96d
Merge branch 'next' into kfinisterre/Xplane10_plugin
2015-05-14 20:46:44 +10:00
Laurent Lalanne
a941a1aa04
OP-1887 Hide bat tooltips when battery panel not displayed
2015-05-14 12:32:41 +02:00
Laurent Lalanne
08536f3a01
Merge branch 'next' into laurent/OP-1887_PFD_update
2015-05-14 11:31:37 +02:00
Laurent Lalanne
5767b3b2dc
OP-1887 Missing file, again
2015-05-14 03:01:19 +02:00
Laurent Lalanne
3a49ba6f45
OP-1887 Missing file for tooltips
2015-05-14 02:54:51 +02:00
Laurent Lalanne
10aba62bc8
OP-1887 Add tooltips over links, extended GPS info
2015-05-14 02:48:08 +02:00
Laurent Lalanne
8af77902c2
OP-1887 Hide battery links when battery panel not displayed
2015-05-14 01:00:21 +02:00
Laurent Lalanne
295e0870ef
OP-1887 Gps display, 12bars - Add text
2015-05-13 23:39:41 +02:00
Laurent Lalanne
f5160f64b0
OP-1887 New panel behavior, open/close animation
2015-05-13 23:38:58 +02:00
Steve Evans
1771d347bb
Merge branch 'steve/OP-1803_s.bus_dropped_frames' into steve/OP-1849_flexio_com_bridge
2015-05-13 20:36:06 +01:00
Steve Evans
fd00cd8210
Merge branch 'next' into steve/OP-1803_s.bus_dropped_frames
2015-05-13 20:29:54 +01:00
James Duley
2610a4c463
OP-1853 Ground build tidy: make the gcs build handle generating its own
...
UAVOs.
This removes warnings and better handles dependencies to speed up rebuilds
New file uavobjgenerator.pri define a qmake compiler of the
uavobjgenerator
2015-05-13 12:47:28 +01:00
James Duley
9d31ca939c
OP-1853 Ground build tidy: remove targetPath as not needed.
...
Could be replaced with builtin $$shell_path but that appears
to be buggy on windows git bash
2015-05-13 12:46:04 +01:00
abeck70
e8c948c45b
Merge branch 'next' into kfinisterre/GMapsAndGeoCodeSearchFix
2015-05-13 17:46:05 +10:00
abeck70
3784357a18
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
2015-05-13 17:33:11 +10:00
abeck70
92e50c2ead
OP-1810 FOC
...
Squashed commit for clean commit as discussed in code review
Uncrustify
2015-05-13 17:19:51 +10:00