1
0
Fork 0

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

This commit is contained in:
Vivian Meazza 2011-07-11 14:08:05 +01:00
commit 8c8251c922
9 changed files with 7148 additions and 5742 deletions

File diff suppressed because it is too large Load diff

View file

@ -7,20 +7,17 @@
<texture alias="../../texture"/>
</animation>
<animation>
<type>material</type>
<effect>
<inherits-from>Effects/lightmap</inherits-from>
<parameters>
<texture n="1">
<image>Aircraft/Instruments-3d/cdu/boeing_lightmap.png</image>
</texture>
<condition><use>/instrumentation/cdu/serviceable</use></condition>
<factor><use>/controls/lighting/panel-norm</use></factor>
</parameters>
<object-name>CDU</object-name>
<emission>
<factor-prop>/controls/lighting/panel-norm</factor-prop>
<red>0.1</red>
<green>0.1</green>
<blue>0.1</blue>
</emission>
</animation>
<animation>
<type>material</type>
<object-name>Btn.A</object-name>
<object-name>Btn.A</object-name>
<object-name>Btn.B</object-name>
<object-name>Btn.C</object-name>
<object-name>Btn.D</object-name>
@ -89,15 +86,7 @@
<object-name>Btn.side.r.4</object-name>
<object-name>Btn.side.r.5</object-name>
<object-name>Btn.side.r.6</object-name>
<condition>
<property>/instrumentation/cdu/serviceable</property>
</condition>
<emission>
<red>1</red>
<green>0.8</green>
<blue>0.5</blue>
</emission>
</animation>
</effect>
<model>
<path>Aircraft/Instruments-3d/cdu/display-text-value.xml</path>

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

View file

@ -261,26 +261,14 @@ properties' values.
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>vs-minus</object-name>
<object-name>vs-digits-minus</object-name>
<condition>
<and>
<equals>
<property>/autopilot/KAP140/annunciators/vs-number</property>
<value type="bool">true</value>
</equals>
<greater-than>
<value>0</value>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
</greater-than>
</and>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>vs-digits</object-name>
<object-name>vs-digit2-minus</object-name>
<object-name>vs-digit3-minus</object-name>
<object-name>vs-digit4-minus</object-name>
<object-name>vs-digit5-minus</object-name>
<condition>
<and>
<equals>
@ -288,25 +276,38 @@ properties' values.
<value type="bool">true</value>
</equals>
<less-than>
<value>0</value>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<property>/autopilot/KAP140/settings/target-pressure-rate-fpm</property>
<value>-1.0</value>
</less-than>
</and>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>vs-digit2</object-name>
<object-name>vs-digit3</object-name>
<object-name>vs-digit4</object-name>
<object-name>vs-digit5</object-name>
<condition>
<and>
<equals>
<property>/autopilot/KAP140/annunciators/vs-number</property>
<value type="bool">true</value>
</equals>
<greater-than-equals>
<property>/autopilot/KAP140/settings/target-pressure-rate-fpm</property>
<value>-1.0</value>
</greater-than-equals>
</and>
</condition>
</animation>
<animation>
<type>textranslate</type>
<object-name>vs-digit5</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<condition>
<less-than>
<value>0</value>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
</less-than>
</condition>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<factor>-5800</factor>
<step>0.000017241379</step>
<property>/autopilot/KAP140/settings/target-pressure-rate-fpm</property>
<factor>0.1</factor>
<step>1</step>
<bias>0.5</bias>
<axis>
<x>1</x>
<y>0</y>
@ -316,16 +317,10 @@ properties' values.
<animation>
<type>textranslate</type>
<object-name>vs-digit4</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<condition>
<less-than>
<value>0</value>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
</less-than>
</condition>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<factor>-580</factor>
<step>0.00017241379</step>
<property>/autopilot/KAP140/settings/target-pressure-rate-fpm</property>
<factor>0.01</factor>
<step>10</step>
<bias>0.5</bias>
<axis>
<x>1</x>
<y>0</y>
@ -335,16 +330,10 @@ properties' values.
<animation>
<type>textranslate</type>
<object-name>vs-digit3</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<condition>
<less-than>
<value>0</value>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
</less-than>
</condition>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<factor>-58</factor>
<step>0.0017241379</step>
<property>/autopilot/KAP140/settings/target-pressure-rate-fpm</property>
<factor>0.001</factor>
<step>100</step>
<bias>0.5</bias>
<axis>
<x>1</x>
<y>0</y>
@ -354,16 +343,10 @@ properties' values.
<animation>
<type>textranslate</type>
<object-name>vs-digit2</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<condition>
<less-than>
<value>0</value>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
</less-than>
</condition>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<factor>-5.8</factor>
<step>0.017241379</step>
<property>/autopilot/KAP140/settings/target-pressure-rate-fpm</property>
<factor>0.0001</factor>
<step>1000</step>
<bias>0.5</bias>
<axis>
<x>1</x>
<y>0</y>
@ -373,16 +356,10 @@ properties' values.
<animation>
<type>textranslate</type>
<object-name>vs-digit5-minus</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<condition>
<greater-than>
<value>0</value>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
</greater-than>
</condition>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<factor>5800</factor>
<step>0.000017241379</step>
<property>/autopilot/KAP140/settings/target-pressure-rate-fpm</property>
<factor>-0.1</factor>
<step>1</step>
<bias>0.5</bias>
<axis>
<x>1</x>
<y>0</y>
@ -392,16 +369,10 @@ properties' values.
<animation>
<type>textranslate</type>
<object-name>vs-digit4-minus</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<condition>
<greater-than>
<value>0</value>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
</greater-than>
</condition>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<factor>580</factor>
<step>0.00017241379</step>
<property>/autopilot/KAP140/settings/target-pressure-rate-fpm</property>
<factor>-0.01</factor>
<step>10</step>
<bias>9.5</bias>
<axis>
<x>1</x>
<y>0</y>
@ -411,16 +382,10 @@ properties' values.
<animation>
<type>textranslate</type>
<object-name>vs-digit3-minus</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<condition>
<greater-than>
<value>0</value>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
</greater-than>
</condition>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<factor>58</factor>
<step>0.0017241379</step>
<property>/autopilot/KAP140/settings/target-pressure-rate-fpm</property>
<factor>-0.001</factor>
<step>100</step>
<bias>99.5</bias>
<axis>
<x>1</x>
<y>0</y>
@ -430,22 +395,17 @@ properties' values.
<animation>
<type>textranslate</type>
<object-name>vs-digit2-minus</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<condition>
<greater-than>
<value>0</value>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
</greater-than>
</condition>
<property>/autopilot/KAP140/settings/target-pressure-rate</property>
<factor>5.8</factor>
<step>0.017241379</step>
<property>/autopilot/KAP140/settings/target-pressure-rate-fpm</property>
<factor>-0.0001</factor>
<step>1000</step>
<bias>999.5</bias>
<axis>
<x>1</x>
<y>0</y>
<z>0</z>
</axis>
</animation>
<!-- alt-setting -->
<animation>
<type>select</type>

