diff --git a/Aircraft/Generic/Effects/null_bumpspec.png b/Aircraft/Generic/Effects/null_bumpspec.png
new file mode 100644
index 000000000..8d65741bf
Binary files /dev/null and b/Aircraft/Generic/Effects/null_bumpspec.png differ
diff --git a/Effects/reflect-bump-spec.eff b/Effects/reflect-bump-spec.eff
new file mode 100644
index 000000000..e9dd7f0c3
--- /dev/null
+++ b/Effects/reflect-bump-spec.eff
@@ -0,0 +1,316 @@
+
+
+
+ Effects/reflect-bump-spec
+ Effects/model-default
+
+
+
+ Aircraft/Generic/Effects/null_bumpspec.png
+ linear-mipmap-linear
+ repeat
+ repeat
+ normalized
+
+
+ cubemap
+
+
+
+
+
+ Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_px.png
+ Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_nx.png
+ Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_py.png
+ Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_ny.png
+ Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_pz.png
+ Aircraft/Generic/Effects/CubeMaps/fair-sky/fair-sky_nz.png
+
+
+
+
+ Aircraft/Generic/Effects/Rainbow.png
+ linear-mipmap-linear
+ repeat
+ repeat
+ normalized
+
+
+ Aircraft/Generic/Effects/FresnelLookUp.png
+ linear-mipmap-linear
+ repeat
+ repeat
+ normalized
+
+
+ Aircraft/737-300/Models/Effects/733LH.ReflectionMap3.png
+ linear-mipmap-linear
+ repeat
+ repeat
+ normalized
+
+ transparent
+ smooth
+ 0.01
+ 0.1
+ 0.25
+ 0.0
+ 0.05
+ 0
+
+
+
+ 6
+ 7
+
+
+
+
+
+ /sim/rendering/shader-effects
+
+
+ 2.0
+
+
+
+ GL_ARB_shader_objects
+ GL_ARB_shading_language_100
+ GL_ARB_vertex_shader
+ GL_ARB_fragment_shader
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 0
+
+
+
+
+
+
+
+
+ 4
+
+
+
+
+
+
+
+
+ 5
+
+
+
+
+
+
+
+
+
+
+ 6
+
+
+
+
+
+
+
+
+ 7
+
+
+
+
+
+
+
+
+ 8
+
+
+
+
+
+
+
+
+ 9
+ noise
+
+
+
+
+ Shaders/reflect-bump-spec.vert
+ Shaders/reflect-bump-spec.frag
+
+ tangent
+ 6
+
+
+ binormal
+ 7
+
+
+
+
+ BaseTex
+ sampler-2d
+ 0
+
+
+
+ NormalTex
+ sampler-2d
+ 4
+
+
+
+ Environment
+ sampler-cube
+ 5
+
+
+
+ Rainbow
+ sampler-2d
+ 6
+
+
+
+ Fresnel
+ sampler-2d
+ 7
+
+
+
+ Map
+ sampler-2d
+ 8
+
+
+
+ Noise
+ sampler-3d
+ 9
+
+
+
+
+ rainbowiness
+ float
+
+
+
+
+
+ fresneliness
+ float
+
+
+
+
+
+ noisiness
+ float
+
+
+
+
+
+ refl_correction
+ float
+
+
+
+
+
+ ambient_correction
+ float
+
+
+
+
+
+ reflect_map
+ float
+
+
+
+
+
+
diff --git a/Shaders/reflect-bump-spec.frag b/Shaders/reflect-bump-spec.frag
new file mode 100644
index 000000000..f8f1a3b6d
--- /dev/null
+++ b/Shaders/reflect-bump-spec.frag
@@ -0,0 +1,123 @@
+// -*- mode: C; -*-
+// Licence: GPL v2
+// Author: Vivian Meazza.
+
+#version 120
+
+varying vec4 rawpos;
+varying vec4 ecPosition;
+varying vec3 VNormal;
+varying vec3 VTangent;
+varying vec3 VBinormal;
+varying vec3 Normal;
+varying vec4 constantColor;
+varying vec3 vViewVec;
+varying vec3 reflVec;
+
+varying vec4 Diffuse;
+varying vec3 lightDir, halfVector;
+varying float alpha, fogCoord;
+
+uniform samplerCube Environment;
+uniform sampler2D Rainbow;
+uniform sampler2D BaseTex;
+uniform sampler2D Fresnel;
+uniform sampler2D Map;
+uniform sampler2D NormalTex;
+uniform sampler3D Noise;
+
+uniform float refl_correction;
+uniform float rainbowiness;
+uniform float fresneliness;
+uniform float noisiness;
+uniform float ambient_correction;
+uniform float reflect_map;
+
+void main (void)
+{
+ vec3 halfV;
+ float NdotL, NdotHV;
+ vec4 color = constantColor;
+ vec4 specular = vec4(0.0);
+ vec4 ns = texture2D(NormalTex, gl_TexCoord[0].st);
+ vec3 n = ns.rgb * 2.0 - 1.0;
+ n = normalize(n.x * VTangent + n.y * VBinormal + n.z * VNormal);
+ NdotL = max(0.0, dot(n, lightDir));
+
+ // calculate the specular light
+ if (NdotL > 0.0) {
+ color += Diffuse * NdotL;
+ halfV = normalize(halfVector);
+ NdotHV = max(dot(n, halfV), 0.0);
+ if (gl_FrontMaterial.shininess > 0.0)
+ specular.rgb = (gl_FrontMaterial.specular.rgb * ns.a
+ * gl_LightSource[0].specular.rgb
+ * pow(NdotHV, gl_FrontMaterial.shininess));
+ }
+
+ color.a = alpha;
+ color = clamp(color, 0.0, 1.0);
+ vec4 texel = texture2D(BaseTex, gl_TexCoord[0].st);
+ vec4 texelcolor = color * texel + specular;
+
+ // calculate the fog factor
+ float fogCoord = ecPosition.z;
+ const float LOG2 = 1.442695;
+ float fogFactor = exp2(-gl_Fog.density * gl_Fog.density * fogCoord * fogCoord * LOG2);
+ fogFactor = clamp(fogFactor, 0.0, 1.0);
+
+ if(gl_Fog.density == 1.0)
+ fogFactor=1.0;
+
+ vec3 normal = normalize(VNormal);
+ vec3 viewVec = normalize(vViewVec);
+
+ // Map a rainbowish color
+ float v = dot(viewVec, normal);
+ vec4 rainbow = texture2D(Rainbow, vec2(v, 0.0));
+
+ // Map a fresnel effect
+ vec4 fresnel = texture2D(Fresnel, vec2(v, 0.0));
+
+ // map the refection of the environment
+ vec4 reflection = textureCube(Environment, reflVec);
+
+ // set the user shininess offse
+ float transparency_offset = clamp(refl_correction, -1.0, 1.0);
+ float reflFactor = 0.0;
+
+ if(reflect_map > 0){
+ // map the shininess of the object with user input
+ vec4 map = texture2D(Map, gl_TexCoord[0].st);
+ //float pam = (map.a * -2) + 1; //reverse map
+ reflFactor = map.a + transparency_offset;
+ } else {
+ // set the reflectivity proportional to shininess with user
+ // input
+ reflFactor = (gl_FrontMaterial.shininess / 128) + transparency_offset;
+ }
+
+ reflFactor = clamp(reflFactor * ns.a, 0.0, 1.0);
+
+ // set ambient adjustment to remove bluiness with user input
+ float ambient_offset = clamp(ambient_correction, -1.0, 1.0);
+ vec4 ambient_Correction = vec4(gl_LightSource[0].ambient.rg, gl_LightSource[0].ambient.b * 0.6, 0.5) * ambient_offset ;
+ ambient_Correction = clamp(ambient_Correction, -1.0, 1.0);
+
+ // map noise vectore
+ vec4 noisevec = texture3D(Noise, rawpos.xyz);
+
+ // add fringing fresnel and rainbow effects and modulate by reflection
+ vec4 reflcolor = mix(reflection, rainbow, rainbowiness * v);
+ vec4 reflfrescolor = mix(reflcolor, fresnel, fresneliness * v);
+ vec4 noisecolor = mix(reflfrescolor, noisevec, noisiness);
+ vec4 raincolor = vec4(noisecolor.rgb * reflFactor, 1.0);
+
+ vec4 mixedcolor = mix(texel, raincolor, reflFactor);
+
+ // the final reflection
+ vec4 reflColor = color * mixedcolor + specular + ambient_Correction ;
+ reflColor = clamp(reflColor, 0.0, 1.0);
+
+ gl_FragColor = mix(gl_Fog.color, reflColor, fogFactor);
+}
diff --git a/Shaders/reflect-bump-spec.vert b/Shaders/reflect-bump-spec.vert
new file mode 100644
index 000000000..d2b7e9ff2
--- /dev/null
+++ b/Shaders/reflect-bump-spec.vert
@@ -0,0 +1,69 @@
+// -*- mode: C; -*-
+// Licence: GPL v2
+// Author: Vivian Meazza.
+
+varying vec4 rawpos;
+varying vec4 ecPosition;
+varying vec3 VNormal;
+varying vec3 VTangent;
+varying vec3 VBinormal;
+varying vec3 Normal;
+varying vec4 constantColor;
+varying vec3 vViewVec;
+varying vec3 reflVec;
+
+varying vec4 Diffuse;
+varying vec3 normal, lightDir, halfVector;
+varying float alpha, fogCoord;
+
+uniform mat4 osg_ViewMatrixInverse;
+
+attribute vec3 tangent;
+attribute vec3 binormal;
+
+void main(void)
+{
+ rawpos = gl_Vertex;
+ ecPosition = gl_ModelViewMatrix * gl_Vertex;
+ vec3 ecPosition3 = vec3(gl_ModelViewMatrix * gl_Vertex) / ecPosition.w;
+
+ vec3 t = normalize(cross(gl_Normal, vec3(1.0,0.0,0.0)));
+ vec3 b = normalize(cross(gl_Normal,t));
+ vec3 n = normalize(gl_Normal);
+
+ VNormal = normalize(gl_NormalMatrix * gl_Normal);
+ VTangent = normalize(gl_NormalMatrix * tangent);
+ VBinormal = normalize(gl_NormalMatrix * binormal);
+ Normal = normalize(gl_Normal);
+
+ lightDir = normalize(vec3(gl_LightSource[0].position));
+ halfVector = normalize(gl_LightSource[0].halfVector.xyz);
+ Diffuse = gl_Color * gl_LightSource[0].diffuse;
+ //Diffuse= gl_Color.rgb * max(0.0, dot(normalize(VNormal), gl_LightSource[0].position.xyz));
+ // Super hack: if diffuse material alpha is less than 1, assume a
+ // transparency animation is at work
+ if (gl_FrontMaterial.diffuse.a < 1.0)
+ alpha = gl_FrontMaterial.diffuse.a;
+ else
+ alpha = gl_Color.a;
+
+ fogCoord = abs(ecPosition3.z);
+
+ // Vertex in eye coordinates
+ vec3 vertVec = ecPosition.xyz;
+
+ vViewVec.x = dot(t, vertVec);
+ vViewVec.y = dot(b, vertVec);
+ vViewVec.z = dot(n, vertVec);
+
+ // calculate the reflection vector
+ vec4 reflect_eye = vec4(reflect(vertVec, VNormal), 0.0);
+ reflVec = normalize(gl_ModelViewMatrixInverse * reflect_eye).xyz;
+
+ gl_FrontColor = gl_Color;
+ constantColor = gl_FrontMaterial.emission
+ + gl_Color * (gl_LightModel.ambient + gl_LightSource[0].ambient);
+
+ gl_Position = ftransform();
+ gl_TexCoord[0] = gl_TextureMatrix[0] * gl_MultiTexCoord0;
+}
\ No newline at end of file
diff --git a/gui/dialogs/AIcarrier.xml b/gui/dialogs/AIcarrier.xml
new file mode 100644
index 000000000..fda87ccb0
--- /dev/null
+++ b/gui/dialogs/AIcarrier.xml
@@ -0,0 +1,221 @@
+
+
+
+ AIcarrier
+ false
+ vbox
+
+
+
+
+
+ left
+
+
+ 0.9
+ 0.9
+ 0.9
+ 1
+
+
+
+
+ hbox
+
+ 10
+
+
+
+ vbox
+
+
+ left
+
+ /ai/models/carrier/controls/turn-to-launch-hdg
+ true
+
+ dialog-apply
+
+
+ nasal
+
+
+
+
+
+ left
+
+ /ai/models/carrier/controls/turn-to-recovery-hdg
+ true
+
+ dialog-apply
+
+
+ nasal
+
+
+
+
+
+ left
+
+ /ai/models/carrier/controls/turn-to-base-course
+ true
+
+ dialog-apply
+
+
+ nasal
+
+
+
+
+
+ left
+
+ /ai/models/carrier/controls/elevators
+
+ dialog-apply
+
+
+ nasal
+
+
+
+
+
+ left
+
+ /sim/current-view/lso-commentary
+
+ dialog-apply
+
+
+
+
+ left
+
+ /sim/current-view/deck-park
+
+ dialog-apply
+
+
+
+
+ left
+
+ /ai/models/carrier/controls/lighting/deck-lights
+
+ dialog-apply
+
+
+ nasal
+
+
+
+
+
+ left
+
+
+
+
+ left
+ 75
+ 25
+ /ai/models/carrier/controls/lighting/flood-lights-red-norm
+
+ nasal
+
+
+
+
+
+
+
+ true
+
+
+
+
+ hbox
+ 6
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
\ No newline at end of file
diff --git a/gui/dialogs/ai.xml b/gui/dialogs/ai.xml
new file mode 100644
index 000000000..bba1c22eb
--- /dev/null
+++ b/gui/dialogs/ai.xml
@@ -0,0 +1,74 @@
+
+
+
+
+
+ ai
+ false
+ vbox
+
+
+
+
+
+
+
+
+
+
+
+
+
+ hbox
+
+ 10
+
+
+
+ vbox
+
+
+
+
+ left
+
+ /sim/ai-traffic/enabled
+
+
+
+ hbox
+
+
+ left
+
+
+
+
+ left
+ /sim/ai-traffic/level
+ 1
+ 2
+ 3
+
+
+
+
+
+
+ true
+
+
+
\ No newline at end of file
diff --git a/gui/dialogs/radios.xml b/gui/dialogs/radios.xml
index bd8f95bc3..900962601 100644
--- a/gui/dialogs/radios.xml
+++ b/gui/dialogs/radios.xml
@@ -4,7 +4,7 @@
radios
600
- 330
+ 370
false
@@ -505,5 +505,15 @@
+
+ 400
+ 60
+
+
diff --git a/gui/dialogs/osg_display_settings.xml b/gui/dialogs/stereoscopic-view-options.xml
similarity index 54%
rename from gui/dialogs/osg_display_settings.xml
rename to gui/dialogs/stereoscopic-view-options.xml
index da319f633..b873861fa 100644
--- a/gui/dialogs/osg_display_settings.xml
+++ b/gui/dialogs/stereoscopic-view-options.xml
@@ -2,8 +2,7 @@
-
- osg-display-settings
+ stereoscopic-view-options
false
false
vbox
@@ -18,7 +17,7 @@
-
+
@@ -71,7 +70,7 @@
true
0
- 1.0
+ 10.0
/sim/rendering/osg-displaysettings/screen-distance
dialog-apply
@@ -106,77 +105,4 @@
-
- hbox
- 1
-
- true
-
- true
- /sim/rendering/osg-displaysettings/double-buffer
-
- dialog-apply
-
-
-
-
-
- hbox
- 1
-
- true
-
- true
- /sim/rendering/osg-displaysettings/depth-buffer
-
- dialog-apply
-
-
-
-
-
- hbox
- 1
-
- true
-
- true
- /sim/rendering/osg-displaysettings/rgb
-
- dialog-apply
-
-
-
-
-
- hbox
- 1
-
- true
-
- 100
- 25
- true
- /sim/rendering/osg-displaysettings/screen-width
-
- dialog-apply
-
-
-
-
-
- hbox
- 1
-
- true
-
- 100
- 25
- true
- /sim/rendering/osg-displaysettings/screen-height
-
- dialog-apply
-
-
-
diff --git a/gui/dialogs/view.xml b/gui/dialogs/view.xml
index d1c1a2ad7..b105ee1db 100644
--- a/gui/dialogs/view.xml
+++ b/gui/dialogs/view.xml
@@ -6,7 +6,7 @@
vbox
-
+
diff --git a/gui/dialogs/weather.xml b/gui/dialogs/weather.xml
index 362c0e322..058e25879 100644
--- a/gui/dialogs/weather.xml
+++ b/gui/dialogs/weather.xml
@@ -96,6 +96,12 @@
dialog-apply
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
@@ -113,6 +119,12 @@
dialog-apply
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
@@ -123,6 +135,12 @@
dialog-apply
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
@@ -136,6 +154,12 @@
dialog-apply
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
@@ -153,6 +177,12 @@
dialog-apply
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
@@ -163,6 +193,12 @@
dialog-apply
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
@@ -176,6 +212,12 @@
dialog-apply
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
@@ -193,6 +235,12 @@
dialog-apply
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
@@ -203,6 +251,12 @@
dialog-apply
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
@@ -216,6 +270,12 @@
dialog-apply
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
@@ -233,6 +293,12 @@
dialog-apply
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
@@ -243,6 +309,12 @@
dialog-apply
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
@@ -256,6 +328,12 @@
dialog-apply
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
@@ -274,6 +352,12 @@
dialog-apply
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
@@ -284,6 +368,12 @@
dialog-apply
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
@@ -336,6 +426,12 @@
dialog-apply
true
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
@@ -348,6 +444,12 @@
dialog-apply
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
@@ -357,11 +459,22 @@
+ pressure-sea-level-inhg
1
3
- true
50
/environment/config/boundary/entry[0]/pressure-sea-level-inhg
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
+ true
+
+ dialog-apply
+ pressure-sea-level-inhg
+
@@ -441,243 +554,573 @@
+ aloft-4-elevation-ft
1
0
52
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[4]/elevation-ft
true
+
+ dialog-apply
+ aloft-4-elevation-ft
+
+ aloft-4-wind-from-heading-deg
1
1
40
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[4]/wind-from-heading-deg
true
+
+ dialog-apply
+ aloft-4-wind-from-heading-deg
+
+ aloft-4-wind-speed-kt
1
2
35
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[4]/wind-speed-kt
true
+
+ dialog-apply
+ aloft-4-wind-speed-kt
+
+ aloft-4-visibility-m
1
3
55
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[4]/visibility-m
true
+
+ dialog-apply
+ aloft-4-visibility-m
+
+ aloft-4-temperature-degc
1
4
60
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[4]/temperature-degc
true
+
+ dialog-apply
+ aloft-4-temperature-degc
+
+ aloft-4-dewpoint-degc
1
5
60
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[4]/dewpoint-degc
true
+
+ dialog-apply
+ aloft-4-dewpoint-degc
+
+ aloft-3-elevation-ft
2
0
52
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[3]/elevation-ft
true
+
+ dialog-apply
+ aloft-3-elevation-ft
+
+ aloft-3-wind-from-heading-deg
2
1
40
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[3]/wind-from-heading-deg
true
+
+ dialog-apply
+ aloft-3-wind-from-heading-deg
+
+ aloft-3-wind-speed-kt
2
2
35
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[3]/wind-speed-kt
true
+
+ dialog-apply
+ aloft-3-wind-speed-kt
+
+ aloft-3-visibility-m
2
3
55
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[3]/visibility-m
true
+
+ dialog-apply
+ aloft-3-visibility-m
+
+ aloft-3-temperature-degc
2
4
60
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[3]/temperature-degc
true
+
+ dialog-apply
+ aloft-3-temperature-degc
+
+ aloft-3-dewpoint-degc
2
5
60
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[3]/dewpoint-degc
true
+
+ dialog-apply
+ aloft-3-dewpoint-degc
+
+ aloft-2-elevation-ft
3
0
52
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[2]/elevation-ft
true
+
+ dialog-apply
+ aloft-2-elevation-ft
+
+ aloft-2-wind-from-heading-deg
3
1
40
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[2]/wind-from-heading-deg
true
+
+ dialog-apply
+ aloft-2-wind-from-heading-deg
+
+ aloft-2-wind-speed-kt
3
2
35
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[2]/wind-speed-kt
true
+
+ dialog-apply
+ aloft-2-wind-speed-kt
+
+ aloft-2-visibility-m
3
3
55
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[2]/visibility-m
true
+
+ dialog-apply
+ aloft-2-visibility-m
+
+ aloft-2-temperature-degc
3
4
60
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[2]/temperature-degc
true
+
+ dialog-apply
+ aloft-2-temperature-degc
+
+ aloft-2-dewpoint-degc
3
5
60
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[2]/dewpoint-degc
true
+
+ dialog-apply
+ aloft-2-dewpoint-degc
+
+ aloft-1-elevation-ft
4
0
52
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[1]/elevation-ft
true
+
+ dialog-apply
+ aloft-1-elevation-ft
+
+ aloft-1-wind-from-heading-deg
4
1
40
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[1]/wind-from-heading-deg
true
+
+ dialog-apply
+ aloft-1-wind-from-heading-deg
+
+ aloft-1-wind-speed-kt
4
2
35
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[1]/wind-speed-kt
true
+
+ dialog-apply
+ aloft-1-wind-speed-kt
+
+ aloft-1-visibility-m
4
3
55
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[1]/visibility-m
true
+
+ dialog-apply
+ aloft-1-visibility-m
+
+ aloft-1-temperature-degc
4
4
60
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[1]/temperature-degc
true
+
+ dialog-apply
+ aloft-1-temperature-degc
+
+ aloft-1-dewpoint-degc
4
5
60
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[1]/dewpoint-degc
true
+
+ dialog-apply
+ aloft-1-dewpoint-degc
+
+ aloft-0-elevation-ft
5
0
52
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[0]/elevation-ft
true
+
+ dialog-apply
+ aloft-0-elevation-ft
+
+ aloft-0-wind-from-heading-deg
5
1
40
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[0]/wind-from-heading-deg
true
+
+ dialog-apply
+ aloft-0-wind-from-heading-deg
+
+ aloft-0-wind-speed-kt
5
2
35
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[0]/wind-speed-kt
true
+
+ dialog-apply
+ aloft-0-wind-speed-kt
+
+ aloft-0-visibility-m
5
3
55
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[0]/visibility-m
true
+
+ dialog-apply
+ aloft-0-visibility-m
+
+ aloft-0-temperature-degc
5
4
60
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[0]/temperature-degc
true
+
+ dialog-apply
+ aloft-0-temperature-degc
+
+ aloft-0-dewpoint-degc
5
5
60
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/aloft/entry[0]/dewpoint-degc
true
+
+ dialog-apply
+ aloft-0-dewpoint-degc
+
@@ -741,99 +1184,231 @@
+ boundary-1-elevation-ft
1
0
52
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/boundary/entry[1]/elevation-ft
true
+
+ dialog-apply
+ boundary-1-elevation-ft
+
+ boundary-1-wind-from-heading-deg
1
1
40
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/boundary/entry[1]/wind-from-heading-deg
true
+
+ dialog-apply
+ boundary-1-wind-from-heading-deg
+
+ boundary-1-wind-speed-kt
1
2
35
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/boundary/entry[1]/wind-speed-kt
true
+
+ dialog-apply
+ boundary-1-wind-speed-kt
+
+ boundary-1-visibility-m
1
3
55
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/boundary/entry[1]/visibility-m
true
+
+ dialog-apply
+ boundary-1-visibility-m
+
+ boundary-1-temperature-degc
1
4
60
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/boundary/entry[1]/temperature-degc
true
+
+ dialog-apply
+ boundary-1-temperature-degc
+
+ boundary-1-dewpoint-degc
1
5
60
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/boundary/entry[1]/dewpoint-degc
true
+
+ dialog-apply
+ boundary-1-dewpoint-degc
+
+ boundary-0-elevation-ft
2
0
52
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/boundary/entry[0]/elevation-ft
true
+
+ dialog-apply
+ boundary-0-elevation-ft
+
+ boundary-0-wind-from-heading-deg
2
1
40
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/boundary/entry[0]/wind-from-heading-deg
true
+
+ dialog-apply
+ boundary-0-wind-from-heading-deg
+
+ boundary-0-wind-speed-kt
2
2
35
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/boundary/entry[0]/wind-speed-kt
true
+
+ dialog-apply
+ boundary-0-wind-speed-kt
+
+ boundary-0-visibility-m
2
3
55
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/boundary/entry[0]/visibility-m
true
+
+ dialog-apply
+ boundary-0-visibility-m
+
+ boundary-0-temperature-degc
2
4
60
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/boundary/entry[0]/temperature-degc
true
+
+ dialog-apply
+ boundary-0-temperature-degc
+
+ boundary-0-dewpoint-degc
2
5
60
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
/environment/config/boundary/entry[0]/dewpoint-degc
true
+
+ dialog-apply
+ boundary-0-dewpoint-degc
+
@@ -881,18 +1456,16 @@
dialog-update
metar
-
- nasal
-
-
+ metar-updates-winds-aloft
/environment/params/metar-updates-winds-aloft
true
dialog-apply
+ metar-updates-winds-aloft
aloft
@@ -933,6 +1506,12 @@
true
false
sim/gui/dialogs/weather-scenario/metar
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
@@ -941,111 +1520,140 @@
diff --git a/gui/menubar.xml b/gui/menubar.xml
index 8126aa4ea..0429ac003 100644
--- a/gui/menubar.xml
+++ b/gui/menubar.xml
@@ -1,10 +1,11 @@
+
@@ -193,7 +231,7 @@
-
-
+ H
property-assign
/sim/presets/trim
@@ -234,7 +272,7 @@
autopilot
-
-
+
dialog-show
autopilot
@@ -249,45 +287,42 @@
- -
+
-
nasal
-
- -
+
+
-
nasal
-
- -
-
-
- nasal
-
-
-
-
- -
-
-
- dialog-show
- map
-
-
+
+ -
+
+
+ nasal
+
+
+
+
+ -
+
+
+ dialog-show
+ logging
+
+
+
+
diff --git a/keyboard.xml b/keyboard.xml
index e4010ac4d..d61f3d731 100644
--- a/keyboard.xml
+++ b/keyboard.xml
@@ -272,7 +272,7 @@ top down before the key bindings are parsed.
SPACE
- PTT - Push To Talk (via VoIP)
+ PTT - Push To Talk (via FGCom)
nasal