1
0
Fork 0

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

This commit is contained in:
Vivian Meazza 2010-12-27 00:27:42 +00:00
commit c31d770292
11 changed files with 20668 additions and 8939 deletions

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

View file

@ -0,0 +1,349 @@
<?xml version="1.0"?>
<PropertyList>
<path>SCR-522C.ac</path>
<animation>
<type>translate</type>
<object-name>SCR-522C-OFF</object-name>
<property>/systems/comm/SCR-522C/frequencies/channel-selected</property>
<interpolation>
<entry>
<ind>0</ind>
<dep>-0.005</dep>
</entry>
<entry>
<ind>1</ind>
<dep>0</dep>
</entry>
<entry>
<ind>2</ind>
<dep>0</dep>
</entry>
<entry>
<ind>3</ind>
<dep>0</dep>
</entry>
<entry>
<ind>4</ind>
<dep>0</dep>
</entry>
</interpolation>
<center>
<x-m>-0.00</x-m>
<y-m>0.0</y-m>
<z-m>-0.0</z-m>
</center>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
</animation>
<animation>
<type>rotate</type>
<object-name>SCR-522C-T-base</object-name>
<object-name>SCR-522C-T-sw-handle</object-name>
<object-name>SCR-522C-T-stem</object-name>
<property>/systems/comm/SCR-522C/tr</property>
<interpolation>
<entry>
<ind>0</ind>
<dep>0</dep>
</entry>
<entry>
<ind>1</ind>
<dep>30</dep>
</entry>
</interpolation>
<center>
<x-m>-0.00</x-m>
<y-m>-0.01</y-m>
<z-m>0.05</z-m>
</center>
<axis>
<x>1</x>
<y>0</y>
<z>0</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>SCR-522C-A</object-name>
<property>/systems/comm/SCR-522C/frequencies/channel-selected</property>
<interpolation>
<entry>
<ind>0</ind>
<dep>0</dep>
</entry>
<entry>
<ind>1</ind>
<dep>-0.005</dep>
</entry>
<entry>
<ind>2</ind>
<dep>0</dep>
</entry>
<entry>
<ind>3</ind>
<dep>0</dep>
</entry>
<entry>
<ind>4</ind>
<dep>0</dep>
</entry>
</interpolation>
<center>
<x-m>-0.00</x-m>
<y-m>0.0</y-m>
<z-m>-0.0</z-m>
</center>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>SCR-522C-B</object-name>
<property>/systems/comm/SCR-522C/frequencies/channel-selected</property>
<interpolation>
<entry>
<ind>0</ind>
<dep>0</dep>
</entry>
<entry>
<ind>1</ind>
<dep>0</dep>
</entry>
<entry>
<ind>2</ind>
<dep>-0.005</dep>
</entry>
<entry>
<ind>3</ind>
<dep>0</dep>
</entry>
<entry>
<ind>4</ind>
<dep>0</dep>
</entry>
</interpolation>
<center>
<x-m>-0.00</x-m>
<y-m>0.0</y-m>
<z-m>-0.0</z-m>
</center>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>SCR-522C-C</object-name>
<property>/systems/comm/SCR-522C/frequencies/channel-selected</property>
<interpolation>
<entry>
<ind>0</ind>
<dep>-0</dep>
</entry>
<entry>
<ind>1</ind>
<dep>-0.0</dep>
</entry>
<entry>
<ind>2</ind>
<dep>0</dep>
</entry>
<entry>
<ind>3</ind>
<dep>-0.005</dep>
</entry>
<entry>
<ind>4</ind>
<dep>0</dep>
</entry>
</interpolation>
<center>
<x-m>-0.00</x-m>
<y-m>0.0</y-m>
<z-m>-0.0</z-m>
</center>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>SCR-522C-D</object-name>
<property>/systems/comm/SCR-522C/frequencies/channel-selected</property>
<interpolation>
<entry>
<ind>0</ind>
<dep>-0</dep>
</entry>
<entry>
<ind>1</ind>
<dep>-0.0</dep>
</entry>
<entry>
<ind>2</ind>
<dep>0</dep>
</entry>
<entry>
<ind>3</ind>
<dep>0</dep>
</entry>
<entry>
<ind>4</ind>
<dep>-0.005</dep>
</entry>
</interpolation>
<center>
<x-m>-0.00</x-m>
<y-m>0.0</y-m>
<z-m>-0.0</z-m>
</center>
<axis>
<x>0</x>
<y>0</y>
<z>1</z>
</axis>
</animation>
<animation>
<type>select</type>
<object-name>SCR-522C-lamp-A</object-name>
<condition>
<equals>
<property>/systems/comm/SCR-522C/frequencies/channel-selected</property>
<value>1</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>SCR-522C-lamp-B</object-name>
<condition>
<equals>
<property>/systems/comm/SCR-522C/frequencies/channel-selected</property>
<value>2</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>SCR-522C-lamp-C</object-name>
<condition>
<equals>
<property>/systems/comm/SCR-522C/frequencies/channel-selected</property>
<value>3</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>SCR-522C-lamp-D</object-name>
<condition>
<equals>
<property>/systems/comm/SCR-522C/frequencies/channel-selected</property>
<value>4</value>
</equals>
</condition>
</animation>
<animation>
<type>select</type>
<object-name>SCR-522C-lamp-T</object-name>
<condition>
<and>
<property>/systems/comm/SCR-522C/tr</property>
<greater-than>
<property>/systems/comm/SCR-522C/frequencies/channel-selected</property>
<value>0</value>
</greater-than>
</and>
</condition>
</animation>
<animation>
<type>translate</type>
<object-name>SCR-522C-light-cont-1</object-name>
<property>/systems/comm/SCR-522C/channel-dimmer</property>
<interpolation>
<entry>
<ind>0</ind>
<dep>0.005</dep>
</entry>
<entry>
<ind>1.0</ind>
<dep>0</dep>
</entry>
</interpolation>
<axis>
<x>1</x>
<y>0</y>
<z>0</z>
</axis>
</animation>
<animation>
<type>translate</type>
<object-name>SCR-522C-light-cont-2</object-name>
<property>/systems/comm/SCR-522C/tr-dimmer</property>
<interpolation>
<entry>
<ind>0</ind>
<dep>0.005</dep>
</entry>
<entry>
<ind>1.0</ind>
<dep>0</dep>
</entry>
</interpolation>
<axis>
<x>1</x>
<y>0</y>
<z>0</z>
</axis>
</animation>
<animation>
<type>material</type>
<object-name>SCR-522C-top</object-name>
<object-name>SCR-522C-box</object-name>
<object-name>SCR-522C-A</object-name>
<object-name>SCR-522C-B</object-name>
<object-name>SCR-522C-C</object-name>
<object-name>SCR-522C-D</object-name>
<object-name>SCR-522C-T-base</object-name>
<object-name>SCR-522C-T-sw-handle</object-name>
<object-name>SCR-522C-T-stem</object-name>
<object-name>SCR-522C-light-cont-2</object-name>
<object-name>SCR-522C-light-cont-1</object-name>
<object-name>SCR-522C-OFF</object-name>
<object-name>right-outer-bracket</object-name>
<object-name>left-inner-bracket</object-name>
<object-name>left-outer-bracket</object-name>
<emission>
<factor-prop>controls/lighting/cabin-norm</factor-prop>
<red>0.28</red>
<green>0.18</green>
<blue>0.18</blue>
</emission>
</animation>
</PropertyList>