View file

@ -291,7 +291,7 @@ properties' values.
</equals>
<less-than>
<property>/autopilot/KAP140/settings/target-pressure-rate-fpm</property>
<value>0.0</value>
<value>-1.0</value>
</less-than>
</and>
</condition>
@ -310,7 +310,7 @@ properties' values.
</equals>
<greater-than-equals>
<property>/autopilot/KAP140/settings/target-pressure-rate-fpm</property>
<value>0</value>
<value>-1.0</value>
</greater-than-equals>
</and>
</condition>
@ -320,7 +320,8 @@ properties' values.
<object-name>vs-digit5</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate-fpm</property>
<factor>0.1</factor>
<step>0.1</step>
<step>1</step>
<bias>0.5</bias>
<axis>
<x>1</x>
<y>0</y>
@ -332,7 +333,8 @@ properties' values.
<object-name>vs-digit4</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate-fpm</property>
<factor>0.01</factor>
<step>0.1</step>
<step>10</step>
<bias>0.5</bias>
<axis>
<x>1</x>
<y>0</y>
@ -344,7 +346,8 @@ properties' values.
<object-name>vs-digit3</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate-fpm</property>
<factor>0.001</factor>
<step>0.1</step>
<step>100</step>
<bias>0.5</bias>
<axis>
<x>1</x>
<y>0</y>
@ -356,7 +359,8 @@ properties' values.
<object-name>vs-digit2</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate-fpm</property>
<factor>0.0001</factor>
<step>0.1</step>
<step>1000</step>
<bias>0.5</bias>
<axis>
<x>1</x>
<y>0</y>
@ -368,7 +372,8 @@ properties' values.
<object-name>vs-digit5-minus</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate-fpm</property>
<factor>-0.1</factor>
<step>0.1</step>
<step>1</step>
<bias>0.5</bias>
<axis>
<x>1</x>
<y>0</y>
@ -380,7 +385,8 @@ properties' values.
<object-name>vs-digit4-minus</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate-fpm</property>
<factor>-0.01</factor>
<step>0.1</step>
<step>10</step>
<bias>9.5</bias>
<axis>
<x>1</x>
<y>0</y>
@ -392,7 +398,8 @@ properties' values.
<object-name>vs-digit3-minus</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate-fpm</property>
<factor>-0.001</factor>
<step>0.1</step>
<step>100</step>
<bias>99.5</bias>
<axis>
<x>1</x>
<y>0</y>
@ -404,7 +411,8 @@ properties' values.
<object-name>vs-digit2-minus</object-name>
<property>/autopilot/KAP140/settings/target-pressure-rate-fpm</property>
<factor>-0.0001</factor>
<step>0.1</step>
<step>1000</step>
<bias>999.5</bias>
<axis>
<x>1</x>
<y>0</y>

