Merge branch 'master' into feature/license

This commit is contained in:
Alexander Bock
2020-06-12 17:36:31 +02:00
59 changed files with 966 additions and 979 deletions
+1 -1
View File
@@ -24,7 +24,7 @@ asset.onInitialize(function ()
-- Jump back one day to be able to show complete weather data on Earth.
openspace.time.setTime(openspace.time.advancedTime(now, "-1d"))
openspace.globebrowsing.goToGeo("Earth", 58.5877, 16.1924, 20000000)
openspace.globebrowsing.goToGeo("Earth", 58.5877, 16.1924, 2.7e12)
openspace.markInterestingNodes({ "Earth", "Mars", "Moon", "Sun" })
end)
@@ -61,7 +61,12 @@ local Voyager1 = {
Rotation = {
Type = "SpiceRotation",
SourceFrame = "VG1_SC_BUS",
DestinationFrame = "GALACTIC"
DestinationFrame = "GALACTIC",
TimeFrame = {
Type = "TimeFrameInterval",
Start = "1977-SEP-05 14:10:11.786",
End = "2027-DEC-27"
}
}
},
GUI = {
@@ -64,7 +64,12 @@ local Voyager2 = {
Rotation = {
Type = "SpiceRotation",
SourceFrame = "VG2_SC_BUS",
DestinationFrame = "GALACTIC"
DestinationFrame = "GALACTIC",
TimeFrame = {
Type = "TimeFrameInterval",
Start = "1977-AUG-20 16:07:06.535",
End = "2027-DEC-27"
}
}
},
GUI = {
@@ -112,12 +112,12 @@ local Earth = {
)
},
{
Name = "BMNH [Utah]",
Name = "BMNG [Utah]",
Identifier = "BMNG_Utah",
FilePath = mapServiceConfigsPath .. "/Utah/Bmng.wms"
},
{
Name = "BMNH [Sweden]",
Name = "BMNG [Sweden]",
Identifier = "BMNG_Sweden",
FilePath = mapServiceConfigsPath .. "/LiU/Bmng.wms"
},
@@ -100,12 +100,12 @@ local Moon = {
},
{
Identifier = "Lola_Clr_Shade_Utah",
Name = "Lola Clear Shade [Utah]",
Name = "Lola Color Shade [Utah]",
FilePath = mapServiceConfigs .. "/Utah/LolaClrShade.wms"
},
{
Identifier = "Lola_Clr_Shade_Sweden",
Name = "Lola Clear Shade [Sweden]",
Name = "Lola Color Shade [Sweden]",
FilePath = mapServiceConfigs .. "/LiU/Lola_Clr_Shade.wms"
},
{