View file

@ -40,7 +40,11 @@
<text> <text>
<halign>left</halign> <halign>left</halign>
<label>"Material shaders" must be enabled for certain options</label> <label>"Material shaders" must be enabled for most options.</label>
</text>
<text>
<halign>left</halign>
<label>Snow is dependant on crop, landmass and urban shaders.</label>
</text> </text>
<group> <group>
@ -122,18 +126,22 @@
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Particles (smoke, dust, spray)</label> <label>Particles (smoke, dust, spray)</label>
<name>particles</name>
<property>/sim/rendering/particles</property> <property>/sim/rendering/particles</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>particles</object-name>
</binding> </binding>
</checkbox> </checkbox>
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Precipitation</label> <label>Precipitation</label>
<name>precipitation</name>
<property>/sim/rendering/precipitation-gui-enable</property> <property>/sim/rendering/precipitation-gui-enable</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>precipitation</object-name>
</binding> </binding>
</checkbox> </checkbox>
@ -162,12 +170,14 @@
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Random vegetation</label> <label>Random vegetation</label>
<name>random-vegetation</name>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
</enable> </enable>
<property>/sim/rendering/random-vegetation</property> <property>/sim/rendering/random-vegetation</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>random-vegetation</object-name>
</binding> </binding>
</checkbox> </checkbox>
@ -198,12 +208,14 @@
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>3D clouds</label> <label>3D clouds</label>
<name>3d-clouds</name>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
</enable> </enable>
<property>/sim/rendering/clouds3d-enable</property> <property>/sim/rendering/clouds3d-enable</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>3d-clouds</object-name>
</binding> </binding>
</checkbox> </checkbox>
@ -239,23 +251,34 @@
<text> <text>
<label>Cloud visibility range</label> <label>Cloud visibility range</label>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <and>
<property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/clouds3d-enable</property>
</and>
</enable> </enable>
</text> </text>
<slider> <slider>
<name>cloud-vis-range</name>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <and>
<property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/clouds3d-enable</property>
</and>
</enable> </enable>
<min>100.0</min> <min>100.0</min>
<max>20000.0</max> <max>20000.0</max>
<property>/sim/rendering/clouds3d-vis-range</property> <property>/sim/rendering/clouds3d-vis-range</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>cloud-vis-range</object-name>
</binding> </binding>
</slider> </slider>
<text> <text>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <and>
<property>/sim/rendering/shader-effects</property>
<property>/sim/rendering/clouds3d-enable</property>
</and>
</enable> </enable>
<label>12345678</label> <label>12345678</label>
<format>%.fm</format> <format>%.fm</format>
@ -290,9 +313,11 @@
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Material shaders</label> <label>Material shaders</label>
<name>material-shaders</name>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>material-shaders</object-name>
</binding> </binding>
</checkbox> </checkbox>
@ -303,72 +328,84 @@
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Crop texture</label> <label>Crop texture</label>
<name>crop-texture</name>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
</enable> </enable>
<property>/sim/rendering/crop-shader</property> <property>/sim/rendering/crop-shader</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>crop-texture</object-name>
</binding> </binding>
</checkbox> </checkbox>
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Landmass effects</label> <label>Landmass effects</label>
<name>landmass-effects</name>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
</enable> </enable>
<property>/sim/rendering/landmass-shader</property> <property>/sim/rendering/landmass-shader</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>landmass-effects</object-name>
</binding> </binding>
</checkbox> </checkbox>
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Water reflection</label> <label>Water reflection</label>
<name>water-reflection</name>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
</enable> </enable>
<property>/sim/rendering/water-shader</property> <property>/sim/rendering/water-shader</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>water-reflection</object-name>
</binding> </binding>
</checkbox> </checkbox>
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Urban effects</label> <label>Urban effects</label>
<name>urban-effects</name>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
</enable> </enable>
<property>/sim/rendering/urban-shader</property> <property>/sim/rendering/urban-shader</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>urban-effects</object-name>
</binding> </binding>
</checkbox> </checkbox>
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Transition effects</label> <label>Transition effects</label>
<name>transition-effects</name>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
</enable> </enable>
<property>/sim/rendering/transition-shader</property> <property>/sim/rendering/transition-shader</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>transition-effects</object-name>
</binding> </binding>
</checkbox> </checkbox>
<checkbox> <checkbox>
<halign>left</halign> <halign>left</halign>
<label>Persistent contrails</label> <label>Persistent contrails</label>
<name>persistent-contrails</name>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
</enable> </enable>
<property>/sim/rendering/contrail-shader</property> <property>/sim/rendering/contrail-shader</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>persistent-contrails</object-name>
</binding> </binding>
</checkbox> </checkbox>
</group> </group>
@ -377,25 +414,48 @@
<layout>hbox</layout> <layout>hbox</layout>
<halign>right</halign> <halign>right</halign>
<text> <text>
<label>Snow Level</label> <label>Snow line</label>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <and>
<property>/sim/rendering/shader-effects</property>
<or>
<property>/sim/rendering/crop-shader</property>
<property>/sim/rendering/landmass-shader</property>
<property>/sim/rendering/urban-shader</property>
</or>
</and>
</enable> </enable>
</text> </text>
<slider> <slider>
<enable> <name>snow-level</name>
<property>/sim/rendering/shader-effects</property> <enable>
<and>
<property>/sim/rendering/shader-effects</property>
<or>
<property>/sim/rendering/crop-shader</property>
<property>/sim/rendering/landmass-shader</property>
<property>/sim/rendering/urban-shader</property>
</or>
</and>
</enable> </enable>
<min>0.0</min> <min>0.0</min>
<max>5000.0</max> <max>5000.0</max>
<property>/sim/rendering/snow-level-m</property> <property>/sim/rendering/snow-level-m</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>snow-level</object-name>
</binding> </binding>
</slider> </slider>
<text> <text>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <and>
<property>/sim/rendering/shader-effects</property>
<or>
<property>/sim/rendering/crop-shader</property>
<property>/sim/rendering/landmass-shader</property>
<property>/sim/rendering/urban-shader</property>
</or>
</and>
</enable> </enable>
<label>12345678</label> <label>12345678</label>
<format>%.fm</format> <format>%.fm</format>
@ -414,6 +474,7 @@
</enable> </enable>
</text> </text>
<slider> <slider>
<name>quality-level</name>
<enable> <enable>
<property>/sim/rendering/shader-effects</property> <property>/sim/rendering/shader-effects</property>
</enable> </enable>
@ -423,6 +484,7 @@
<property>/sim/rendering/quality-level</property> <property>/sim/rendering/quality-level</property>
<binding> <binding>
<command>dialog-apply</command> <command>dialog-apply</command>
<object-name>quality-level</object-name>
</binding> </binding>
</slider> </slider>
<text> <text>

