Philippe Renon
|
a93f182582
|
LP-29 add state save/restore to PFD Qml gadget
|
2016-03-07 08:24:36 +01:00 |
|
Philippe Renon
|
f11e9c6e41
|
LP-29 expose PfdContext to Qml as "pfdContext" instead of "qmlWidget"
|
2016-03-07 08:24:36 +01:00 |
|
Philippe Renon
|
a1ad54310d
|
LP-29 fixed minor typo
|
2016-03-07 08:24:36 +01:00 |
|
Stefan Karlsson
|
371b658afc
|
LP-251 Fix incorrect null check
|
2016-03-06 12:48:20 +01:00 |
|
Stefan Karlsson
|
8e63d4e618
|
LP-251 Turn on -Werror for uavobjgenerator on osx
|
2016-03-06 12:45:08 +01:00 |
|
Philippe Renon
|
de1a0ce49a
|
Merged in m_thread/librepilot/thread/LP-235_Failsafe_Flight_Mode (pull request #189)
LP-235 Changed the contents and logic of the Failsafe flight mode setting.
|
2016-03-05 17:23:17 +01:00 |
|
Fredrik Arvidsson
|
c45915b597
|
LP-235 Using constant instead of hard coded channel count.
|
2016-03-05 15:35:13 +01:00 |
|
Fredrik Arvidsson
|
1dd5b3e246
|
LP-235 Changed the contents and logic of the Failsafe flight mode setting.
Uncrustification.
|
2016-03-03 23:03:25 +01:00 |
|
Philippe Renon
|
9d2d90e44d
|
remove global widgets dependency from plugins.pri
cleanup related pro files and includes
|
2016-03-03 19:29:45 +01:00 |
|
Fredrik Arvidsson
|
f4b3b89953
|
Merged in m_thread/librepilot/thread/LP-249_Bug_fix (pull request #188)
LP-249 Fixed bug.
|
2016-03-03 16:38:51 +01:00 |
|
Fredrik Arvidsson
|
4dd174f77b
|
LP-249 Fixed bug.
|
2016-03-03 16:26:54 +01:00 |
|
Lalanne Laurent
|
e56e4cedb3
|
Merged in f5soh/librepilot/LP-232_Fmode_display_config_error (pull request #177)
LP-232 Display flight mode alarm while setup
|
2016-03-03 15:36:36 +01:00 |
|
Lalanne Laurent
|
07f2bb3bc4
|
Merged in filnet/librepilot/filnet/LP-29_osgearth_integration (pull request #179)
LP-29 fix osg attitude handling issue when pitch close to +/-90 (thank you @liftbag for reporting it)
|
2016-03-03 15:35:22 +01:00 |
|
Lalanne Laurent
|
98a83a5cf2
|
Merged in f5soh/librepilot/LP-247_Wizard_naza_gps (pull request #186)
LP-247 Add Naza GPS to Wizard
|
2016-03-03 15:28:09 +01:00 |
|
Fredrik Arvidsson
|
618c4bfe5c
|
Merged in f5soh/librepilot/LP-240_AuxMag_Settings_GUI (pull request #183)
LP-240 Add GUI tab for external Magnetometer
|
2016-03-03 15:25:49 +01:00 |
|
Fredrik Arvidsson
|
044c357be8
|
Merged in m_thread/librepilot/thread/LP-235_Failsafe_Settings_GUI (pull request #187)
LP-235 Failsafe settings GUI
|
2016-03-03 08:53:51 +01:00 |
|
Fredrik Arvidsson
|
3469b4d0cb
|
LP-235 Changed faulty tool tips.
|
2016-03-02 10:47:18 +01:00 |
|
Fredrik Arvidsson
|
24e2c400ef
|
LP-235 Fixed UI related issue.
|
2016-03-02 10:08:28 +01:00 |
|
Fredrik Arvidsson
|
41adb3e4c4
|
LP-235 Changed type of text field to avoid HTML encoding.
|
2016-03-02 10:06:52 +01:00 |
|
Fredrik Arvidsson
|
0f7f268a0a
|
LP-235 Added some default buttons as widgets so that they are greyed out when board is disconnected.
|
2016-03-02 09:12:00 +01:00 |
|
Fredrik Arvidsson
|
8a96904e8a
|
LP-235 Changed so that the correct channels are laid out in GUI. Added default button to reset values. Re-factored some repeated code.
|
2016-03-02 09:07:30 +01:00 |
|
Laurent Lalanne
|
e5b03868df
|
LP-247 Add Naza GPS to Wizard
|
2016-02-28 12:27:38 +01:00 |
|
Laurent Lalanne
|
91e5863939
|
LP-240 Changes from review
|
2016-02-26 23:31:18 +01:00 |
|
Laurent Lalanne
|
8211efe804
|
LP-240 Add Mag error display in percent - Lower rates for telemetry
|
2016-02-26 10:12:10 +01:00 |
|
Laurent Lalanne
|
1aaf9b9f0e
|
LP-240 Remove delay (diff sliders working) on enter tab - Apply default metadata
|
2016-02-26 00:49:23 +01:00 |
|
Philippe Renon
|
0e9016da5f
|
LP-29 don't switch off lights when terrain is present
this will work only with osgearth version greater than 2.7
|
2016-02-25 23:34:13 +01:00 |
|
Philippe Renon
|
a59740a5ff
|
LP-29 improve initialization of scene graph
addresses issue with initial camera position
|
2016-02-25 23:28:44 +01:00 |
|
Laurent Lalanne
|
e1dadbce02
|
LP-240 Change names to Auxiliary - Disable auxMag alarm if not available.
|
2016-02-25 22:54:27 +01:00 |
|
Philippe Renon
|
6c6f184d28
|
LP-29 simplify viewport resizing handling and other cleanups
|
2016-02-24 22:49:55 +01:00 |
|
Philippe Renon
|
9c42319e36
|
LP-29 add OSGShapeNode and remove OSGCubeNode
OSGShape node supports cube, sphere, torus and 3D axis
|
2016-02-24 22:49:53 +01:00 |
|
Philippe Renon
|
c75299c4ec
|
LP-29 remove problematic calls to traverse (update only applies to current node)
|
2016-02-24 22:49:52 +01:00 |
|
Philippe Renon
|
d2c8d6c657
|
LP-29 made OSGTransform node position/attitude handling more consistent
|
2016-02-24 22:49:46 +01:00 |
|
Laurent Lalanne
|
9c4b7498cd
|
LP-240 Add aux/onboard Mag alarms, max deviation level settings. Renamed Tab to "Mag settings"
|
2016-02-24 16:33:03 +01:00 |
|
Laurent Lalanne
|
45c42537b1
|
LP-240 Add GUI tab for external Magnetometer
|
2016-02-24 01:30:56 +01:00 |
|
Fredrik Arvidsson
|
98d416c493
|
LP-235 Adding GUI for failsafe configuration.
TODO: Fix text in Failsafe tab to have information about how failsafe works and is intended to be configured.
|
2016-02-24 00:16:03 +01:00 |
|
Philippe Renon
|
bdb42246e8
|
LP-29 fix osg attitude handling issue when pitch close to +/-90 (thank you @liftbag for reporting it)
|
2016-02-22 23:40:37 +01:00 |
|
Philippe Renon
|
e4b4d21ce1
|
LP-230 we are in 2016 for more than a month now...
|
2016-02-22 23:36:40 +01:00 |
|
Philippe Renon
|
60c417685f
|
LP-230 add copyright notice
|
2016-02-22 23:21:48 +01:00 |
|
Laurent Lalanne
|
0d43a030de
|
LP-230 PFD : Missed Uninitialized state for Gps and Attitude alarms.
|
2016-02-22 21:38:02 +01:00 |
|
Laurent Lalanne
|
35612b41f3
|
LP-230 Waypoint fixes velocity, altitude and heading needed for auto modes
|
2016-02-22 20:27:01 +01:00 |
|
Laurent Lalanne
|
59808be4e2
|
LP-230 Import UAVTalk.* from javacript file
|
2016-02-22 20:27:00 +01:00 |
|
Laurent Lalanne
|
076961a603
|
LP-230 Remove magic number using enumCount
|
2016-02-22 20:27:00 +01:00 |
|
Laurent Lalanne
|
220eb033d9
|
LP-230 UAVObject generator : Add enum count. Thanks @filnet
|
2016-02-22 20:26:54 +01:00 |
|
Laurent Lalanne
|
08e6dd8cc6
|
LP-230 PFD: Create and centralize functions + fixes
|
2016-02-20 19:23:54 +01:00 |
|
Laurent Lalanne
|
9c176fc7f6
|
LP-230 PFD panels : Adjust field's position
|
2016-02-20 19:23:54 +01:00 |
|
Laurent Lalanne
|
7948d481fe
|
LP-230 Add DJI Gps and Mag type to system panel. Add OPLM Link state to OPLM panel.
Display DOP without unit. Remove small OP logo over System icon.
|
2016-02-20 19:23:54 +01:00 |
|
Laurent Lalanne
|
ec0067ffcb
|
LP-232 Hide configAlarmStatus label when disconnected
|
2016-02-17 16:21:17 +01:00 |
|
Laurent Lalanne
|
7c70da1123
|
LP-232 Display Flight Mode alarm into Flight mode tab
|
2016-02-17 15:18:36 +01:00 |
|
Philippe Renon
|
ed8b834e37
|
hotfix : enable auto scaling for high dpi devices on windows only
|
2016-02-12 22:27:01 +01:00 |
|
Philippe Renon
|
ed225b1935
|
LP-29 osgearth: minor code cleanups
|
2016-02-09 00:13:38 +01:00 |
|
Philippe Renon
|
05d806f6f1
|
LP-29 upgrade to osg 3.5.1 to match version used on windows
|
2016-02-09 00:13:38 +01:00 |
|
James Duley
|
16d52016e1
|
hotfix: use msys2 osg, disable osgearth by default
|
2016-01-31 12:02:58 +00:00 |
|
Philippe Renon
|
24fd463bfd
|
Merged in filnet/librepilot/LP-216_high_dpi (pull request #165)
LP-216 enable auto scaling on high dpi devices
|
2016-01-30 15:28:21 +01:00 |
|
Philippe Renon
|
b7f2f2cb47
|
LP-216 enable auto scaling on high dpi devices
|
2016-01-24 21:12:39 +01:00 |
|
Laurent Lalanne
|
a46bf079de
|
LP-214 Add Fpv Camera tilt compensation
|
2016-01-24 21:12:35 +01:00 |
|
Fredrik Arvidsson
|
e17d809120
|
Merge branch 'next' into thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support
|
2016-01-24 21:11:35 +01:00 |
|
Lalanne Laurent
|
da884f5432
|
Merged in f5soh/librepilot/LP-214_Camera_tilt_compensation (pull request #158)
LP-214 Camera tilt compensation
|
2016-01-24 17:56:59 +01:00 |
|
Laurent Lalanne
|
f20adf00f5
|
LP-214 Add Fpv Camera tilt compensation
|
2016-01-24 16:35:32 +01:00 |
|
Laurent Lalanne
|
0fe61b1677
|
LP-209 Define correct Oplink name for auto-load local firmware build
|
2016-01-24 16:15:15 +01:00 |
|
Philippe Renon
|
85e2ff40f6
|
Merged in f5soh/librepilot/LP-94_Revo_Attitude_wiki_link (pull request #160)
LP-94 Revo Attitude tab : Add help link to wiki page.
|
2016-01-24 13:55:52 +01:00 |
|
Philippe Renon
|
58dd4de1c6
|
windows: don't build both debug and release
somehow only windows does that and needs to be told not to
|
2016-01-23 14:41:43 +01:00 |
|
Philippe Renon
|
e3926b9c08
|
LP-218 revert to using mesa opengl32.dll (msys2 provided one crashes GCS)
|
2016-01-23 14:41:33 +01:00 |
|
Philippe Renon
|
e42539347b
|
windows: remove obsolete sdl_install and openssl_install make targets (now provided by msys2)
|
2016-01-23 01:55:34 +01:00 |
|
Philippe Renon
|
d222361663
|
cleanup all copydata.pro files
|
2016-01-23 01:55:34 +01:00 |
|
Philippe Renon
|
9c25180483
|
LP-29 minor comment fix on how to enable OSG debug logging
|
2016-01-20 08:18:21 +01:00 |
|
Laurent Lalanne
|
400af92fd8
|
LP-94 Revo Attitude tab : Add help link to wiki page.
|
2016-01-20 02:31:31 +01:00 |
|
Philippe Renon
|
62c8f4c4ad
|
LP-29 remove modelview sources
|
2016-01-19 22:44:17 +01:00 |
|
Philippe Renon
|
80dafbe446
|
LP-29 remove glc_lib sources
|
2016-01-19 22:43:26 +01:00 |
|
Fredrik Arvidsson
|
b26b861007
|
Merge remote-tracking branch 'libre/next' into thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support
|
2016-01-16 12:34:09 +01:00 |
|
Fredrik Arvidsson
|
0d660d33ad
|
LP-104 LP-196 Changes to address review comments and then uncrustification.
|
2016-01-16 12:19:34 +01:00 |
|
James Duley
|
f89031dc6c
|
Fix osg 3.2 compat
|
2016-01-16 00:07:58 +00:00 |
|
James Duley
|
72560638c8
|
Rework osg config options
|
2016-01-15 23:41:09 +00:00 |
|
James Duley
|
6dd13bc698
|
fix some pfd paths
|
2016-01-15 23:00:03 +00:00 |
|
Philippe Renon
|
38d1472f94
|
LP-29 changed PFD Panels animation type from Easing.InOutExpo and Easing.OutExpo
|
2016-01-15 21:28:12 +01:00 |
|
Philippe Renon
|
f5a1498b36
|
LP-29 make dependency on osgQt and osgearthQt optional
|
2016-01-15 08:55:46 +01:00 |
|
Philippe Renon
|
3cc581a002
|
LP-29 clean white spaces in PFDWorldView
|
2016-01-15 08:54:34 +01:00 |
|
Philippe Renon
|
9acb3d6595
|
LP-29 fix PFD pitch alignement on behalf of Laurent
introduce a scale factor so pitch aligns on dash and not on text
|
2016-01-15 08:51:32 +01:00 |
|
Philippe Renon
|
2d59530f6e
|
LP-29 further adaptations to msys2
fix list of mingw provided dependencies
fix path handling
other related cleanups
|
2016-01-14 03:02:17 +01:00 |
|
Philippe Renon
|
b4f4cd48f0
|
LP-29 fixed typos
|
2016-01-12 02:37:13 +01:00 |
|
Philippe Renon
|
c0613fe6d0
|
Adapted osgearth branch to msys2
Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration
# Conflicts:
# Makefile
# ground/gcs/src/libs/osgearth/copydata.pro
# make/tools.mk
|
2016-01-12 02:32:16 +01:00 |
|
Philippe Renon
|
48a665c78a
|
LP-29 remove unused font
|
2016-01-10 22:34:03 +01:00 |
|
Philippe Renon
|
3d7558c28b
|
LP-29 split osg and osgearth SDKs and make osgearth optional
|
2016-01-10 22:33:57 +01:00 |
|
James Duley
|
294f22d422
|
Merged in james-duley/librepilot/LP-187_use_Msys2 (pull request #132)
LP-187 Use MSYS2
|
2016-01-10 17:17:33 +00:00 |
|
James Duley
|
02e03259d3
|
LP-187 MSYS2: dont't explicitly specifiy qt spec
|
2016-01-10 17:11:46 +00:00 |
|
James Duley
|
df04a87831
|
LP-187 MSYS2: correct copy data dlls for msys2
|
2016-01-10 17:11:46 +00:00 |
|
Laurent Lalanne
|
3579e89af3
|
LP-194 Still Yaw attitude slider, remove.
|
2016-01-10 13:37:17 +01:00 |
|
Laurent Lalanne
|
2b3d5d6ee0
|
LP-104 LP-196 Wizard Input page: change layout
|
2016-01-09 22:33:11 +01:00 |
|
Laurent Lalanne
|
9f947ca9a4
|
LP-196 SetupWizard : Add Jeti EX.Bus support
|
2016-01-09 21:44:50 +01:00 |
|
Laurent Lalanne
|
bb8fdd3d62
|
Merge remote-tracking branch 'bitbucket_mthread/thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support' into LP-104_HoTT_wizard_next
|
2016-01-09 20:39:08 +01:00 |
|
Fredrik Arvidsson
|
d32cc0e7fb
|
Merge branch 'thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support_15.09' into thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support
|
2016-01-09 19:18:48 +01:00 |
|
Fredrik Arvidsson
|
41b95231db
|
LP-104 LP-196 Updated some constants after refactoring.
|
2016-01-09 19:13:17 +01:00 |
|
Fredrik Arvidsson
|
02c981388a
|
Merge branch 'thread/LP-196_Jeti_Ex_Bus_15.09' into thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support_15.09
# Conflicts:
# flight/targets/boards/coptercontrol/board_hw_defs.c
# flight/targets/boards/coptercontrol/firmware/pios_board.c
# flight/targets/boards/revolution/board_hw_defs.c
# flight/targets/boards/revolution/firmware/inc/pios_config.h
# flight/targets/boards/revolution/firmware/pios_board.c
# flight/targets/boards/revonano/firmware/inc/pios_config.h
# flight/targets/boards/revonano/firmware/pios_board.c
# shared/uavobjectdefinition/hwsettings.xml
# shared/uavobjectdefinition/manualcontrolsettings.xml
# shared/uavobjectdefinition/receiveractivity.xml
|
2016-01-09 16:59:24 +01:00 |
|
Lalanne Laurent
|
f86152b723
|
Merged in f5soh/librepilot/LP-194_Hidde_Attitude_Yaw (pull request #144)
LP-194 Stabilization tab: Remove Attitude Yaw, Cleanup/rename
|
2016-01-09 12:58:57 +01:00 |
|
Laurent Lalanne
|
93a6b99dab
|
Merge remote-tracking branch 'origin/next' into LP-201_Y6_mixer
|
2016-01-09 12:48:01 +01:00 |
|
Fredrik Arvidsson
|
bc80c66c2b
|
LP-196 Removed some leftover code and definitions.
|
2016-01-07 14:22:52 +01:00 |
|
Fredrik Arvidsson
|
359266ab7a
|
LP-104 Removed support for HoTT on Main port on coptercontrol target since it does not work.
|
2016-01-07 13:01:46 +01:00 |
|
Philippe Renon
|
72c7623a1b
|
Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration
# Conflicts:
# ground/gcs/src/libs/osgearth/osgearth.pro
|
2016-01-06 22:16:32 +01:00 |
|
Philippe Renon
|
6b39fc0800
|
uncrustify
|
2016-01-04 21:41:45 +01:00 |
|
Philippe Renon
|
f7271df0e5
|
LP-30 fixed windows debug build
|
2016-01-04 21:36:38 +01:00 |
|
Fredrik Arvidsson
|
e07ded404e
|
LP-196 Added Jeti receiver modes to input configuration code.
|
2015-12-31 16:20:14 +01:00 |
|
Laurent Lalanne
|
c837062ebc
|
LP-201 Set new default mixer values for Y6
|
2015-12-22 13:06:07 +01:00 |
|
Philippe Renon
|
6e1224dd38
|
LP-183 introduce an underscore between property name and element name when concatenating digits if not
|
2015-12-21 21:50:55 +01:00 |
|
Laurent Lalanne
|
5a31dcec09
|
LP-104 SetupWizard : Add Revo support for HoTT
|
2015-12-21 00:19:33 +01:00 |
|
Laurent Lalanne
|
3cc34e6475
|
LP-104 Graupner Hott support for Wizard. Artwork and CC3D input
|
2015-12-20 23:37:51 +01:00 |
|
Laurent Lalanne
|
24c03378f0
|
Merge remote-tracking branch 'bitbucket_mthread/thread/LP-104_HOTT_SUMD_Support_15.09' into LP-104_HoTT_wizard_next
|
2015-12-20 22:17:00 +01:00 |
|
Philippe Renon
|
cefcacbbcf
|
Merged in filnet/librepilot (pull request #141)
LP-183 fix GCS regression caused by UAVObject generator changes
|
2015-12-20 20:44:06 +01:00 |
|
Philippe Renon
|
8df41f5863
|
Merged in f5soh/librepilot/LP-197_Qt-5.5.1_Fr_translation_broken (pull request #137)
LP-197 Broken translation with Qt-5.5.1
|
2015-12-20 20:43:33 +01:00 |
|
Philippe Renon
|
fa95dfe075
|
Merged in f5soh/librepilot/LP-200_Remove_Opie (pull request #143)
LP-200 Remove hidden Opie from About dialog
|
2015-12-20 20:42:33 +01:00 |
|
Philippe Renon
|
886c2ccb47
|
Merged in leafarB/librepilot (pull request #138)
Next
|
2015-12-20 20:41:23 +01:00 |
|
Laurent Lalanne
|
faa35dd970
|
LP-194 Stabilization tab: Remove Attitude Yaw, Cleanup/rename
Fix for basic/advanced tab and Rate values
|
2015-12-20 19:38:29 +01:00 |
|
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
|
77613ddd9e
|
LP-29 uncrustified
|
2015-12-09 08:27:38 +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 |
|