From a6e2fd175aa64185beec146a518ce9cb85232152 Mon Sep 17 00:00:00 2001
From: Gijs de Rooy <gijsrooy@hotmail.com>
Date: Thu, 6 Jan 2011 18:02:16 +0100
Subject: [PATCH 1/2] Add autohide-mouse-option to display dialog

---
 gui/dialogs/display.xml | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/gui/dialogs/display.xml b/gui/dialogs/display.xml
index fbbfaabd1..3530c1e3e 100644
--- a/gui/dialogs/display.xml
+++ b/gui/dialogs/display.xml
@@ -4,6 +4,7 @@
   <name>display</name>
   <modal>false</modal>
   <layout>vbox</layout>
+  <padding>20</padding>
 
   <group>
     <layout>hbox</layout>
@@ -62,7 +63,7 @@
 
     <checkbox>
       <halign>left</halign>
-      <label>Show 2D Panel</label>
+      <label>Show 2D panel</label>
       <property>/sim/panel/visibility</property>
       <binding>
         <command>dialog-apply</command>
@@ -71,12 +72,43 @@
 
     <checkbox>
       <halign>left</halign>
-      <label>Autohide Menubar</label>
+      <label>Autohide menubar</label>
       <property>/sim/menubar/autovisibility/enabled</property>
       <binding>
         <command>dialog-apply</command>
       </binding>
     </checkbox>
+
+	<group>
+	  <layout>hbox</layout>
+
+	  <checkbox>
+        <label>Autohide cursor in</label>
+        <property>/sim/mouse/hide-cursor</property>
+        <binding>
+          <command>dialog-apply</command>
+        </binding>
+      </checkbox>
+
+	  <input>
+		<live>true</live>
+		<pref-width>40</pref-width>
+		<pref-height>10</pref-height>
+		<enable>
+          <property>/sim/mouse/hide-cursor</property>
+        </enable>
+        <property>/sim/mouse/cursor-timeout-sec</property>
+        <binding>
+          <command>dialog-apply</command>
+        </binding>
+      </input>
+	  
+	  <text>
+		<label>sec.</label>
+	  </text>
+
+	</group>
+
   </group>
 
   <hrule/>

From 0a016495a73cd354dabebb4a5d953c7d561c13ac Mon Sep 17 00:00:00 2001
From: Gijs de Rooy <gijsrooy@hotmail.com>
Date: Thu, 6 Jan 2011 21:30:23 +0100
Subject: [PATCH 2/2] Urban effects with --season=winter

---
 materials.xml | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/materials.xml b/materials.xml
index edb68fc44..539b3054e 100644
--- a/materials.xml
+++ b/materials.xml
@@ -1736,11 +1736,23 @@ Shared parameters for various materials.
   </condition>
   <name>BuiltUpCover</name>
   <name>Urban</name>
-  <texture>Terrain/city1.png</texture>
-  <texture>Terrain/city2.png</texture>
-  <texture>Terrain/city3.png</texture>
-  <xsize>1024</xsize>
-  <ysize>1024</ysize>
+  <effect>Effects/urban</effect>
+  <texture-set>
+   <texture>Terrain/city1.png</texture>
+   <texture n="2">Terrain/city1-relief-light.png</texture>
+  </texture-set>
+  <texture-set>
+   <texture>Terrain/city2.png</texture>
+   <texture n="2">Terrain/city2-relief-light.png</texture>
+  </texture-set>
+<!-- 
+  <texture-set>
+   <texture>Terrain/city3.png</texture>
+   <texture n="2">Terrain/city3-relief-light.png</texture>
+  </texture-set>
+-->
+  <xsize>1000</xsize>
+  <ysize>1000</ysize>
   <light-coverage>100000.0</light-coverage>
   <emissive>
    <r>0.05</r>
@@ -1802,7 +1814,7 @@ Shared parameters for various materials.
   </object-group>
   <wood-coverage>250000.0</wood-coverage>
   <wood-size>5000.0</wood-size>
-  <tree-density>5000.0</tree-density>
+  <tree-density>2000.0</tree-density>
   <tree-texture>Textures/Trees/mixed-winter.png</tree-texture>
   <tree-varieties>8</tree-varieties>
   <tree-range-m alias="/params/forest/tree-range-m"/>