Merge branch 'master' into dev

This commit is contained in:
Joshua Davidson 2018-09-20 14:21:43 -04:00
commit 411a1f216b
3 changed files with 6 additions and 6 deletions

View file

@ -215,9 +215,9 @@
<name>ND1</name>
<path>Aircraft/IDG-A32X/Models/Instruments/ND/ND_L.xml</path>
<offsets>
<x-m>-0.55475</x-m>
<x-m>-0.55415</x-m>
<y-m>-0.35198</y-m>
<z-m>0.22255</z-m>
<z-m>0.22256</z-m>
<pitch-deg>-16.534</pitch-deg>
</offsets>
</model>
@ -238,9 +238,9 @@
<name>ND2</name>
<path>Aircraft/IDG-A32X/Models/Instruments/ND/ND_R.xml</path>
<offsets>
<x-m>-0.55475</x-m>
<x-m>-0.55415</x-m>
<y-m>0.35198</y-m>
<z-m>0.22255</z-m>
<z-m>0.22256</z-m>
<pitch-deg>-16.534</pitch-deg>
</offsets>
</model>

View file

@ -217,7 +217,7 @@ var canvas_PFD_base = {
}
if (ac2.getValue() >= 110) {
if (acconfig.getValue != 1 and du6_test.getValue() != 1) {
if (acconfig.getValue() != 1 and du6_test.getValue() != 1) {
du6_test.setValue(1);
du6_test_amount.setValue(math.round((rand() * 5 ) + 35, 0.1));
du6_test_time.setValue(elapsedtime_act);

View file

@ -1 +1 @@
4643
4644