diff --git a/Effects/transition.eff b/Effects/transition.eff
index 5cb283ddd..6cee5ae55 100644
--- a/Effects/transition.eff
+++ b/Effects/transition.eff
@@ -41,7 +41,7 @@ parameters :
/environment/rain-norm
- /sim/rendering/snow-level-m
+ /environment/snow-level-m
diff --git a/Effects/urban.eff b/Effects/urban.eff
index f98dfc696..ef355b43b 100644
--- a/Effects/urban.eff
+++ b/Effects/urban.eff
@@ -4,12 +4,12 @@
Effects/terrain-default
- /sim/rendering/snow-level-m
+ /environment/snow-level-m
0.008
0.75 0.59 0.05
- /sim/rendering/shaders/quality-level
+ /sim/rendering/shaders/urban
@@ -46,20 +46,26 @@
/sim/rendering/shaders/quality-level
4.0
- /sim/rendering/shaders/quality-level
+ /sim/rendering/shaders/urban
-
-
- 2.0
-
-
- GL_ARB_shader_objects
- GL_ARB_shading_language_100
- GL_ARB_vertex_shader
- GL_ARB_fragment_shader
-
-
+
+
+
+ 2.0
+
+
+ GL_ARB_shader_objects
+ GL_ARB_shading_language_100
+ GL_ARB_vertex_shader
+ GL_ARB_fragment_shader
+
+
+
+ GL_ATI_shader_texture_lod
+ GL_ARB_shader_texture_lod
+
+
@@ -289,18 +295,24 @@
2.0
/sim/rendering/shaders/quality-level
-
-
- 2.0
-
-
- GL_ARB_shader_objects
- GL_ARB_shading_language_100
- GL_ARB_vertex_shader
- GL_ARB_fragment_shader
-
-
+
+
+
+ 2.0
+
+
+ GL_ARB_shader_objects
+ GL_ARB_shading_language_100
+ GL_ARB_vertex_shader
+ GL_ARB_fragment_shader
+
+
+
+ GL_ATI_shader_texture_lod
+ GL_ARB_shader_texture_lod
+
+
diff --git a/Environment/environment.xml b/Environment/environment.xml
index 87a4722ec..4d1466ba4 100644
--- a/Environment/environment.xml
+++ b/Environment/environment.xml
@@ -318,6 +318,8 @@
false
3200.0
diff --git a/Input/Joysticks/Accelerometers/accelerometers.xml b/Input/Joysticks/Accelerometers/accelerometers.xml
index b07c0946d..186449c2e 100644
--- a/Input/Joysticks/Accelerometers/accelerometers.xml
+++ b/Input/Joysticks/Accelerometers/accelerometers.xml
@@ -13,6 +13,7 @@ $Id$
ST LIS3LV02DL Accelerometer
+ ST LIS3L V02DL Accelerometer
diff --git a/Nasal/gui.nas b/Nasal/gui.nas
index 01f57bd28..b661c4cd8 100644
--- a/Nasal/gui.nas
+++ b/Nasal/gui.nas
@@ -1232,14 +1232,14 @@ var common_aircraft_keys = {
key: [
{ name: "Enter", desc: "move rudder right" },
{ name: "0/Insert", desc: "move rudder left" },
- { name: "1/End", desc: "decrease elevator trim" },
- { name: "2/Up", desc: "increase elevator or AP altitude" },
+ { name: "1/End", desc: "elevator trim up" },
+ { name: "2/Down", desc: "elevator up or increase AP altitude" },
{ name: "3/PgDn", desc: "decr. throttle or AP autothrottle" },
{ name: "4/Left", desc: "move aileron left or adj. AP hdg." },
{ name: "5/KP5", desc: "center aileron, elev., and rudder" },
{ name: "6/Right", desc: "move aileron right or adj. AP hdg." },
- { name: "7/Home", desc: "increase elevator trim" },
- { name: "8/Down", desc: "decrease elevator or AP altitude" },
+ { name: "7/Home", desc: "elevator trim down" },
+ { name: "8/Up", desc: "elevator down or decrease AP altitude" },
{ name: "9/PgUp", desc: "incr. throttle or AP autothrottle" },
{ name: "Space", desc: "PTT - Push To Talk (via VoIP)" },
{ name: "!/@/#/$", desc: "select engine 1/2/3/4" },
diff --git a/Nasal/weather-utility.nas b/Nasal/weather-utility.nas
index f11af508d..90e735e61 100644
--- a/Nasal/weather-utility.nas
+++ b/Nasal/weather-utility.nas
@@ -70,7 +70,6 @@ var initialize = func {
var ground_term_Node = props.globals.getNode("/environment/terminator-relative-position-m" , 1);
ground_term_Node.setDoubleValue(60000);
-
# ################## listeners ####################
#
setlistener("/environment/sea/surface/wind-speed-kt", func (n) {
@@ -111,7 +110,7 @@ var initialize = func {
},
1,
0);# end listener
-
+
print("weather util initialized ...");
loop();
@@ -157,3 +156,26 @@ setlistener("sim/signals/fdm-initialized", initialize);
# end
+###
+# Adjust snow line to match METAR
+#
+
+var snowLineDefault = 3200;
+
+_setlistener("/environment/metar/valid", func {
+ var snowCover = getprop("/environment/metar/snow-cover");
+ var snowLine = getprop("/environment/snow-level-m");
+
+ # Put the snow line slightly below the station's elevation,
+ # so the station is completely covered with snow
+ var stationElev = getprop("/environment/metar/station-elevation-ft") * globals.FT2M - 50;
+
+ if (snowCover == 1){
+ if (stationElev > snowLineDefault) { snowLine = snowLineDefault; }
+ if ((stationElev <= snowLineDefault) and (snowLine > stationElev)) { snowLine = stationElev; }
+ }
+ setprop("/environment/snow-level-m",snowLine);
+});
+
+#
+###
\ No newline at end of file
diff --git a/Shaders/urban.frag b/Shaders/urban.frag
index 9902104df..b82d4a19a 100644
--- a/Shaders/urban.frag
+++ b/Shaders/urban.frag
@@ -7,6 +7,7 @@
#version 120
#extension GL_ATI_shader_texture_lod : enable
+#extension GL_ARB_shader_texture_lod : enable
#define TEXTURE_MIP_LEVELS 10
#define TEXTURE_PIX_COUNT 1024 //pow(2,TEXTURE_MIP_LEVELS)
diff --git a/Sounds/avionics-400Hz.wav b/Sounds/avionics-400Hz.wav
new file mode 100644
index 000000000..7c35742f8
Binary files /dev/null and b/Sounds/avionics-400Hz.wav differ
diff --git a/gui/dialogs/rendering.xml b/gui/dialogs/rendering.xml
index 21a3ec741..461992151 100644
--- a/gui/dialogs/rendering.xml
+++ b/gui/dialogs/rendering.xml
@@ -418,81 +418,6 @@
-
- hbox
-
- Other
- left
-
- /sim/rendering/shaders/quality-level
-
-
-
- true
-
-
-
-
- hbox
- right
-
-
- Snow line
-
-
- /sim/rendering/shaders/quality-level
-
- /sim/rendering/shaders/crop
- /sim/rendering/shaders/landmass
- /sim/rendering/shaders/transition
- /sim/rendering/shaders/urban
-
-
-
-
-
-
- snow-level
-
-
- /sim/rendering/shaders/quality-level
-
- /sim/rendering/shaders/crop
- /sim/rendering/shaders/landmass
- /sim/rendering/shaders/transition
- /sim/rendering/shaders/urban
-
-
-
- 0.0
- 5000.0
- /sim/rendering/snow-level-m
-
- dialog-apply
- snow-level
-
-
-
-
- left
-
-
- /sim/rendering/shaders/quality-level
-
- /sim/rendering/shaders/crop
- /sim/rendering/shaders/landmass
- /sim/rendering/shaders/transition
- /sim/rendering/shaders/urban
-
-
-
- 12345678
- %.fm
- true
- /sim/rendering/snow-level-m
-
-
-
hbox
diff --git a/gui/dialogs/sound.xml b/gui/dialogs/sound.xml
index 337661c72..f85e403a8 100644
--- a/gui/dialogs/sound.xml
+++ b/gui/dialogs/sound.xml
@@ -273,6 +273,28 @@
/sim/sound/enabled
+
+
+ 6
+ AI/MP
+ left
+
+ /sim/sound/enabled
+
+
+
+
+ 6
+ /sim/sound/aimodels/enabled
+
+ dialog-apply
+
+
+ /sim/sound/enabled
+
+
- hbox
+ vbox
fill
table
@@ -424,23 +424,18 @@
0
Rain
-
- /sim/gui/dialogs/weather-scenario/state
-
-
-
-
- 0
- Snow
-
- /sim/gui/dialogs/weather-scenario/state
+ left
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
- 1
- 0
+ true
fill
/environment/rain-norm
@@ -455,6 +450,19 @@
+
+
+ 1
+ Snow
+ left
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
+
1
@@ -478,7 +486,7 @@
0
QNH (inHg)
-
+
/sim/gui/dialogs/weather-scenario/state
@@ -501,19 +509,93 @@
pressure-sea-level-inhg
-
-
+
+
+ Snow line
2
3
- 30
-
+
+
+ /sim/rendering/shaders/quality-level
+
+ /sim/rendering/shaders/crop
+ /sim/rendering/shaders/landmass
+ /sim/rendering/shaders/transition
+ /sim/rendering/shaders/urban
+
+
+
+
+
+
+ snow-level
+ 2
+
+
+ /sim/rendering/shaders/quality-level
+
+ /sim/rendering/shaders/crop
+ /sim/rendering/shaders/landmass
+ /sim/rendering/shaders/transition
+ /sim/rendering/shaders/urban
+
+
+
+ -425.0
+ 5000.0
+ true
+ /environment/snow-level-m
+
+ dialog-apply
+ snow-level
+
+
+
+
+ 2
+
+
+ /sim/rendering/shaders/quality-level
+
+ /sim/rendering/shaders/crop
+ /sim/rendering/shaders/landmass
+ /sim/rendering/shaders/transition
+ /sim/rendering/shaders/urban
+
+
+
+ 12345678
+ %.fm
+ true
+ /environment/snow-level-m
+
-
+
true
+
+
+
+
+
+ /sim/gui/dialogs/weather-scenario/state
+ 1
+
+
+
+ Disable METAR to manually edit weather settings.
+ left
+
+ 1.0
+ 0.6
+ 0.6
+
+
+
diff --git a/keyboard.xml b/keyboard.xml
index 00fe83b08..63634f863 100644
--- a/keyboard.xml
+++ b/keyboard.xml
@@ -462,7 +462,7 @@ top down before the key bindings are parsed.
2
- Increase elevator or autopilot altitude
+ Elevator up or increase autopilot altitude
true
nasal
@@ -570,7 +570,7 @@ top down before the key bindings are parsed.
8
- Decrease elevator or autopilot altitude
+ Elevator down or decrease autopilot altitude
true
nasal
@@ -1277,7 +1277,7 @@ top down before the key bindings are parsed.
Up
- Increase elevator or autopilot altitude
+ Elevator down or decrease autopilot altitude
true
nasal
@@ -1324,7 +1324,7 @@ top down before the key bindings are parsed.
Down
- Decrease elevator or autopilot altitude
+ Elevator up or increase autopilot altitude
true
nasal
diff --git a/materials-dds.xml b/materials-dds.xml
index d9e5d76ac..a9e9310a5 100644
--- a/materials-dds.xml
+++ b/materials-dds.xml
@@ -1280,6 +1280,7 @@ Shared parameters for various materials.
ShrubCover
ShrubGrassCover
ScrubCover
+ Scrub
Sclerophyllous
Heath
Terrain/shrub.dds
@@ -2553,6 +2554,7 @@ Shared parameters for various materials.
ShrubCover
ShrubGrassCover
ScrubCover
+ Scrub
Sclerophyllous
Heath
Terrain.winter/shrub.png
diff --git a/preferences.xml b/preferences.xml
index e5d5f91d4..a3fa26661 100644
--- a/preferences.xml
+++ b/preferences.xml
@@ -68,22 +68,15 @@ Started September 2000 by David Megginson, david@megginson.com
5
8
- 1.0
- 1.0
- 1.0
- 1.0
- 1.0
- 1.0
- 1.0
- 3.0
+ 1.0
+ 1.0
+ 1.0
+ 1.0
+ false
+ 1.0
+ 1.0
+ 1.0
+ 3.0
0.003
@@ -91,8 +84,6 @@ Started September 2000 by David Megginson, david@megginson.com
userarchive="y">0.0003
0.5
- 0