20,741
edits
(http://forum.flightgear.org/viewtopic.php?f=81&p=276886#p276886) |
(→Status) |
||
Line 62: | Line 62: | ||
}} | }} | ||
== Background == | |||
{{FGCquote | |||
|1= 3.4 is required, based on looking at this: https://gitlab.com/poweroftwo/flightgear-osgearth/commits/OsgEarth-FG3.4-Kdis | |||
However, most SG/FG related changes that would conflict with a merge are relatively trivial, i.e. could be resolved by manual edits pretty easily - I don't think that there's lots of scenery related code that got updated recently, i.e. anything affecting the osgEarth patch - simply because FG/osgEarth overrides much of the standard scenery engine anyway. | |||
I *assume* that merge conflicts should be relatively straightforward to fix up - but it would make sense to look at the latest release branch in that case. | |||
But even that, people would still need to build the whole shebang | |||
|2= {{cite web | |||
| url = http://forum.flightgear.org/viewtopic.php?p=276886#p276886 | |||
| title = <nowiki>Re: 3.2 osgearth or other integrated real time satellite dat</nowiki> | |||
| author = <nowiki>Hooray</nowiki> | |||
| date = Feb 20th, 2016 | |||
| added = Feb 20th, 2016 | |||
| script_version = 0.25 | |||
}} | |||
}} | |||
== Status == | == Status == | ||
{{FGCquote | {{FGCquote |