View file

@ -207,7 +207,7 @@
<label>Location</label> <label>Location</label>
<item> <item>
<label>Position Aircraft (on ground)</label> <label>Position Aircraft On Ground</label>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>location-on-ground</dialog-name> <dialog-name>location-on-ground</dialog-name>
@ -215,7 +215,7 @@
</item> </item>
<item> <item>
<label>Position Aircraft (in air)</label> <label>Position Aircraft In Air</label>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>location-in-air</dialog-name> <dialog-name>location-in-air</dialog-name>
@ -223,7 +223,7 @@
</item> </item>
<item> <item>
<label>Select Airport from List</label> <label>Select Airport From List</label>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>airports</dialog-name> <dialog-name>airports</dialog-name>
@ -231,7 +231,7 @@
</item> </item>
<item> <item>
<label>Random Attitude</label>H <label>Random Attitude</label>
<binding> <binding>
<command>property-assign</command> <command>property-assign</command>
<property>/sim/presets/trim</property> <property>/sim/presets/trim</property>
@ -258,7 +258,7 @@
</item> </item>
<item> <item>
<label>Tower position</label> <label>Tower Position</label>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>location-of-tower</dialog-name> <dialog-name>location-of-tower</dialog-name>
@ -393,7 +393,7 @@
</item> </item>
<item> <item>
<label>Fuel and Payload</label> <label>Fuel And Payload</label>
<name>fuel-and-payload</name> <name>fuel-and-payload</name>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
@ -501,7 +501,7 @@
</item> </item>
<item> <item>
<label>Scenario Select - takes effect on next run</label> <label>Scenario Select (requires restart)</label>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>scenario</dialog-name> <dialog-name>scenario</dialog-name>
@ -525,7 +525,7 @@
</item> </item>
<item> <item>
<label>Chat Menu</label> <label>Chat Menu (-)</label>
<binding> <binding>
<command>dialog-show</command> <command>dialog-show</command>
<dialog-name>chat-menu</dialog-name> <dialog-name>chat-menu</dialog-name>
@ -541,7 +541,7 @@
</item> </item>
<item> <item>
<label>MPCarrier selection</label> <label>MPCarrier Selection</label>
<binding> <binding>
<command>nasal</command> <command>nasal</command>
<script> <script>
@ -696,7 +696,7 @@
<item> <item>
<label>Help (opens in browser)</label> <label>Help (opens in browser)</label>
<binding> <binding>
<command>old-help-dialog</command> <command>old-help-dialog</command>
</binding> </binding>
@ -719,10 +719,6 @@
</binding> </binding>
</item> </item>
<item>
<label> --- Key Reference ---</label>
</item>
<item> <item>
<label>Basic Simulator Keys</label> <label>Basic Simulator Keys</label>
<binding> <binding>
@ -731,8 +727,16 @@
</binding> </binding>
</item> </item>
<item>
<label>Common Aircraft Keys</label>
<binding>
<command>nasal</command>
<script>gui.showHelpDialog("/sim/help/common")</script>
</binding>
</item>
<item> <item>
<label> ------------------</label> <label>------------------</label>
</item> </item>
<item> <item>