Merge branch 'master' of gitorious.org:fg/fgdata

Materials/base/materials-base.xml

@@ -464,6 +464,124 @@ Shared parameters for various materials.
   <load-resistance>1e10</load-resistance>
 </material>
 
+<!-- For textured lines -->
+<material n="2011">
+  <name>Road-textured</name>
+  <texture>Roads/road-textured.png</texture>
+  <xsize>1000</xsize>
+  <ysize>1000</ysize>
+  <light-coverage>10000.0</light-coverage>
+  <solid>1</solid>
+  <friction-factor>1.0</friction-factor>
+  <rolling-friction>0.02</rolling-friction>
+  <bumpiness>0.01</bumpiness>
+  <load-resistance>1e10</load-resistance>
+</material>
+
+<material n="2012">
+  <name>Motorway-textured</name>
+  <texture>Roads/motorway-textured.png</texture>
+  <xsize>1000</xsize>
+  <ysize>1000</ysize>
+  <light-coverage>10000.0</light-coverage>
+  <solid>1</solid>
+  <friction-factor>1.0</friction-factor>
+  <rolling-friction>0.02</rolling-friction>
+  <bumpiness>0.01</bumpiness>
+  <load-resistance>1e10</load-resistance>
+</material>
+
+<material n="2013">
+  <name>Trunk-textured</name>
+  <texture>Roads/trunk-textured.png</texture>
+  <xsize>1000</xsize>
+  <ysize>1000</ysize>
+  <light-coverage>10000.0</light-coverage>
+  <solid>1</solid>
+  <friction-factor>1.0</friction-factor>
+  <rolling-friction>0.02</rolling-friction>
+  <bumpiness>0.01</bumpiness>
+  <load-resistance>1e10</load-resistance>
+</material>
+
+<material n="2014">
+  <name>Residential-textured</name>
+  <texture>Roads/residential-textured.png</texture>
+  <xsize>1000</xsize>
+  <ysize>1000</ysize>
+  <light-coverage>10000.0</light-coverage>
+  <solid>1</solid>
+  <friction-factor>1.0</friction-factor>
+  <rolling-friction>0.02</rolling-friction>
+  <bumpiness>0.01</bumpiness>
+  <load-resistance>1e10</load-resistance>
+</material>
+
+<material n="2015">
+  <name>Primary-textured</name>
+  <texture>Roads/primary-textured.png</texture>
+  <xsize>1000</xsize>
+  <ysize>1000</ysize>
+  <light-coverage>10000.0</light-coverage>
+  <solid>1</solid>
+  <friction-factor>1.0</friction-factor>
+  <rolling-friction>0.02</rolling-friction>
+  <bumpiness>0.01</bumpiness>
+  <load-resistance>1e10</load-resistance>
+</material>
+
+<material n="2016">
+  <name>Secondary-textured</name>
+  <texture>Roads/secondary-textured.png</texture>
+  <xsize>1000</xsize>
+  <ysize>1000</ysize>
+  <light-coverage>10000.0</light-coverage>
+  <solid>1</solid>
+  <friction-factor>1.0</friction-factor>
+  <rolling-friction>0.02</rolling-friction>
+  <bumpiness>0.01</bumpiness>
+  <load-resistance>1e10</load-resistance>
+</material>
+
+<material n="2017">
+  <name>Tertiary-textured</name>
+  <texture>Roads/tertiary-textured.png</texture>
+  <xsize>1000</xsize>
+  <ysize>1000</ysize>
+  <light-coverage>10000.0</light-coverage>
+  <solid>1</solid>
+  <friction-factor>1.0</friction-factor>
+  <rolling-friction>0.02</rolling-friction>
+  <bumpiness>0.01</bumpiness>
+  <load-resistance>1e10</load-resistance>
+</material>
+
+<material n="2018">
+  <name>Railroad-textured</name>
+  <texture>Roads/railroad-textured.png</texture>
+  <xsize>1000</xsize>
+  <ysize>1000</ysize>
+  <light-coverage>10000.0</light-coverage>
+  <solid>1</solid>
+  <friction-factor>1.0</friction-factor>
+  <rolling-friction>0.02</rolling-friction>
+  <bumpiness>0.01</bumpiness>
+  <load-resistance>1e10</load-resistance>
+</material>
+
+<material n="2019">
+  <name>Asphalt-textured</name>
+  <texture>Roads/asphalt-textured.png</texture>
+  <xsize>1000</xsize>
+  <ysize>1000</ysize>
+  <light-coverage>10000.0</light-coverage>
+  <solid>1</solid>
+  <friction-factor>1.0</friction-factor>
+  <rolling-friction>0.02</rolling-friction>
+  <bumpiness>0.01</bumpiness>
+  <load-resistance>1e10</load-resistance>
+</material>
+
 <!-- Taxiway signs -->
     <material n="2100">
         <name>signcase</name>

