64 Commits

Author	SHA1	Message	Date
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	f7271df0e5	LP-30 fixed windows debug build	2016-01-04 21:36:38 +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	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	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	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
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	0dc76168a3	LP-2 remove unused windows specific utility method winGetDLLVersion (additionally had compile warnings)	2015-12-02 21:41:19 +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	7d06944a81	LP-29 remove duplicate osg lib on mac	2015-11-30 22:24: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	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	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	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
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
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
a*morale	33fd073248	Merge branch 'master' into next	2015-10-21 22:07:09 +02:00
Paul Jewell	ea8d18dffd	Fixed remaining OpenPilot Wiki Links	2015-10-07 06:18:47 +01:00
Philippe Renon	88dcb62ed6	LP-139 fixed erroneous warning about missing pfd.svg	2015-10-02 22:11:05 +02:00
Paul Jewell	bdf89acf22	Fix Google Maps version	2015-09-26 20:00:51 +01:00
Philippe Renon	0bb71cd5df	LP-125 PathUtils now returns absolute pathes again	2015-09-21 23:12:43 +02: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	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
Philippe Renon	466f4bb695	LP-29 disabled warnings on mac (mac treats warnings are errors...)	2015-09-14 21:16:34 +02:00
Philippe Renon	506ae69b50	LP-29 restored AutoClipPlaneCullCallback feature	2015-09-13 16:47:40 +02:00
Philippe Renon	e3979b0024	LP-29 moved osg RPATHDIR definition to libs/osgearth/osgearth.pro	2015-09-12 18:19:57 +02:00
Philippe Renon	865e3b3f13	LP-29 fixed osgearth copydata.pro for linux	2015-09-12 18:18:55 +02:00