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
|
fabdea9eee
|
LP-29 redirect osg logging to Qt (commented out for now)
|
2015-12-09 08:35:48 +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
|
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
|
8c47101562
|
LP-2 minor osg/Qt cleanup
|
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
|
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
|
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 |
|
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
|
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 |
|
Philippe Renon
|
4696378573
|
LP-29 disabled warnings on mac (mac treats warnings are errors...)
|
2015-09-12 18:04:16 +02:00 |
|
Philippe Renon
|
a7428ed9ad
|
LP-29 uncrustified
|
2015-08-30 22:16:06 +02:00 |
|
Philippe Renon
|
723ab39d59
|
LP-29 merged gcsdirs into pathutils and related cleanups
|
2015-08-30 22:14:58 +02:00 |
|
Philippe Renon
|
7b1c49c8bc
|
LP-29 osgearth copydata is now conditionned by copyosg variable + minor review comments
|
2015-08-30 21:49:04 +02:00 |
|
Philippe Renon
|
e380620587
|
LP-29 added LibrePilot copyright
|
2015-08-30 18:19:45 +02:00 |
|
Philippe Renon
|
1ec5ff4d3e
|
LP-29 removed obsolete osg libraries
|
2015-08-29 19:45:20 +02:00 |
|
Philippe Renon
|
61626338ff
|
LP-29 fixed erroneous merges
|
2015-08-29 18:51:48 +02:00 |
|
Philippe Renon
|
badffb82e3
|
LP-29 renamed ground/openpilotgcs to gcs
|
2015-08-29 15:29:51 +02:00 |
|