Nasal/view.nas

@@ -376,8 +376,8 @@ var model_view_handler = {
 				return i;
 		return nil;
 	},
-	select: func(which) {
-		if (num(which) == nil)
+	select: func(which, by_callsign=0) {
+		if (by_callsign or num(which) == nil)
 			which = me.find(which) or 0;  # turn callsign into index
 
 		me.setup(me.list[which]);

Translations/en/sys.xml

@@ -16,7 +16,8 @@
 		<finishing-subsystems>finalizing subsystems</finishing-subsystems>
 		<init-graphics>initializing graphics engine</init-graphics>
 		<loading-scenery>loading scenery</loading-scenery>
-    <finalize-position>finalizing position</finalize-position>
+        <downloading-scenery>downloading scenery</downloading-scenery>
+        <finalize-position>finalizing position</finalize-position>
 	</splash>
 
 </PropertyList>

Translations/fr/sys.xml

@@ -33,6 +33,8 @@
         <finishing-subsystems>Finalisation des sous-systemes</finishing-subsystems>   <!-- English: "finalizing subsystems" -->
         <init-graphics>Initialisation du moteur graphique</init-graphics>   <!-- English: "initializing graphics engine" -->
         <loading-scenery>Chargement des scenes</loading-scenery>   <!-- English: "loading scenery" -->
+        <downloading-scenery>Téléchargement des scenes</downloading-scenery> <!-- English: "downloading scenery" -->
+        <finalize-position>Finalisation de la position</finalize-position> <!-- English: "finalizing position" -->
     </splash>
 
 </PropertyList>

Translations/nl/sys.xml

@@ -33,6 +33,7 @@
 		<finishing-subsystems>subsystemen afronden</finishing-subsystems>   <!-- English: "finalizing subsystems" -->
 		<init-graphics>grafische motor voorbereiden</init-graphics>    <!-- English: "initializing graphics engine" -->
 		<loading-scenery>landschap laden</loading-scenery>   <!-- English: "loading scenery" -->
+		<downloading-scenery>landschap downloaden</downloading-scenery>   <!-- English: "downloading scenery" -->
 		<finalize-position>positie afronden</finalize-position>   <!-- English: "finalizing position" -->
 	</splash>
 

gui/dialogs/model-view-select.xml

@@ -40,7 +40,7 @@
 			var select = func {
 				var e = dlg.initNode("choice", "").getValue();
 				if (e == myself or contains(multiplayer.model.callsign, entries[e]))
-					view.model_view_handler.select(entries[e]);
+					view.model_view_handler.select(which: entries[e], by_callsign: 1);
 				else
 					settimer(func fgcommand("dialog-show", self), 0);
 			}

gui/dialogs/terrasync.xml

@@ -123,21 +123,9 @@
       </binding-->
     </input>
 
-    <checkbox>
-      <name>scenery-refresh</name>
-      <halign>left</halign>
-      <row>6</row><col>1</col><colspan>2</colspan>
-      <property>/sim/terrasync/refresh-display</property>
-      <enable>
-        <property>/sim/terrasync/enabled</property>
-      </enable>
-      <label>Automatic display refresh (EXPERIMENTAL!)</label>
-      <live>true</live>
-      <binding>
-        <command>dialog-apply</command>
-        <object-name>scenery-refresh</object-name>
-      </binding>
-    </checkbox>
+    
+    
+    <!--
     <button>
       <legend>Manual Refresh</legend>
       <border>2</border>
@@ -147,27 +135,7 @@
         <subsystem>tile-manager</subsystem>
       </binding>
     </button>
-
-<!--
-    <checkbox>
-      <name>internal-svn</name>
-      <halign>left</halign>
-      <row>7</row><col>1</col><colspan>3</colspan>
-      <property>/sim/terrasync/use-built-in-svn</property>
-      <label>Download using built-in SVN client</label>
-      <live>true</live>
-      <binding>
-        <command>dialog-apply</command>
-        <object-name>internal-svn</object-name>
-      </binding>
-      <enable>
-        <and>
-          <property>/sim/terrasync/built-in-svn-available</property>
-          <property>/sim/terrasync/enabled</property>
-        </and>
-      </enable>
-    </checkbox>
--->
+        -->
 
   </group>