Merge branch 'master' into MCDU

This commit is contained in:
Joshua Davidson 2018-01-05 15:26:02 -05:00
commit 0a33f3f834
8 changed files with 206493 additions and 181954 deletions

View file

@ -63,22 +63,22 @@
<!-- Overhead Panel --> <!-- Overhead Panel -->
<!-- New OH not ready yet --> <!-- New OH not ready yet -->
<!--model> <!--model>
<path>Aircraft/IDG-A32X/Models/Instruments/OHpanel/OHpanel.xml</path> <path>Aircraft/IDG-A32X/Models/Instruments/OHpanel.new/OHpanel.xml</path>
<offsets> <offsets>
<x-m>0.12844</x-m> <x-m>0.128</x-m>
<y-m>0</y-m> <y-m>0</y-m>
<z-m>1.01821</z-m> <z-m>0.997</z-m>
<pitch-deg>69.552</pitch-deg> <pitch-deg>69.547</pitch-deg>
</offsets> </offsets>
</model--> </model-->
<model> <model>
<path>Aircraft/IDG-A32X/Models/Instruments/OHpanel/OHpanel.xml</path> <path>Aircraft/IDG-A32X/Models/Instruments/OHpanel/OHpanel.xml</path>
<offsets> <offsets>
<x-m>0.12844</x-m> <x-m>0.128</x-m>
<y-m>0</y-m> <y-m>0</y-m>
<z-m>1.01821</z-m> <z-m>0.997</z-m>
<pitch-deg>69.552</pitch-deg> <pitch-deg>69.547</pitch-deg>
</offsets> </offsets>
</model> </model>
@ -91,10 +91,10 @@
</equals> </equals>
</condition> </condition>
<offsets> <offsets>
<x-m>0.12844</x-m> <x-m>0.128</x-m>
<y-m>0</y-m> <y-m>0</y-m>
<z-m>1.01821</z-m> <z-m>0.997</z-m>
<pitch-deg>69.552</pitch-deg> <pitch-deg>69.547</pitch-deg>
</offsets> </offsets>
</model> </model>
@ -113,10 +113,10 @@
</and> </and>
</condition> </condition>
<offsets> <offsets>
<x-m>0.12844</x-m> <x-m>0.128</x-m>
<y-m>0</y-m> <y-m>0</y-m>
<z-m>1.01821</z-m> <z-m>0.997</z-m>
<pitch-deg>69.552</pitch-deg> <pitch-deg>69.547</pitch-deg>
</offsets> </offsets>
</model> </model>
@ -4739,6 +4739,12 @@
<object-name>foot_warmer_fo_sw.mark</object-name> <object-name>foot_warmer_fo_sw.mark</object-name>
<object-name>brightness_nd_2_fo.mark</object-name> <object-name>brightness_nd_2_fo.mark</object-name>
<object-name>brightness_nd_1_fo.mark</object-name> <object-name>brightness_nd_1_fo.mark</object-name>
<object-name>iesi_labels</object-name>
<object-name>iesi_btn_ls</object-name>
<object-name>iesi_btn_bugs</object-name>
<object-name>iesi_btn_plus</object-name>
<object-name>iesi_btn_minus</object-name>
<object-name>iesi_btn_rst</object-name>
<emission> <emission>
<red>1</red> <red>1</red>
<green>0.725</green> <green>0.725</green>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 120 KiB

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 650 KiB

After

Width:  |  Height:  |  Size: 796 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 29 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

View file

@ -1 +1 @@
4219 4220