Merge branch 'next' of ssh://git.code.sf.net/p/flightgear/fgdata into next

Aircraft/Instruments-3d/bxp6401/bxp6401.nas

@@ -35,17 +35,17 @@ var mode_prop	=	inputs.initNode("knob-mode", 0, "INT");
 var start_prop	=	transponder.initNode("start", 0.0, "DOUBLE");
 var volt_prop	=	props.globals.initNode("/systems/electrical/outputs/transponder", 15.0, "DOUBLE");
 var active_prop	=	inputs.initNode("current-change", 0, "INT");
-var ident_prop	=	inputs.getNode("ident-btn");
+var ident_prop	=	inputs.initNode("ident-btn", 0, "BOOL");
 var idcode_prop	=	transponder.initNode("id-code", 7000, "INT");
 var alt		=	transponder.getNode("altitude");
 var alt_val	=	transponder.getNode("altitude-valid");
 var brightness	=	transponder.initNode("brightness", 0.5, "DOUBLE");
 
 var ident_arr		=	[0, 0, 0, 0];
-var ident_prop_arr	=	[	inputs.getNode("digit[0]"), 
+var ident_prop_arr	=	[	inputs.initNode("digit[0]", 7, "INT"), 
-					inputs.getNode("digit[1]"), 
+					inputs.initNode("digit[1]", 0, "INT"), 
-					inputs.getNode("digit[2]"), 
+					inputs.initNode("digit[2]", 0, "INT"), 
-					inputs.getNode("digit[3]")	];
+					inputs.initNode("digit[3]", 0, "INT"),	];
 
 var instrument_dir	=	"Aircraft/Instruments-3d/bxp6401/";
 

Aircraft/Instruments-3d/glider/vario/S3/README.install

@@ -48,7 +48,7 @@ To install this instrument into your aircraft, you need to do the following:
 				<value>0.01</value>
 			</greater-than>
 			<greater-than-equals>
-				<property>/systems/electrical/outputs/s3</property>
+				<property>/systems/electrical/outputs/S3</property>
 				<value>9</value>
 			</greater-than-equals>
 			<equals>

Translations/default/options.xml

@@ -19,6 +19,7 @@
 	<fg-aircraft-desc>Specify additional aircraft directory path(s) (alternatively, you can use --aircraft-dir to target a specific aircraft in a given directory)</fg-aircraft-desc>
         <download-dir-desc>Base directory to use for aircraft and scenery downloads (the TerraSync scenery directory may be specifically set with --terrasync-dir)</download-dir-desc>
 	<language-desc>Select the language for this session</language-desc>
+	<load-tape-desc>Load recording of earlier flightgear session</load-tape-desc>
 	<disable-splash-screen-desc>Disable splash screen</disable-splash-screen-desc>
 	<enable-splash-screen-desc>Enable splash screen</enable-splash-screen-desc>
 	<restore-defaults-desc>Reset all user settings to their defaults (rendering options etc)</restore-defaults-desc>

defaults.xml

@@ -844,6 +844,7 @@ Started September 2000 by David Megginson, david@megginson.com
         <!-- 1 h -->
       </buffer>
       <tape-directory type="string" userarchive="y"/>
+      <multiplayer type="bool" userarchive="y"/>
     </replay>
     <airport>
       <runways>

gui/dialogs/multiplayer.xml

@@ -172,6 +172,20 @@
             <col>1</col>
             <colspan>2</colspan>
             <halign>left</halign>
+            <name>multiplayer-record</name>
+            <label>Include multiplayer aircraft in recordings</label>
+            <property>/sim/replay/multiplayer</property>
+            <binding>
+                <command>dialog-apply</command>
+                <object-name>multiplayer-record</object-name>
+            </binding>
+        </checkbox>
+
+        <checkbox>
+            <row>3</row>
+            <col>1</col>
+            <colspan>2</colspan>
+            <halign>left</halign>
             <visible>
                 <property>sim/multiplay/transmit-filter-property-base-available</property>
             </visible>
@@ -185,7 +199,7 @@
         </checkbox>
 
         <combo>
-            <row>3</row>
+            <row>4</row>
             <col>1</col>
             <halign>left</halign>
             <name>protocol-version</name>
@@ -213,20 +227,20 @@
             </binding>
         </combo>
         <text>
-            <row>3</row>
+            <row>4</row>
             <col>0</col>
             <halign>right</halign>
             <label>Compatibility</label>
         </text>
 
         <text>
-            <row>4</row>
+            <row>5</row>
             <col>0</col>
             <halign>right</halign>
             <label>   Callsign:</label>
         </text>
         <input>
-            <row>4</row>
+            <row>5</row>
             <col>1</col>
             <halign>left</halign>
             <property>/sim/multiplay/callsign</property>
@@ -237,7 +251,7 @@
             </enable>
         </input>
         <text>
-          <row>6</row><col>0</col>
+          <row>7</row><col>0</col>
           <halign>right</halign>
           <label>Server:</label>
         </text>
@@ -254,7 +268,7 @@
         </combo>
         <group>
             <layout>hbox</layout>
-            <row>4</row>
+            <row>5</row>
             <col>1</col>
             <text>
                 <width>2</width>

options.xml

@@ -105,6 +105,13 @@
     <brief/>
    </option>
 
+   <option>
+    <name>load-tape</name>
+    <arg>path</arg>
+    <description>load-tape-desc</description>
+    <brief/>
+   </option>
+
    <option>
     <name>restore-defaults</name>
     <description>restore-defaults-desc</description>