From ee549e6524f25fd56dded435674b4535c76cf316 Mon Sep 17 00:00:00 2001 From: BARANGER Emmanuel Date: Sun, 10 Oct 2010 21:37:11 +0200 Subject: [PATCH 01/12] Merge branch 'master' of git://gitorious.org/fg/fgdata From 87688ddf6a34ca907f840f442965f1dea88a08cf Mon Sep 17 00:00:00 2001 From: James Turner Date: Mon, 11 Oct 2010 10:52:21 +0100 Subject: [PATCH 02/12] Thorsten Brehm: fix position-in-air dialog when a parking position was previously specified. --- gui/dialogs/location-in-air.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gui/dialogs/location-in-air.xml b/gui/dialogs/location-in-air.xml index 63e104414..4e2fa953a 100644 --- a/gui/dialogs/location-in-air.xml +++ b/gui/dialogs/location-in-air.xml @@ -260,6 +260,8 @@ nasal - - + + 75 + 25 + -180 + 180 + /ai/models/wingman/controls/break-deg-rel + + dialog-apply + + + nasal + + + left - + - + @@ -156,15 +156,8 @@ - - - - - - - hbox @@ -182,6 +175,26 @@ + + hbox + + + left + + + + + + + true From 37e42d60b042ecbf693a333982dbbb2e97279cea Mon Sep 17 00:00:00 2001 From: Vivian Meazza Date: Tue, 12 Oct 2010 23:17:35 +0100 Subject: [PATCH 10/12] Add model cockpit view dialog. Signed-off-by: Vivian Meazza --- gui/dialogs/model-cockpit-view.xml | 90 ++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 gui/dialogs/model-cockpit-view.xml diff --git a/gui/dialogs/model-cockpit-view.xml b/gui/dialogs/model-cockpit-view.xml new file mode 100644 index 000000000..be118d10b --- /dev/null +++ b/gui/dialogs/model-cockpit-view.xml @@ -0,0 +1,90 @@ + + + + model-cockpit-view + 5 + 3 + hbox + 0 + + + false + 0 + 0 + 0 + 0 + + + + + + + + 6 + + + + 0 + 1 + /sim/current-view/model-cockpit-view + + 1 + 1 + 1 + 1 + + + HELVETICA_14 + + + + + From 755a6a4d1abd48f80ac03bf0d12c1ec68f74cd7c Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Wed, 13 Oct 2010 08:14:20 +0200 Subject: [PATCH 11/12] Remove reference to inexistant texture --- Effects/water.eff | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/Effects/water.eff b/Effects/water.eff index 248950cb6..94a6cff6c 100644 --- a/Effects/water.eff +++ b/Effects/water.eff @@ -10,13 +10,6 @@ repeat normalized - - Textures/Water/water-refraction.png - linear-mipmap-linear - repeat - repeat - normalized - Textures/Water/water-normalmap.png linear-mipmap-linear @@ -84,16 +77,6 @@ texture[0]/internal-format - - 1 - texture[1]/image - texture[1]/filter - texture[1]/wrap-s - texture[1]/wrap-t - - texture[1]/internal-format - - 2 texture[2]/image @@ -124,11 +107,6 @@ 0 - water_refraction - sampler-2d - 1 - - water_normalmap sampler-2d 2 From e7e8ac84f257b6e728e259d88453ab4f6001abd8 Mon Sep 17 00:00:00 2001 From: Torsten Dreyer Date: Wed, 13 Oct 2010 20:46:31 +0200 Subject: [PATCH 12/12] don't use printlog before nasal-dir-initialized Thanks, Anders. --- Nasal/contrail.nas | 2 +- Nasal/seaport.nas | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Nasal/contrail.nas b/Nasal/contrail.nas index 3ae2fcb41..c9e93572c 100644 --- a/Nasal/contrail.nas +++ b/Nasal/contrail.nas @@ -26,8 +26,8 @@ updateContrail = func{ ### Contrail -printlog ("debug", "init contrail"); _setlistener("/sim/signals/nasal-dir-initialized", func { + printlog ("debug", "init contrail"); props.globals.initNode("environment/pressure-inhg", 1, "DOUBLE"); props.globals.initNode("environment/temperature-degc", 1, "DOUBLE"); props.globals.initNode("environment/contrail", 1, "BOOL"); diff --git a/Nasal/seaport.nas b/Nasal/seaport.nas index f496b6ecb..81786fd55 100644 --- a/Nasal/seaport.nas +++ b/Nasal/seaport.nas @@ -1,11 +1,13 @@ -_setlistener("/sim/presets/latitude-deg", func { - printlog("info", "*** NEW LOCATION ***"); - settimer(func { - var typ = getprop("/sim/type"); - var lat = getprop("/position/latitude-deg"); - var lon = getprop("/position/longitude-deg"); - var g = geodinfo(lat, lon); - if ((g != nil and g[1] != nil and g[1].solid) and (typ == "seaplane") ) - fgcommand("dialog-show", props.Node.new({ "dialog-name": "seaport" })); - }, 8); -}, 1); +_setlistener("/sim/signals/nasal-dir-initialized", func { + _setlistener("/sim/presets/latitude-deg", func { + printlog("info", "*** NEW LOCATION ***"); + settimer(func { + var typ = getprop("/sim/type"); + var lat = getprop("/position/latitude-deg"); + var lon = getprop("/position/longitude-deg"); + var g = geodinfo(lat, lon); + if ((g != nil and g[1] != nil and g[1].solid) and (typ == "seaplane") ) + fgcommand("dialog-show", props.Node.new({ "dialog-name": "seaport" })); + }, 8); + }, 1); +});