File diff suppressed because it is too large Load diff

View file

@ -162,6 +162,11 @@ Here's a quick syntax summary:
Contains two properties or a property and value, and is true if the
properties have equivalent values.
* <not-equals>...</not-equals>
Contains two properties or a property and value, and is true if the
properties have different values.
* <greater-than>...</greater-than>
Contains two properties or a property and a value, and is true if

View file

@ -100,7 +100,7 @@
<text>
<halign>left</halign>
<label>MMMMMMMMMM</label>
<format>SimGear Version: %s</format>
<format>FlightGear Version: %s</format>
<property>/sim/version/flightgear</property>
</text>

View file

@ -21,12 +21,12 @@
</item>
<item>
<label>Scenario</label>
<label>Scenario</label>
<binding>
<command>dialog-show</command>
<dialog-name>scenario</dialog-name>
</binding>
</item>
<command>dialog-show</command>
<dialog-name>scenario</dialog-name>
</binding>
</item>
-->
<item>
<label>Reset (Shift-Esc)</label>
@ -36,15 +36,15 @@
</item>
<!-- <item>
<label>Set Lat/Lon Format</label>
<binding>
<command>nasal</command>
<script>
var f = getprop(var d = "/sim/lon-lat-format") + 1;
setprop(d, f &lt; 0 ? 0 : f > 2 ? 0 : f);
</script>
</binding>
</item>
<label>Set Lat/Lon Format</label>
<binding>
<command>nasal</command>
<script>
var f = getprop(var d = "/sim/lon-lat-format") + 1;
setprop(d, f &lt; 0 ? 0 : f > 2 ? 0 : f);
</script>
</binding>
</item>
<label>High-Res Snapshot</label>
<enabled>false</enabled>
<binding>
@ -64,15 +64,15 @@
</item>
<!--
<item>
<label>Last snapshot</label>
<label>Last snapshot</label>
<binding>
<command>nasal</command>
<script>
var path = getprop("/sim/paths/screenshot-last");
if (path != nil) gui.popupTip(...) else gui.popupTip("no screenshots yet in this session")
<command>nasal</command>
<script>
var path = getprop("/sim/paths/screenshot-last");
if (path != nil) gui.popupTip(...) else gui.popupTip("no screenshots yet in this session")
gui.popupTip("Screenshot written to '" ~ path ~ "'");
</script>
gui.popupTip("Screenshot written to '" ~ path ~ "'");
</script>
</binding>
</item>
@ -120,16 +120,16 @@
</item>
<item>
<!-- <item>
<label>Set Lat/Lon Format</label>
<binding>
<command>nasal</command>
<script>
var f = getprop(var d = "/sim/lon-lat-format") + 1;
setprop(d, f &lt; 0 ? 0 : f > 2 ? 0 : f);
</script>
</binding>
</item> -->
<!-- <item>
<label>Set Lat/Lon Format</label>
<binding>
<command>nasal</command>
<script>
var f = getprop(var d = "/sim/lon-lat-format") + 1;
setprop(d, f &lt; 0 ? 0 : f > 2 ? 0 : f);
</script>
</binding>
</item> -->
<label>View Options</label>
<binding>
<command>dialog-show</command>
@ -277,6 +277,7 @@
<item>
<label>Route Manager</label>
<name>route-manager</name>
<binding>
<command>dialog-show</command>
<dialog-name>route-manager</dialog-name>
@ -285,6 +286,7 @@
<item>
<label>Previous Waypoint</label>
<name>previous-waypoint</name>
<binding>
<command>nasal</command>
<script>setprop("/autopilot/route-manager/input", "@previous")</script>
@ -293,6 +295,7 @@
<item>
<label>Next Waypoint</label>
<name>next-waypoint</name>
<binding>
<command>nasal</command>
<script>setprop("/autopilot/route-manager/input", "@next")</script>
@ -302,6 +305,7 @@
<menu>
<label>Environment</label>
<name>environment</name>
<!--<item>
<label>Weather Scenario</label>
@ -321,6 +325,7 @@
<item>
<label>Global Weather</label>
<name>global-weather</name>
<binding>
<command>dialog-show</command>
<dialog-name>weather</dialog-name>
@ -348,6 +353,7 @@
<item>
<label>Time Settings</label>
<name>time-settings</name>
<binding>
<command>dialog-show</command>
<dialog-name>timeofday</dialog-name>
@ -356,6 +362,7 @@
<item>
<label>Wildfire Settings</label>
<name>wildfire-settings</name>
<binding>
<command>nasal</command>
<script>wildfire.dialog.show()</script>
@ -364,6 +371,7 @@
<item>
<label>Scenery Download</label>
<name>terrasync</name>
<binding>
<command>dialog-show</command>
<dialog-name>terrasync</dialog-name>
@ -374,6 +382,7 @@
<menu>
<label>Equipment</label>
<name>equipment</name>
<item>
<label>Map</label>
@ -386,6 +395,7 @@
<item>
<label>Stopwatch</label>
<name>stopwatch</name>
<binding>
<command>dialog-show</command>
<dialog-name>stopwatch-dialog</dialog-name>
@ -421,14 +431,13 @@
<item>
<label>Instrument Settings</label>
<name>instrument-settings</name>
<binding>
<command>dialog-show</command>
<dialog-name>instruments</dialog-name>
</binding>
</item>
<item>
<label> --- Failures ---</label>
<enabled>false</enabled>
@ -436,6 +445,7 @@
<item>
<label>Random Failures</label>
<name>random-failures</name>
<binding>
<command>dialog-show</command>
<dialog-name>random-failures</dialog-name>
@ -444,6 +454,7 @@
<item>
<label>System Failures</label>
<name>system-failures</name>
<binding>
<command>dialog-show</command>
<dialog-name>system-failures</dialog-name>
@ -452,6 +463,7 @@
<item>
<label>Instrument Failures</label>
<name>instrument-failures</name>
<binding>
<command>dialog-show</command>
<dialog-name>instrument-failures</dialog-name>
@ -468,10 +480,11 @@
<command>ATC-freq-search</command>
</binding>
</item>
-->
<item>
<label>Wingman Controls</label>
<name>wingman</name>
<binding>
<command>dialog-show</command>
<dialog-name>formation</dialog-name>
@ -490,6 +503,7 @@
<item>
<label>Carrier Controls</label>
<name>carrier</name>
<binding>
<command>dialog-show</command>
<dialog-name>AIcarrier</dialog-name>
@ -498,24 +512,21 @@
<item>
<label>Scenario Select (requires restart)</label>
<name>scenario</name>
<binding>
<command>dialog-show</command>
<dialog-name>scenario</dialog-name>
</binding>
</item>
<item>
<label>Jetway Settings</label>
<!-- <binding>
<command>nasal</command>
<script>jetways.jetways.dialog()</script>
</binding>-->
<item>
<label>Jetway Settings</label>
<name>jetway</name>
<binding>
<command>dialog-show</command>
<dialog-name>jetways</dialog-name>
</binding>
</item>
</item>
</menu>
@ -523,8 +534,9 @@
<label>Multiplayer</label>
<name>multiplayer</name>
<item>
<item>
<label>Multiplayer settings</label>
<name>mp-settings</name>
<binding>
<command>dialog-show</command>
<dialog-name>multiplayer</dialog-name>
@ -533,6 +545,7 @@
<item>
<label>Chat Dialog</label>
<name>mp-chat</name>
<binding>
<command>dialog-show</command>
<dialog-name>chat-full</dialog-name>
@ -541,6 +554,7 @@
<item>
<label>Chat Menu (-)</label>
<name>mp-chat-menu</name>
<binding>
<command>dialog-show</command>
<dialog-name>chat-menu</dialog-name>
@ -549,6 +563,7 @@
<item>
<label>Pilot List</label>
<name>mp-list</name>
<binding>
<command>nasal</command>
<script>multiplayer.dialog.show()</script>
@ -557,6 +572,7 @@
<item>
<label>MPCarrier Selection</label>
<name>mp-carrier</name>
<binding>
<command>nasal</command>
<script>
@ -569,7 +585,6 @@
</binding>
</item>
</menu>
<menu>
@ -726,13 +741,13 @@
</menu>
<menu>
<label>Help</label>
<name>help</name>
<item>
<label>Help (opens in browser)</label>
<name>help-browser</name>
<binding>
<command>old-help-dialog</command>
</binding>
@ -740,6 +755,7 @@
<item>
<label>Aircraft Help (?)</label>
<name>aircraft-keys</name>
<binding>
<command>nasal</command>
<script>gui.showHelpDialog("/sim/help")</script>
@ -757,19 +773,21 @@
<item>
<label>Basic Simulator Keys</label>
<name>basic-keys</name>
<binding>
<command>nasal</command>
<script>gui.showHelpDialog("/sim/help/basic")</script>
</binding>
</item>
<item>
<label>Common Aircraft Keys</label>
<binding>
<command>nasal</command>
<script>gui.showHelpDialog("/sim/help/common")</script>
</binding>
</item>
<item>
<label>Common Aircraft Keys</label>
<name>common-keys</name>
<binding>
<command>nasal</command>
<script>gui.showHelpDialog("/sim/help/common")</script>
</binding>
</item>
<item>
<label>------------------</label>