Philippe Renon
0137460d0b
LP-183 promote int8 and uint8 to their 16 bits equivalents
...
applies only to new Qml friendly properties
int16 will be silently cast to and from int8 !!!
2015-12-20 16:53:00 +01:00
Laurent Lalanne
b011009a47
LP-200 Remove hidden Opie from About dialog
2015-12-20 14:07:42 +01:00
Fredrik Arvidsson
e27f651590
LP-104 Adding support to GCS for HoTT configuration
2015-12-20 11:57:46 +01:00
Rafael Bachmann
605374f492
uncrustify
2015-12-19 13:52:25 +01:00
Rafael Bachmann
f5c23ba32d
const-correct msgLogfileOpenFailed()
2015-12-19 13:48:54 +01:00
Philippe Renon
1b486aafb2
LP-183 fix GCS regression caused by UAVObject TRUE/FALSE enum case change
2015-12-18 21:35:05 +01:00
Rafael Bachmann
142f8a9578
add logfile name to error message.
2015-12-17 19:12:09 +01:00
Rafael Bachmann
d23824dd0e
add error message when opening log file fails
2015-12-17 19:00:14 +01:00
Laurent Lalanne
6c8c643f48
LP-197 Add priority for Gcs translation file use
...
(Qt-5.5.1 qt_fr.qm file broken)
2015-12-17 17:43:37 +01:00
Lalanne Laurent
3faa8d621a
Merged in f5soh/librepilot/LP-191_Txwizard_more_robust (pull request #133 )
...
LP-191 Receiver activity : Increase min range value and allow all Sbus channels scanning.
2015-12-17 16:54:06 +01:00
Philippe Renon
6cac60f32d
Merged in filnet/librepilot/shared/LP-2_qt5_5_upgrade (pull request #136 )
...
LP-2_qt5_5_upgrade
2015-12-16 23:01:25 +01:00
Philippe Renon
5f36bad0b2
Merged in f5soh/librepilot/LP-193_Remove_png_warnings (pull request #134 )
...
LP-193 Remove sRGB profiles from png files used on Gcs.
2015-12-16 23:00:41 +01:00
Philippe Renon
e843cac384
LP-2 osgearth copydata.pro: use scope to copy proper libs on linux 32/64
2015-12-14 22:14:22 +01:00
Philippe Renon
0f87f2d740
LP-2 fix copydata.pro for linux 32 using scope
...
apparently only linux 64 is using the new gstreamer base multimedia backend
linux 32 is still using the previous backend
2015-12-14 22:14:22 +01:00
Alessio Morale
2522f4bd93
Merged in f5soh/librepilot/laurent/LP-160_Set_default_AccelTau (pull request #97 )
...
LP-160 Set default value for AccelTau
2015-12-13 19:12:07 +01:00
Laurent Lalanne
00f6f110cd
LP-193 Remove sRGB profiles from png files used on Gcs.
2015-12-10 17:47:48 +01:00
Philippe Renon
95ea26c396
Merge branch 'next' of bitbucket.org:librepilot/librepilot into filnet/LP-29_osgearth_integration
...
# Conflicts:
# ground/gcs/src/libs/osgearth/osgearth.pro
2015-12-10 00:17:10 +01:00
Philippe Renon
67b143a73d
Merged in filnet/librepilot/shared/LP-2_qt5_5_upgrade (pull request #112 )
...
shared/LP-2_qt5_5_upgrade
2015-12-09 22:04:19 +01:00
Philippe Renon
fabdea9eee
LP-29 redirect osg logging to Qt (commented out for now)
2015-12-09 08:35:48 +01:00
Philippe Renon
f62e99b147
LP-29 import common.js from uav.js
2015-12-09 08:33:00 +01:00
Philippe Renon
3e10e89cec
LP-29 use QOpenGLWidget in place of depecrated QGLWidget
2015-12-09 08:32:04 +01:00
Philippe Renon
596286604e
LP-29 add TODOs
2015-12-09 08:28:11 +01:00
Philippe Renon
531c2dc32b
LP-29 remove pfdqmlgadgetwidget hacks
2015-12-09 08:27:25 +01:00
Philippe Renon
26a3df4715
LP-29 remove OSGViewport hack
...
apparently not necessary anymore
2015-12-09 08:20:44 +01:00
Philippe Renon
7461159c69
LP-29 improve OSGViewport rendering loop
...
update scene in the Renderer synchronize method
2015-12-09 08:19:55 +01:00
Philippe Renon
f9694acfd1
Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration
...
# Conflicts:
# ground/gcs/src/plugins/pfdqml/pfdqmlgadgetwidget.cpp
# ground/gcs/src/share/qml/pfd/Compass.qml
# ground/gcs/src/share/qml/pfd/Info.qml
# ground/gcs/src/share/qml/pfd/Panels.qml
# ground/gcs/src/share/qml/pfd/VsiScale.qml
# ground/gcs/src/share/qml/pfd/Warnings.qml
2015-12-08 01:22:12 +01:00
Philippe Renon
783cf7d981
LP-183 removed unused settingsutil (not related to LP-183...)
2015-12-06 12:56:00 +01:00
Philippe Renon
9c4c906765
LP-183 move toLowerCamelCase method to new string utility
2015-12-06 12:22:38 +01:00
Laurent Lalanne
63534e8014
LP-191 Little fix : OPlink has 8 channels
2015-12-04 21:23:33 +01:00
Philippe Renon
a1ac5fb532
LP-29 compile with libc++ on osx to fix issues when linking with osg
2015-12-02 23:16:05 +01:00
Philippe Renon
2f18791a43
LP-29 don't take device pixel ratio into account
2015-12-02 23:09:38 +01:00
Philippe Renon
a4f8380c13
LP-29 silence OSGViewport::createFramebufferObject method
2015-12-02 23:08:49 +01:00
Philippe Renon
57f0320605
LP-183 also alias TakeOffLocation to make things more explicit
2015-12-02 22:18:32 +01:00
Philippe Renon
26a4c027c7
LP-183 drive by bug fixing in Panels.qml and Compass.qml
2015-12-02 22:17:47 +01:00
Philippe Renon
0dc76168a3
LP-2 remove unused windows specific utility method winGetDLLVersion (additionally had compile warnings)
2015-12-02 21:41:19 +01:00
Philippe Renon
b03833e96b
LP-2 make some of the code changes backward compatible with Qt 5.4.1
2015-12-02 21:33:45 +01:00
Philippe Renon
8c3d576306
LP-2 add missing linux libraries to GCS copydata.pro
2015-12-02 09:05:14 +01:00
Philippe Renon
a9053ed157
LP-2 remove deprecated Qt5Declarative
2015-12-02 09:05:14 +01:00
Philippe Renon
8c47101562
LP-2 minor osg/Qt cleanup
2015-12-02 09:05:14 +01:00
Philippe Renon
f3b06daf4c
LP-2 temporarilly disable glc_lib (and moldeview) as it does not link with Qt 5.5.x
2015-12-02 09:05:14 +01:00
Philippe Renon
d0d3a56292
LP-2 fixed compilation warnings about missing QtInfoMsg in switch/case
2015-12-02 09:05:14 +01:00
Philippe Renon
067261ed3f
LP-2 upgraded to Qt 5.5.0 (excluding sdk installer)
2015-12-02 09:05:14 +01:00
Philippe Renon
d33747e065
LP-183 remove non existing "AltitudeHoldDesired"
2015-12-02 08:52:37 +01:00
Philippe Renon
f5953bc68c
LP-183 remove backward compatible upper case name used for exposing UAV objects to Qml
2015-12-02 08:52:37 +01:00
Philippe Renon
71c7ba4d56
LP-183 convert Qml files to use new UAV object syntax
2015-12-02 08:52:37 +01:00
Philippe Renon
0c2f89a33d
LP-183 pfd: expose UAVTalk objects to Qml with lower camel case names (systemSettings vs SystemSettings)
...
it is more compliant to the Qt naming convention
will solve a conflict in the Qml namespace when SystemSetting is both a type and a context value.
use of non compliant name should be discouraged
2015-12-02 08:52:37 +01:00
Philippe Renon
d2121d7e86
LP-183 cleanup uavobject includes
2015-12-02 08:52:37 +01:00
Philippe Renon
0017ce2acf
LP-183 generated UAV objects are now more Qt and Qml friendly
...
use lower camel case for properties and getters
introduce better enums and expose them to Qml
backward compatibilty is preserved for now
2015-12-02 08:52:37 +01:00
Philippe Renon
39d7f932d7
Merged in f5soh/librepilot/laurent/LP-179_Highlight_stabilization_modes (pull request #116 )
...
LP-179 Highlight stabilized mode used
2015-12-01 21:57:38 +01:00
Philippe Renon
0756c0aa76
Merged in f5soh/librepilot/laurent/LP-178_Accessory_mapping (pull request #113 )
...
LP-178 Add Accessory > Output mapping for fixed Wing.
2015-12-01 21:56:46 +01:00
Philippe Renon
7d06944a81
LP-29 remove duplicate osg lib on mac
2015-11-30 22:24:32 +01:00
Laurent Lalanne
ba86b78031
LP-178 Remove QString()
2015-11-29 20:18:27 +01:00
Philippe Renon
35aab3003b
LP-29 move common.js one directory up
2015-11-29 20:14:07 +01:00
Philippe Renon
12bfee2df3
LP-29 move common uav related functions to uav.js
2015-11-29 20:13:32 +01:00
Philippe Renon
9b100bea4a
Merge remote-tracking branch 'origin/LP-183_more_qml_friendly_gcs_uav_object_generator' into filnet/LP-29_osgearth_integration
2015-11-29 19:38:57 +01:00
Philippe Renon
7cb8a9740a
LP-183 remove non existing "AltitudeHoldDesired"
2015-11-29 16:53:59 +01:00
Philippe Renon
e4e4b23600
LP-183 remove backward compatible upper case name used for exposing UAV objects to Qml
2015-11-29 16:53:58 +01:00
Philippe Renon
96088ce831
LP-183 convert Qml files to use new UAV object syntax
2015-11-29 16:53:58 +01:00
Philippe Renon
664891e040
LP-183 pfd: expose UAVTalk objects to Qml with lower camel case names (systemSettings vs SystemSettings)
...
it is more compliant to the Qt naming convention
will solve a conflict in the Qml namespace when SystemSetting is both a type and a context value.
use of non compliant name should be discouraged
2015-11-29 16:53:57 +01:00
Philippe Renon
287b4ceb5d
LP-183 cleanup uavobject includes
2015-11-29 16:53:38 +01:00
Philippe Renon
df350cda44
LP-183 generated UAV objects are now more Qt and Qml friendly
...
use lower camel case for properties and getters
introduce better enums and expose them to Qml
backward compatibilty is preserved for now
2015-11-29 16:53:33 +01:00
Laurent Lalanne
0f1b662f7b
LP-179 Remove border and set background color for comboboxes
2015-11-28 01:03:11 +01:00
Laurent Lalanne
990e7eb3c9
LP-179 Highlight stabilized mode used
2015-11-28 01:03:11 +01:00
James Duley
50d44a3992
LP-187 MSYS2: fix windows header using extern
...
rather than explicitly redeclaring
2015-11-26 09:03:56 +00:00
Philippe Renon
f1598e0a51
LP-2 remove unused variable
2015-11-25 09:09:55 +00:00
Philippe Renon
b629a7f69f
LP-2 remove unused <QtDesigner/QDesignerExportWidget> import that was causing a deprecated warning
2015-11-25 09:09:55 +00:00
Philippe Renon
6d934fc177
LP-2 removed unused classes that fail to link with Qt 5.5
2015-11-25 09:09:55 +00:00
Philippe Renon
2df89769c9
LP-2 fixed compilation errors around usage of isinf() and isnan()
2015-11-25 09:09:55 +00:00
Philippe Renon
e22061cc8e
LP-2 fixed warning about unused variable
2015-11-25 09:02:37 +00:00
Laurent Lalanne
bd8f03398e
LP-181 Compatible Qt5.4 / Qt5.5 - Added file for javascript functions
2015-11-22 22:27:26 +00:00
Laurent Lalanne
8537443282
LP-181 PFD update works only with Qt5.5
2015-11-22 22:27:26 +00:00
Philippe Renon
bc5e02e3af
LP-30 uncrustify
2015-11-21 15:40:30 +01:00
Philippe Renon
5315af05a3
LP-30 fix minor OSGSky date issue
2015-11-21 15:39:34 +01:00
Philippe Renon
b873d37a8f
LP-30 global enum cleanup
2015-11-21 15:37:39 +01:00
Philippe Renon
a79fd612ac
LP-29 enable FragDepth when using LogarithmicDepthBuffer (fixes heavy z-fighting on the craft model)
2015-11-11 00:24:07 +01:00
Philippe Renon
0a374d2904
LP-29 remove AutoClipPlaneHandler (it is not recommended to use it
...
See http://forum.osgearth.org/Performance-issue-when-looking-at-horizon-td7588307.html
2015-11-11 00:22:57 +01:00
Philippe Renon
3ee0564421
LP-29 fixed some debug logs
2015-11-07 12:46:16 +01:00
Philippe Renon
859cf0996c
LP-29 replace pfd by qml in share copydata.pro
2015-11-07 12:44:21 +01:00
Philippe Renon
bbd214ed31
Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration
2015-11-06 23:21:35 +01:00
Philippe Renon
db926f289d
uncrustified
2015-11-06 22:03:37 +01:00
Philippe Renon
3dbdd76225
LP-174 add missing EXPORT to TextBubbleSlider
2015-11-06 22:02:32 +01:00
Philippe Renon
58c880d706
Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration
2015-11-06 09:22:48 +01:00
Lalanne Laurent
077a9bf5cd
Merged in f5soh/librepilot/laurent/LP-174_Add_values_to_Rcinput (pull request #109 )
...
LP-174 Add values to RCinput
2015-11-05 18:17:03 +01:00
Lalanne Laurent
8d6b89818f
Merged in f5soh/librepilot/laurent/LP-120_Wizard_I2C_mag (pull request #110 )
...
LP-120 Add GPS+I2c mag to wizard
2015-11-05 18:13:51 +01:00
Lalanne Laurent
4e6a67fe82
Merged in f5soh/librepilot/laurent/LP-165_Txpid_acro+_ranges (pull request #102 )
...
LP-165 TxPID Acro+ ranges
2015-11-05 18:12:39 +01:00
Lalanne Laurent
93fc480a2d
Merged in f5soh/librepilot/laurent/LP-147_Detect_flight_mode_num (pull request #93 )
...
LP-147 Transmitter wizard : Add flightmode number detection and artwork
2015-11-05 18:11:43 +01:00
Laurent Lalanne
eba2d98f9a
LP-160 Set default value for AccelTau - Remove unused const
2015-11-05 17:58:21 +01:00
Laurent Lalanne
96eed683ee
LP-165 Set TxPID Acro+ range to 0-100
2015-11-05 17:50:41 +01:00
Laurent Lalanne
6a11bbb6fd
LP-178 Add Accessory > Output mapping for fixed Wing.
...
Two outputs per accessory can be set for spoiler control.
2015-11-05 15:14:45 +01:00
Philippe Renon
783322fd09
Merged in james-duley/librepilot/LP-167_fix_stable_version_check (pull request #105 )
...
LP-167 fix stable version check
2015-11-05 09:34:06 +01:00
Laurent Lalanne
0f4eaf5b24
LP-174 Set Defgroup like others files in directory
2015-11-04 19:06:58 +01:00
Philippe Renon
b0fcfe8ffd
LP-29 disable lighting when a map is used
2015-11-03 22:53:24 +01:00
Philippe Renon
c33c3c9b99
LP-29 remove commented out code and other minor cleanups
2015-11-02 21:33:09 +01:00
Philippe Renon
d9a0a3e84a
LP-29 simplify resize logic (also fixes some resizing issues)
2015-11-02 21:32:50 +01:00
Laurent Lalanne
06a10fb070
LP-174 Move textbubbleslider to libs/utils, centralize fonts
2015-11-01 16:08:45 +01:00
Laurent Lalanne
7b3a0e504b
LP-120 Add conditions for GPS+I2C - SRXL fixes
2015-10-31 15:11:33 +01:00
Laurent Lalanne
89b992176e
LP-120 Auxmag wizard initial support
2015-10-31 14:03:59 +01:00
Laurent Lalanne
9eb8f45e0d
LP-174 : Add Rcinput value display - UI and style changes, embed font.
...
All credit for the textbubbleslider files goes to Taulabs and Kenn Sebesta
2015-10-31 12:13:07 +01:00
lilvinz
e68ad5dbd8
TextBubbleSlider: removed QDESIGNER_WIDGET_EXPORT
2015-10-30 19:15:41 +01:00
Kenn Sebesta
e3d2760f83
Added text-bubble slider. This is an extension of QSlider which displays the slider value in the handle.
2015-10-30 18:40:34 +01:00
Fredrik Arvidsson
adae92b675
LP-171 Added code to disable signal from being triggered while stabilisation bank is changed.
2015-10-28 22:50:46 +01:00
Cliff Geerdes
e0a805518f
LP-73 uncrustify
2015-10-25 23:59:52 -04:00
James Duley
48e077f265
LP-167 fix stable version check
2015-10-25 18:35:09 +00:00
Cliff Geerdes
d5bdc41fb9
LP-73 finish the merge with next
2015-10-24 13:14:52 -04:00
Cliff Geerdes
911400924e
LP-73 convert BoardRotation to int
2015-10-24 12:18:09 -04:00
Philippe Renon
1a5b4a157e
LP-29 disable handling of not yet available osgearth debug libraries
2015-10-24 17:05:48 +02:00
Philippe Renon
f80fb8a02b
LP-29 move osgearth dependencies form osgearth.pro to new osgearth_dependencies.pri
2015-10-24 17:04:42 +02:00
Philippe Renon
ca03e2f076
Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration
2015-10-24 16:48:45 +02:00
Philippe Renon
06517dcd0b
Merged in filnet/librepilot/filnet/LP-29_osgearth_artwork (pull request #68 )
...
LP-29 moved background images one directory up
2015-10-24 16:36:48 +02:00
a*morale
33fd073248
Merge branch 'master' into next
2015-10-21 22:07:09 +02:00
Fredrik Arvidsson
c8b3d046d3
LP-162 Added AccelTau to usage tracking data.
2015-10-21 17:27:58 +02:00
Laurent Lalanne
1c0de087e7
LP-147 Change label to "Flight Modes"
2015-10-19 23:36:25 +02:00
Fredrik Arvidsson
bd476165c0
LP-156 Updated templates.
2015-10-16 21:42:07 +02:00
Lalanne Laurent
eceec3eddc
Merged in f5soh/librepilot/laurent/LP-153_HwWidget_typo (pull request #95 )
...
LP-153 Fix typo
2015-10-16 21:33:10 +02:00
Laurent Lalanne
cba54b204f
LP-153 Fix typo
2015-10-16 15:15:35 +02:00
Laurent Lalanne
b1078252bb
LP-147 Transmitter wizard : Add flightmode number detection and artwork
...
changes
2015-10-16 01:12:53 +02:00
Stefan Karlsson
6504ce448e
LP-155 Workaround failing callback deregistration
...
Deregistration of hid_device_removal_callback fails because the call to
IOHIDDeviceRegisterRemovalCallback doesn't deregister it as it should.
This causes crashes when hid_device_removal_callback is called after
the read_thread has been shutdown.
This patch works around this problem by:
1) Letting the 'dev' hid_device, so that the callback can safely
read the struct, even after the read_thread has been shut down
and the memory should have been freed.
2) Making sure that the two racing callbacks that previously
called CFRunLoopStop, hid_device_removal_callback and
perform_signal_callback, now synchronize and make sure
that CFRunLoopStop is only called once.
2015-10-15 22:11:53 +02:00
Fredrik Arvidsson
aa209dbf8d
LP-156 Updated templates.
2015-10-15 21:57:06 +02:00
Stefan Karlsson
295562694b
LP-155 Fix OPHID_DEBUG warning
2015-10-15 21:08:49 +02:00
Alessio Morale
1a8bf2cd9e
Merged in f5soh/librepilot/laurent/LP-110_Elevon_motor_output4_fix (pull request #89 )
...
LP-110 Elevon frame : Really move motor to Output4
2015-10-09 09:43:02 +02:00
Alessio Morale
33d5a21e9f
Merged in paul_jewell/librepilot/LP-142_Fix_remaining_Wiki_links (pull request #88 )
...
LP-142 Fixed remaining OpenPilot Wiki Links
2015-10-09 09:42:49 +02:00
Alessio Morale
a7462f06eb
Merged in filnet/librepilot/filnet/LP-139_fix_missing_pfd_svg_warning (pull request #84 )
...
LP-139 fixed erroneous warning about missing pfd.svg
2015-10-09 09:40:38 +02:00
Paul Jewell
ea8d18dffd
Fixed remaining OpenPilot Wiki Links
2015-10-07 06:18:47 +01:00
Laurent Lalanne
5ab2f8026c
LP-110 Elevon frame : really move motor from output3 to output4
2015-10-06 18:30:58 +02:00
Paul Jewell
919f765189
Added wiki link for stabilization configuration page
2015-10-04 15:00:16 +01:00
Philippe Renon
88dcb62ed6
LP-139 fixed erroneous warning about missing pfd.svg
2015-10-02 22:11:05 +02:00
Cliff Geerdes
92fd745003
LP-135 remove a blank line for code review
2015-09-30 15:31:08 -04:00
physicsboy0709
5f9f298a1d
modified: ground/gcs/src/plugins/uploader/op_dfu.cpp
2015-09-29 12:48:21 -04:00
Cliff Geerdes
554a190f78
LP-135 simple port of fix to 15.09
2015-09-29 02:09:18 -04:00
Laurent Lalanne
b7d5405ce1
LP-48 Update translations for rel-15.09
2015-09-27 20:53:01 +02:00
Laurent Lalanne
c9b0bbb4e4
LP-67 Change label and tooltips to EasyTune name
2015-09-27 16:53:12 +02:00
Paul Jewell
bdf89acf22
Fix Google Maps version
2015-09-26 20:00:51 +01:00
a*morale
26559a0934
Merged in paul_jewell/librepilot/revert_usage_disable (pull request #55 )
2015-09-24 21:58:51 +02:00
Fredrik Arvidsson
fab46ba294
Merged in paul_jewell/librepilot/LP102-fix-about-plugin-links (pull request #71 )
...
LP-102 Changed Developer and URL lines to LibrePilot
2015-09-24 07:18:09 +02:00
Paul Jewell
51f9291cf4
Added LP details to pluginspec files for LP modified plugins
2015-09-23 21:53:15 +01:00
Philippe Renon
67bba60f52
Merged in filnet/librepilot/filnet/LP-125_path_utils_should_return_absolute_pathes (pull request #67 )
...
LP-125 PathUtils now returns absolute pathes again
2015-09-22 15:31:15 +02:00
Philippe Renon
0bb71cd5df
LP-125 PathUtils now returns absolute pathes again
2015-09-21 23:12:43 +02:00
Alessio Morale
e068c0026a
Merged in alessiomorale/librepilot/amorale/LP-124_rename_txpid_easytune_options (pull request #65 )
...
Amorale/lp 124_rename_txpid_easytune_options
2015-09-21 12:34:54 +02:00
Philippe Renon
53c0c1cb13
LP-29 moved background images one directory up
2015-09-19 18:35:08 +02:00
Alessio Morale
abf40a47eb
LP-124 - Fix renamed fields/options in GCS
2015-09-19 15:31:08 +02:00
Philippe Renon
18725597f4
Merge branch 'next' of bitbucket.org:librepilot/librepilot into filnet/LP-29_osgearth_integration
...
Conflicts:
artwork/3D Model/boards/coptercontrol/coptercontrol.3ds
artwork/3D Model/multi/easy_quad/easy_quad_x.3ds
artwork/3D Model/multi/mikrokopter/mk_l4-me.3ds
artwork/3D Model/multi/ricoo/ricoo.3ds
artwork/3D Model/multi/test_quad/test_quad_x.3ds
ground/gcs/src/share/models/boards/coptercontrol/coptercontrol.3ds
ground/gcs/src/share/models/multi/easy_quad/easy_quad_x.3ds
ground/gcs/src/share/models/multi/mikrokopter/mk_l4-me.3ds
ground/gcs/src/share/models/multi/ricoo/ricoo.3ds
ground/gcs/src/share/models/multi/test_quad/test_quad_x.3ds
2015-09-19 14:42:38 +02:00
Alessio Morale
1b4ad5c2a1
uncrustification
2015-09-19 12:07:45 +02:00
Paul Jewell
55f3c91e9f
Moved question mark to code & added missing define
2015-09-18 06:54:50 +01:00
Paul Jewell
0a45bc6a4e
Moved usagetracker defines to usagetracker.pri
2015-09-18 06:18:16 +01:00
Paul Jewell
7a97e5fbbb
Moved definition of usagetracker url to top level Makefile
2015-09-16 22:00:09 +01:00
Paul Jewell
1a6ff50d20
Made usage tracker fully functional, with LP URL
2015-09-16 22:00:09 +01:00
Philippe Renon
24a5bdfa49
Merge remote-tracking branch 'origin/next' into filnet/LP-29_osgearth_integration
...
Conflicts:
ground/gcs/src/libs/osgearth/copydata.pro
2015-09-16 22:55:54 +02:00
Philippe Renon
3174995dde
Merged in filnet/librepilot (pull request #60 )
...
LP-29 osgearth packaging fixes
2015-09-16 22:40:43 +02:00
Philippe Renon
66901c2be7
LP-29 fixed osgearth copydata.pro for mac and linux
2015-09-16 21:19:43 +02:00
Philippe Renon
e743682311
LP-29 moved osg RPATHDIR definition to libs/osgearth/osgearth.pro
2015-09-16 21:19:43 +02:00
