From 151d45778e658f392debac7073a10efc5e209589 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Wed, 4 Jan 2012 12:56:17 +0100 Subject: [PATCH 1/4] Try to fix the Nasal error in Local Weather 1.4 by initializing ground-haze-factor in local-weather-default.xml --- Environment/local-weather-defaults.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/Environment/local-weather-defaults.xml b/Environment/local-weather-defaults.xml index 88a232232..4e7e2fb9e 100644 --- a/Environment/local-weather-defaults.xml +++ b/Environment/local-weather-defaults.xml @@ -24,6 +24,7 @@ 25.0 1.0 0.0 + 1.0 realistic weather From 34eb640a7699835a9446941e0025005237e3d5eb Mon Sep 17 00:00:00 2001 From: Stuart Buchanan Date: Wed, 4 Jan 2012 21:53:25 +0000 Subject: [PATCH 2/4] Further updates to the Multiplayer Settings dialog - Now enabled even when no MP settings configured on command-line - Add Server Status button to launch the MP Server status URL - Minor layout cleanup. --- Nasal/gui.nas | 1 - gui/dialogs/multiplayer.xml | 28 +++++++++++++++++++++++----- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/Nasal/gui.nas b/Nasal/gui.nas index b661c4cd8..1d52fa82f 100644 --- a/Nasal/gui.nas +++ b/Nasal/gui.nas @@ -134,7 +134,6 @@ _setlistener("/sim/signals/nasal-dir-initialized", func { return 1; } menuEnable("autopilot", isAutopilotMenuEnabled() ); - menuEnable("multiplayer", multiplayer.is_active()); menuEnable("joystick-info", size(props.globals.getNode("/input/joysticks").getChildren("js"))); # frame-per-second display diff --git a/gui/dialogs/multiplayer.xml b/gui/dialogs/multiplayer.xml index 6ee1c17cd..dd30738b2 100644 --- a/gui/dialogs/multiplayer.xml +++ b/gui/dialogs/multiplayer.xml @@ -42,10 +42,8 @@ 16 16 - 1 27 2 - dialog-close @@ -66,6 +64,11 @@ left /sim/multiplay/callsign + + 02 + left + + 10 right @@ -74,6 +77,7 @@ host 11 + 2 350 /sim/multiplay/selected-server false @@ -90,7 +94,6 @@ mpserver12.flightgear.org (Amsterdam, Netherlands) mpserver13.flightgear.org (Grenoble, France) - @@ -99,7 +102,7 @@ 3 1 left - + @@ -124,6 +127,7 @@ +