diff -Nru fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/ADF-462/ctl62-adf.xml fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/ADF-462/ctl62-adf.xml
--- fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/ADF-462/ctl62-adf.xml 1970-01-01 00:00:00.000000000 +0000
+++ fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/ADF-462/ctl62-adf.xml 2013-05-20 01:05:19.000000000 +0000
@@ -0,0 +1,420 @@
+
+
+
+
+
+
+
+ instrumentation/adf[0]/serviceable
+ systems/electrical/outputs/adf[0]
+ instrumentation/adf[0]/volume-norm
+ instrumentation/adf[0]/frequencies/selected-khz
+ instrumentation/adf[0]/frequencies/standby-khz
+ ADF462.swap(0);
+ ADF462.adjust_frequency(0, 1.0);
+ ADF462.adjust_frequency(0, -1.0);
+ ADF462.adjust_frequency(0, 10.0);
+ ADF462.adjust_frequency(0, -10.0);
+
+ controls/lighting/panel-norm
+
+
+ ctl62.ac
+
+
+ select
+ freq.002
+ freq.003
+ freq.dec
+ freq.004
+ freq.005
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ select
+ stby.002
+ stby.003
+ stby.dec
+ stby.004
+ stby.005
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ select
+ freq.001
+
+
+
+
+
+ 1
+
+
+
+ 999.5
+
+
+
+
+
+
+ select
+ stby.001
+
+
+
+
+
+ 1
+
+
+
+ 999.5
+
+
+
+
+
+
+ select
+ mem.annun
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ select
+ CTL-62.xfr
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ select
+ CTL-62.mem
+
+
+
+
+
+ 1
+
+
+
+
+
+
+
+ textranslate
+ freq.001
+
+ 0.0001
+ 1000
+ 0.05
+
+ 0
+ 1
+ 0
+
+
+
+
+ textranslate
+ freq.002
+
+ 0.001
+ 100
+ 0.05
+
+ 0
+ 1
+ 0
+
+
+
+
+ textranslate
+ freq.003
+
+ 0.01
+ 10
+ 0.05
+
+ 0
+ 1
+ 0
+
+
+
+
+ textranslate
+ freq.004
+
+ 0.1
+ 1
+ 0.05
+
+ 0
+ 1
+ 0
+
+
+
+
+ textranslate
+ freq.005
+
+ 1.0
+ 0.1
+ 0.05
+
+ 0
+ 1
+ 0
+
+
+
+
+
+ textranslate
+ stby.001
+
+ 0.0001
+ 1000
+ 0.05
+
+ 0
+ 1
+ 0
+
+
+
+
+ textranslate
+ stby.002
+
+ 0.001
+ 100
+ 0.05
+
+ 0
+ 1
+ 0
+
+
+
+
+ textranslate
+ stby.003
+
+ 0.01
+ 10
+ 0.05
+
+ 0
+ 1
+ 0
+
+
+
+
+ textranslate
+ stby.004
+
+ 0.1
+ 1
+ 0.05
+
+ 0
+ 1
+ 0
+
+
+
+
+ textranslate
+ stby.005
+
+ 1.0
+ 0.1
+ 0.05
+
+ 0
+ 1
+ 0
+
+
+
+
+
+ pick
+ CTL-62.xfr
+
+
+ false
+
+ nasal
+
+
+
+
+
+
+ knob
+ CTL-62.pwr
+
+
+ 00
+ 1.030
+
+
+ 0.0
+ -0.014
+ -0.018
+
+
+ -1
+ 0
+ 0
+
+
+
+ property-toggle
+
+ 0
+ 1
+
+
+
+
+
+ knob
+ CTL-62.vol
+
+ 300
+
+ 0.0
+ -0.0138
+ -0.0183
+
+
+ -1
+ 0
+ 0
+
+
+
+ property-adjust
+
+ 0.02
+ 0.0
+ 1.0
+
+
+
+
+
+ knob
+ freq.knob.small
+
+
+ nasal
+
+
+
+
+
+ nasal
+
+
+
+
+
+
+ knob
+ freq.knob.large
+
+
+ nasal
+
+
+
+
+
+ nasal
+
+
+
+
+
+
+ material
+ freq.knob.small
+ freq.knob.large
+ CTL-62.vol
+ act.btn
+ sto.btn
+ test.btn
+
+
+ 0.4
+ 0.4
+ 0.4
+
+
+
+ material
+ CTL-62
+
+
+ 0.15
+ 0.15
+ 0.15
+
+
+
+
diff -Nru fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/ADF-462/ctl62-adf1.xml fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/ADF-462/ctl62-adf1.xml
--- fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/ADF-462/ctl62-adf1.xml 2013-04-28 13:30:42.000000000 +0000
+++ fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/ADF-462/ctl62-adf1.xml 2013-05-20 01:05:19.000000000 +0000
@@ -12,369 +12,19 @@
NOTE: ctl62.nas MUST be loaded as Nasal module ADF462.
-->
+
-
-
- ctl62.ac
-
-
- select
- freq.002
- freq.003
- freq.dec
- freq.004
- freq.005
-
-
- systems/electrical/outputs/adf
- 1
-
-
-
-
-
- select
- stby.002
- stby.003
- stby.dec
- stby.004
- stby.005
-
-
- systems/electrical/outputs/adf
- 1
-
-
-
-
-
- select
- freq.001
-
-
-
- systems/electrical/outputs/adf
- 1
-
-
- instrumentation/adf/frequencies/selected-khz
- 999.5
-
-
-
-
-
-
- select
- stby.001
-
-
-
- systems/electrical/outputs/adf
- 1
-
-
- instrumentation/adf/frequencies/standby-khz
- 999.5
-
-
-
-
-
-
- select
- mem.annun
-
-
- systems/electrical/outputs/adf
- 1
-
-
-
-
-
- rotate
- CTL-62.pwr
- instrumentation/adf/serviceable
-
- 00
- 1.030
-
-
- 0.0
- -0.014
- -0.018
-
-
- -1
- 0
- 0
-
-
-
-
-
-
- textranslate
- freq.001
- instrumentation/adf/frequencies/selected-khz
- 0.0001
- 1000
- 0.05
-
- 0
- 1
- 0
-
-
-
-
- textranslate
- freq.002
- instrumentation/adf/frequencies/selected-khz
- 0.001
- 100
- 0.05
-
- 0
- 1
- 0
-
-
-
-
- textranslate
- freq.003
- instrumentation/adf/frequencies/selected-khz
- 0.01
- 10
- 0.05
-
- 0
- 1
- 0
-
-
-
-
- textranslate
- freq.004
- instrumentation/adf/frequencies/selected-khz
- 0.1
- 1
- 0.05
-
- 0
- 1
- 0
-
-
-
-
- textranslate
- freq.005
- instrumentation/adf/frequencies/selected-khz
- 1.0
- 0.1
- 0.05
-
- 0
- 1
- 0
-
-
-
-
-
-
- textranslate
- stby.001
- instrumentation/adf/frequencies/standby-khz
- 0.0001
- 1000
- 0.05
-
- 0
- 1
- 0
-
-
-
-
- textranslate
- stby.002
- instrumentation/adf/frequencies/standby-khz
- 0.001
- 100
- 0.05
-
- 0
- 1
- 0
-
-
-
-
- textranslate
- stby.003
- instrumentation/adf/frequencies/standby-khz
- 0.01
- 10
- 0.05
-
- 0
- 1
- 0
-
-
-
-
- textranslate
- stby.004
- instrumentation/adf/frequencies/standby-khz
- 0.1
- 1
- 0.05
-
- 0
- 1
- 0
-
-
-
-
- textranslate
- stby.005
- instrumentation/adf/frequencies/standby-khz
- 1.0
- 0.1
- 0.05
-
- 0
- 1
- 0
-
-
-
-
-
-
- pick
- CTL-62.xfr
-
-
- false
-
- nasal
-
-
-
-
-
-
- pick
- pwr.off
-
-
- false
-
- property-assign
- instrumentation/adf/serviceable
- false
-
-
-
-
-
- pick
- pwr.on
-
-
- false
-
- property-assign
- instrumentation/adf/serviceable
- true
-
-
-
-
-
- pick
- freq.knob.small
-
-
- true
- 0.2
-
- nasal
-
-
-
-
-
- true
- 0.2
-
- nasal
-
-
-
-
-
- false
-
- nasal
-
-
-
-
-
- false
-
- nasal
-
-
-
-
-
-
- pick
- freq.knob.large
-
-
- true
- 0.2
-
- nasal
-
-
-
-
-
- true
- 0.2
-
- nasal
-
-
-
-
-
- false
-
- nasal
-
-
-
-
-
- false
-
- nasal
-
-
-
-
+
+ instrumentation/adf[0]/serviceable
+ systems/electrical/outputs/adf[0]
+ instrumentation/adf[0]/volume-norm
+ instrumentation/adf[0]/frequencies/selected-khz
+ instrumentation/adf[0]/frequencies/standby-khz
+ ADF462.swap(0);
+ ADF462.adjust_frequency(0, 1.0);
+ ADF462.adjust_frequency(0, -1.0);
+ ADF462.adjust_frequency(0, 10.0);
+ ADF462.adjust_frequency(0, -10.0);
+
diff -Nru fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/ADF-462/ctl62-adf2.xml fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/ADF-462/ctl62-adf2.xml
--- fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/ADF-462/ctl62-adf2.xml 1970-01-01 00:00:00.000000000 +0000
+++ fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/ADF-462/ctl62-adf2.xml 2013-05-20 01:05:19.000000000 +0000
@@ -0,0 +1,30 @@
+
+
+
+
+
+ instrumentation/adf[1]/serviceable
+ systems/electrical/outputs/adf[1]
+ instrumentation/adf[1]/volume-norm
+ instrumentation/adf[1]/frequencies/selected-khz
+ instrumentation/adf[1]/frequencies/standby-khz
+ ADF462.swap(1);
+ ADF462.adjust_frequency(1, 1.0);
+ ADF462.adjust_frequency(1, -1.0);
+ ADF462.adjust_frequency(1, 10.0);
+ ADF462.adjust_frequency(1, -10.0);
+
+
+
diff -Nru fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/ADF-462/ctl62.ac fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/ADF-462/ctl62.ac
--- fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/ADF-462/ctl62.ac 2013-04-28 13:30:42.000000000 +0000
+++ fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/ADF-462/ctl62.ac 2013-05-20 01:05:19.000000000 +0000
@@ -4,7 +4,7 @@
MATERIAL "dimlit" rgb 1 1 1 amb 1 1 1 emis 0.5 0.5 0.5 spec 0.5 0.5 0.5 shi 64 trans 0
MATERIAL "lit" rgb 1 1 1 amb 1 1 1 emis 1 1 1 spec 0.5 0.5 0.5 shi 64 trans 0
OBJECT world
-kids 29
+kids 25
OBJECT poly
name "CTL-62"
data 4
@@ -1155,27 +1155,6 @@
1 0.933840274811 0.0642324090004
kids 0
OBJECT poly
-name "freq.dwn"
-data 8
-Mesh.013
-texture "ctl-62.png"
-texrep 1 1
-crease 30.000000
-numvert 4
-0.003022 -0.006662 -0.017042
-0.003022 -0.02423 -0.017042
-0.003022 -0.006662 -0.008258
-0.003022 -0.02423 -0.008258
-numsurf 1
-SURF 0x00
-mat 1
-refs 4
-0 0.628464281559 0.464825630188
-2 0.508616089821 0.464825630188
-3 0.508616030216 0.2251290977
-1 0.628464281559 0.2251290977
-kids 0
-OBJECT poly
name "freq.knob.large"
data 8
Mesh.014
@@ -1709,27 +1688,6 @@
15 0.158409923315 0.71993303299
kids 0
OBJECT poly
-name "freq.up"
-data 8
-Mesh.015
-texture "ctl-62.png"
-texrep 1 1
-crease 30.000000
-numvert 4
-0.003022 -0.006662 -0.017042
-0.003022 -0.02423 -0.017042
-0.003022 -0.02423 -0.025826
-0.003022 -0.006662 -0.025826
-numsurf 1
-SURF 0x00
-mat 1
-refs 4
-3 0.748312532902 0.464825630188
-0 0.628464281559 0.464825630188
-1 0.628464281559 0.2251290977
-2 0.748312532902 0.2251290977
-kids 0
-OBJECT poly
name "mem.annun"
data 8
Mesh.016
@@ -1751,48 +1709,6 @@
1 0.135480225086 0.035107113421
kids 0
OBJECT poly
-name "pwr.off"
-data 8
-Mesh.017
-texture "ctl-62.png"
-texrep 1 1
-crease 30.000000
-numvert 4
-0.002944 -0.026036 0.021504
-0.002944 -0.010631 0.021504
-0.002944 -0.026036 0.013802
-0.002944 -0.010631 0.013802
-numsurf 1
-SURF 0x00
-mat 1
-refs 4
-0 0.114473424852 0.201592057943
-2 0.220019072294 0.201592057943
-3 0.220019072294 0.412683337927
-1 0.114473424852 0.412683337927
-kids 0
-OBJECT poly
-name "pwr.on"
-data 8
-Mesh.018
-texture "ctl-62.png"
-texrep 1 1
-crease 30.000000
-numvert 4
-0.002944 -0.010631 0.013802
-0.002944 -0.026036 0.013802
-0.002944 -0.026036 0.0061
-0.002944 -0.010632 0.0061
-numsurf 1
-SURF 0x00
-mat 1
-refs 4
-3 0.325564712286 0.412683337927
-0 0.220019072294 0.412683337927
-1 0.220019072294 0.201592057943
-2 0.325564712286 0.201592057943
-kids 0
-OBJECT poly
name "stby.001"
data 8
Mesh.019
diff -Nru fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/VHF-22/ctl22-com.xml fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/VHF-22/ctl22-com.xml
--- fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/VHF-22/ctl22-com.xml 2013-04-28 13:30:42.000000000 +0000
+++ fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/VHF-22/ctl22-com.xml 2013-05-20 01:05:19.000000000 +0000
@@ -17,6 +17,7 @@
instrumentation/comm[0]/serviceable
systems/electrical/outputs/comm[0]
+ instrumentation/comm[0]/volume
instrumentation/comm[0]/frequencies/selected-mhz
instrumentation/comm[0]/frequencies/standby-mhz
VHF22.swap(0);
@@ -24,6 +25,8 @@
VHF22.adjust_frequency(0, -0.025);
VHF22.adjust_frequency(0, 1.0);
VHF22.adjust_frequency(0, -1.0);
+
+ controls/lighting/panel-norm
ctl22.ac
@@ -38,10 +41,13 @@
freq.005
freq.006
-
-
- 1
-
+
+
+
+
+ 1
+
+
@@ -55,10 +61,13 @@
stby.005
stby.006
-
-
- 1
-
+
+
+
+
+ 1
+
+
@@ -66,31 +75,42 @@
select
mem.annun
-
-
- 1
-
+
+
+
+
+ 1
+
+
- rotate
- CTL-22.pwr
-
-
- 00
- 1.030
-
-
- 0.0
- -0.014
- -0.018
-
-
- -1
- 0
- 0
-
+ select
+ CTL-22.xfr
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ select
+ CTL-22.mem
+
+
+
+
+
+ 1
+
+
+
@@ -279,109 +299,117 @@
- pick
- pwr.off
+ knob
+ CTL-22.pwr
+
+
+ 00
+ 1.030
+
+
+ 0.0
+ -0.014
+ -0.018
+
+
+ -1
+ 0
+ 0
+
-
- false
- property-assign
+ property-toggle
- false
+ 0
+ 1
- pick
- pwr.on
+ knob
+ CTL-22.vol
+
+ 300
+
+ 0.0
+ -0.0138
+ -0.0183
+
+
+ -1
+ 0
+ 0
+
-
- false
- property-assign
-
- true
+ property-adjust
+
+ 0.02
+ 0.0
+ 1.0
- pick
+ knob
freq.knob.kHz
-
-
- true
- 0.2
+
nasal
-
-
-
- true
- 0.2
+
+
nasal
-
-
-
- false
-
- nasal
-
-
-
-
-
- false
-
- nasal
-
-
-
+
- pick
+ knob
freq.knob.MHz
-
-
- true
- 0.2
+
nasal
-
-
-
- true
- 0.2
-
- nasal
-
-
-
-
-
- false
+
+
nasal
-
-
-
- false
-
- nasal
-
-
-
+
+
+
+
+ material
+ freq.knob.kHz
+ freq.knob.MHz
+ CTL-22.vol
+ act.btn
+ sto.btn
+ test.btn
+
+
+ 0.4
+ 0.4
+ 0.4
+
+
+
+ material
+ CTL-22
+
+
+ 0.15
+ 0.15
+ 0.15
+
diff -Nru fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/VHF-22/ctl22-com1.xml fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/VHF-22/ctl22-com1.xml
--- fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/VHF-22/ctl22-com1.xml 2013-04-28 13:30:42.000000000 +0000
+++ fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/VHF-22/ctl22-com1.xml 2013-05-20 01:05:19.000000000 +0000
@@ -16,6 +16,7 @@
instrumentation/comm[0]/serviceable
systems/electrical/outputs/comm[0]
+ instrumentation/comm[0]/volume
instrumentation/comm[0]/frequencies/selected-mhz
instrumentation/comm[0]/frequencies/standby-mhz
VHF22.swap(0);
diff -Nru fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/VHF-22/ctl22-com2.xml fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/VHF-22/ctl22-com2.xml
--- fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/VHF-22/ctl22-com2.xml 2013-04-28 13:30:42.000000000 +0000
+++ fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/VHF-22/ctl22-com2.xml 2013-05-20 01:05:19.000000000 +0000
@@ -16,6 +16,7 @@
instrumentation/comm[1]/serviceable
systems/electrical/outputs/comm[1]
+ instrumentation/comm[1]/volume
instrumentation/comm[1]/frequencies/selected-mhz
instrumentation/comm[1]/frequencies/standby-mhz
VHF22.swap(1);
diff -Nru fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/VHF-22/ctl22.ac fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/VHF-22/ctl22.ac
--- fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/VHF-22/ctl22.ac 2013-04-28 13:30:42.000000000 +0000
+++ fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/VHF-22/ctl22.ac 2013-05-20 01:05:19.000000000 +0000
@@ -4,7 +4,7 @@
MATERIAL "dimlit" rgb 1 1 1 amb 1 1 1 emis 0.5 0.5 0.5 spec 0.5 0.5 0.5 shi 64 trans 0
MATERIAL "lit" rgb 1 1 1 amb 1 1 1 emis 1 1 1 spec 0.5 0.5 0.5 shi 64 trans 0
OBJECT world
-kids 31
+kids 27
OBJECT poly
name "CTL-22"
data 4
@@ -1176,27 +1176,6 @@
1 0.933840274811 0.0642324090004
kids 0
OBJECT poly
-name "freq.dwn"
-data 8
-Mesh.014
-texture "ctl-22.png"
-texrep 1 1
-crease 30.000000
-numvert 4
-0.003022 -0.006662 -0.017042
-0.003022 -0.02423 -0.017042
-0.003022 -0.006662 -0.008258
-0.003022 -0.02423 -0.008258
-numsurf 1
-SURF 0x00
-mat 1
-refs 4
-0 0.628464281559 0.464825630188
-2 0.508616089821 0.464825630188
-3 0.508616030216 0.2251290977
-1 0.628464281559 0.2251290977
-kids 0
-OBJECT poly
name "freq.knob.MHz"
data 8
Mesh.015
@@ -1730,27 +1709,6 @@
15 0.158409923315 0.71993303299
kids 0
OBJECT poly
-name "freq.up"
-data 8
-Mesh.016
-texture "ctl-22.png"
-texrep 1 1
-crease 30.000000
-numvert 4
-0.003022 -0.006662 -0.017042
-0.003022 -0.02423 -0.017042
-0.003022 -0.02423 -0.025826
-0.003022 -0.006662 -0.025826
-numsurf 1
-SURF 0x00
-mat 1
-refs 4
-3 0.748312532902 0.464825630188
-0 0.628464281559 0.464825630188
-1 0.628464281559 0.2251290977
-2 0.748312532902 0.2251290977
-kids 0
-OBJECT poly
name "mem.annun"
data 8
Mesh.017
@@ -1772,48 +1730,6 @@
1 0.135480225086 0.035107113421
kids 0
OBJECT poly
-name "pwr.off"
-data 8
-Mesh.018
-texture "ctl-22.png"
-texrep 1 1
-crease 30.000000
-numvert 4
-0.002944 -0.026036 0.021504
-0.002944 -0.010631 0.021504
-0.002944 -0.026036 0.013802
-0.002944 -0.010631 0.013802
-numsurf 1
-SURF 0x00
-mat 1
-refs 4
-0 0.114473424852 0.201592057943
-2 0.220019072294 0.201592057943
-3 0.220019072294 0.412683337927
-1 0.114473424852 0.412683337927
-kids 0
-OBJECT poly
-name "pwr.on"
-data 8
-Mesh.019
-texture "ctl-22.png"
-texrep 1 1
-crease 30.000000
-numvert 4
-0.002944 -0.010631 0.013802
-0.002944 -0.026036 0.013802
-0.002944 -0.026036 0.0061
-0.002944 -0.010632 0.0061
-numsurf 1
-SURF 0x00
-mat 1
-refs 4
-3 0.325564712286 0.412683337927
-0 0.220019072294 0.412683337927
-1 0.220019072294 0.201592057943
-2 0.325564712286 0.201592057943
-kids 0
-OBJECT poly
name "stby.001"
data 8
Mesh.020
diff -Nru fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/VIR-32/ctl32-nav.xml fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/VIR-32/ctl32-nav.xml
--- fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/VIR-32/ctl32-nav.xml 2013-04-28 13:30:42.000000000 +0000
+++ fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/VIR-32/ctl32-nav.xml 2013-05-20 01:05:19.000000000 +0000
@@ -15,9 +15,11 @@
+
instrumentation/nav[0]/serviceable
systems/electrical/outputs/nav[0]
+ instrumentation/nav[0]/volume
instrumentation/nav[0]/frequencies/selected-mhz
instrumentation/nav[0]/frequencies/standby-mhz
VIR32.swap(0);
@@ -25,10 +27,12 @@
VIR32.adjust_frequency(0, -0.05);
VIR32.adjust_frequency(0, 1.0);
VIR32.adjust_frequency(0, -1.0);
+
+ controls/lighting/panel-norm
ctl32.ac
-
+
select
freq.001
@@ -38,10 +42,13 @@
freq.004
freq.005
-
-
- 1
-
+
+
+
+
+ 1
+
+
@@ -54,10 +61,13 @@
stby.004
stby.005
-
-
- 1
-
+
+
+
+
+ 1
+
+
@@ -65,31 +75,42 @@
select
mem.annun
-
-
- 1
-
+
+
+
+
+ 1
+
+
- rotate
- CTL-32.pwr
-
-
- 00
- 1.030
-
-
- 0.0
- -0.014
- -0.018
-
-
- -1
- 0
- 0
-
+ select
+ CTL-32.xfr
+
+
+
+
+
+ 1
+
+
+
+
+
+
+ select
+ CTL-32.mem
+
+
+
+
+
+ 1
+
+
+
@@ -137,31 +158,31 @@
- textranslate
- freq.004
-
- 1
- 0.1
- 0.0005
-
- 0
- 1
- 0
-
+ textranslate
+ freq.004
+
+ 1.0
+ 0.1
+ 0.0005
+
+ 0
+ 1
+ 0
+
- textranslate
- freq.005
-
- 10
- 0.01
- 0.0005
-
- 0
- 1
- 0
-
+ textranslate
+ freq.005
+
+ 10.0
+ 0.01
+ 0.0005
+
+ 0
+ 1
+ 0
+
@@ -212,7 +233,7 @@
textranslate
stby.004
- 1
+ 1.0
0.1
0.0005
@@ -226,7 +247,7 @@
textranslate
stby.005
- 10
+ 10.0
0.01
0.0005
@@ -250,109 +271,117 @@
- pick
- pwr.off
+ knob
+ CTL-32.pwr
+
+
+ 00
+ 1.030
+
+
+ 0.0
+ -0.014
+ -0.018
+
+
+ -1
+ 0
+ 0
+
-
- false
- property-assign
+ property-toggle
- false
+ 0
+ 1
- pick
- pwr.on
+ knob
+ CTL-32.vol
+
+ 300
+
+ 0.0
+ -0.0138
+ -0.0183
+
+
+ -1
+ 0
+ 0
+
-
- false
- property-assign
-
- true
+ property-adjust
+
+ 0.02
+ 0.0
+ 1.0
- pick
+ knob
freq.knob.kHz
-
-
- true
- 0.2
+
nasal
-
-
-
- true
- 0.2
-
- nasal
-
-
-
-
-
- false
+
+
nasal
-
-
-
- false
-
- nasal
-
-
-
+
- pick
+ knob
freq.knob.MHz
-
-
- true
- 0.2
+
nasal
-
-
-
- true
- 0.2
-
- nasal
-
-
-
-
-
- false
+
+
nasal
-
-
-
- false
-
- nasal
-
-
-
+
+
+
+
+ material
+ freq.knob.kHz
+ freq.knob.MHz
+ CTL-32.vol
+ act.btn
+ sto.btn
+ test.btn
+
+
+ 0.4
+ 0.4
+ 0.4
+
+
+
+ material
+ CTL-32
+
+
+ 0.15
+ 0.15
+ 0.15
+
diff -Nru fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/VIR-32/ctl32-nav1.xml fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/VIR-32/ctl32-nav1.xml
--- fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/VIR-32/ctl32-nav1.xml 2013-04-28 13:30:42.000000000 +0000
+++ fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/VIR-32/ctl32-nav1.xml 2013-05-20 01:05:19.000000000 +0000
@@ -18,6 +18,7 @@
instrumentation/nav[0]/serviceable
systems/electrical/outputs/nav[0]
+ instrumentation/nav[0]/volume
instrumentation/nav[0]/frequencies/selected-mhz
instrumentation/nav[0]/frequencies/standby-mhz
VIR32.swap(0);
diff -Nru fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/VIR-32/ctl32-nav2.xml fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/VIR-32/ctl32-nav2.xml
--- fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/VIR-32/ctl32-nav2.xml 2013-04-28 13:30:42.000000000 +0000
+++ fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/VIR-32/ctl32-nav2.xml 2013-05-20 01:05:19.000000000 +0000
@@ -18,6 +18,7 @@
instrumentation/nav[1]/serviceable
systems/electrical/outputs/nav[1]
+ instrumentation/nav[1]/volume
instrumentation/nav[1]/frequencies/selected-mhz
instrumentation/nav[1]/frequencies/standby-mhz
VIR32.swap(1);
diff -Nru fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/VIR-32/ctl32.ac fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/VIR-32/ctl32.ac
--- fgfs-base-2.11.0+201305162000~git533d875+1/Aircraft/Generic/DualControl/Instruments/VIR-32/ctl32.ac 2013-04-28 13:30:42.000000000 +0000
+++ fgfs-base-2.11.0+201305221600~giteef96e9/Aircraft/Generic/DualControl/Instruments/VIR-32/ctl32.ac 2013-05-20 01:05:19.000000000 +0000
@@ -4,7 +4,7 @@
MATERIAL "dimlit" rgb 1 1 1 amb 1 1 1 emis 0.5 0.5 0.5 spec 0.5 0.5 0.5 shi 64 trans 0
MATERIAL "lit" rgb 1 1 1 amb 1 1 1 emis 1 1 1 spec 0.5 0.5 0.5 shi 64 trans 0
OBJECT world
-kids 27
+kids 25
OBJECT poly
name "CTL-32"
data 8
@@ -1709,48 +1709,6 @@
1 0.135480225086 0.035107113421
kids 0
OBJECT poly
-name "pwr.off"
-data 9
-Plane.048
-texture "ctl-32.png"
-texrep 1 1
-crease 30.000000
-numvert 4
-0.002944 -0.026036 0.021504
-0.002944 -0.010631 0.021504
-0.002944 -0.026036 0.013802
-0.002944 -0.010631 0.013802
-numsurf 1
-SURF 0x00
-mat 1
-refs 4
-0 0.114473424852 0.201592057943
-2 0.220019072294 0.201592057943
-3 0.220019072294 0.412683337927
-1 0.114473424852 0.412683337927
-kids 0
-OBJECT poly
-name "pwr.on"
-data 9
-Plane.052
-texture "ctl-32.png"
-texrep 1 1
-crease 30.000000
-numvert 4
-0.002944 -0.010631 0.013802
-0.002944 -0.026036 0.013802
-0.002944 -0.026036 0.0061
-0.002944 -0.010632 0.0061
-numsurf 1
-SURF 0x00
-mat 1
-refs 4
-3 0.325564712286 0.412683337927
-0 0.220019072294 0.412683337927
-1 0.220019072294 0.201592057943
-2 0.325564712286 0.201592057943
-kids 0
-OBJECT poly
name "stby.001"
data 9
Plane.041
diff -Nru fgfs-base-2.11.0+201305162000~git533d875+1/Docs/README.materials fgfs-base-2.11.0+201305221600~giteef96e9/Docs/README.materials
--- fgfs-base-2.11.0+201305162000~git533d875+1/Docs/README.materials 2013-04-28 16:14:52.000000000 +0000
+++ fgfs-base-2.11.0+201305221600~giteef96e9/Docs/README.materials 2013-05-20 01:05:19.000000000 +0000
@@ -113,9 +113,14 @@
8 different trees in a row, duplicate 4 times. From bottom to top, the
rows contain
* summer textures
- * snow texture
+ * summer snow texture
* winter texture
* winter snow texture
+
+ Each tree must have space at the top. For a 512x512 texture sheet, this
+ should be 8 pixels. Otherwise subsequent rendering results in "top hats"
+ above trees in the distance where the trunk of the tree above in the
+ textures sheet bleeds downwards when the mipmaps are generated.
tree-varieties : The number of different trees defined in the tree-texture
horizontally. (default: 1)
diff -Nru fgfs-base-2.11.0+201305162000~git533d875+1/Shaders/deferred-tree.vert fgfs-base-2.11.0+201305221600~giteef96e9/Shaders/deferred-tree.vert
--- fgfs-base-2.11.0+201305162000~git533d875+1/Shaders/deferred-tree.vert 2013-05-10 22:08:19.000000000 +0000
+++ fgfs-base-2.11.0+201305221600~giteef96e9/Shaders/deferred-tree.vert 2013-05-20 01:05:19.000000000 +0000
@@ -11,9 +11,10 @@
// Texture coordinates
float numVarieties = gl_Normal.z;
- float texFract = floor(fract(gl_MultiTexCoord0.x) * numVarieties) / (numVarieties * 4.0);
- texFract += floor(gl_MultiTexCoord0.x) / (numVarieties * 4.0);
- gl_TexCoord[0] = vec4(texFract + 0.5 * float(season), gl_MultiTexCoord0.y, 0.0, 0.0);
+ float texFract = floor(fract(gl_MultiTexCoord0.x) * numVarieties) / numVarieties;
+ texFract += floor(gl_MultiTexCoord0.x) / numVarieties;
+ gl_TexCoord[0] = vec4(texFract, gl_MultiTexCoord0.y, 0.0, 0.0);
+ gl_TexCoord[0].y = gl_TexCoord[0].y + 0.5 * season;
// Position and scaling
vec3 position = gl_Vertex.xyz * gl_Normal.xxy;
diff -Nru fgfs-base-2.11.0+201305162000~git533d875+1/Shaders/tree-haze.vert fgfs-base-2.11.0+201305221600~giteef96e9/Shaders/tree-haze.vert
--- fgfs-base-2.11.0+201305162000~git533d875+1/Shaders/tree-haze.vert 2013-05-14 01:07:03.000000000 +0000
+++ fgfs-base-2.11.0+201305221600~giteef96e9/Shaders/tree-haze.vert 2013-05-20 01:05:19.000000000 +0000
@@ -38,7 +38,7 @@
//uniform float scattering;
uniform float ground_scattering;
uniform float snow_level;
-uniform int season;
+uniform int season;
float earthShade;
float mie_angle;
@@ -75,18 +75,19 @@
// this code is copied from tree.vert
float numVarieties = gl_Normal.z;
- float texFract = floor(fract(gl_MultiTexCoord0.x) * numVarieties) / (numVarieties * 4.0);
- texFract += floor(gl_MultiTexCoord0.x) / (numVarieties * 4.0);
+ float texFract = floor(fract(gl_MultiTexCoord0.x) * numVarieties) / numVarieties;
+ texFract += floor(gl_MultiTexCoord0.x) / numVarieties;
// Determine the rotation for the tree. The Fog Coordinate provides rotation information
// to rotate one of the quands by 90 degrees. We then apply an additional position seed
// so that trees aren't all oriented N/S
float sr = sin(gl_FogCoord + gl_Color.x);
float cr = cos(gl_FogCoord + gl_Color.x);
+ gl_TexCoord[0] = vec4(texFract, gl_MultiTexCoord0.y, 0.0, 0.0);
- // Shift texture to account for snow level and seasons
- gl_TexCoord[0] = vec4(texFract + 0.25 * step(snow_level, gl_Color.z) + 0.5 * float(season), gl_MultiTexCoord0.y, 0.0, 0.0);
-
+ // Determine the y texture coordinate based on whether it's summer, winter, snowy.
+ gl_TexCoord[0].y = gl_TexCoord[0].y + 0.25 * step(snow_level, gl_Color.z) + 0.5 * season;
+
// scaling
vec3 position = gl_Vertex.xyz * gl_Normal.xxy;
diff -Nru fgfs-base-2.11.0+201305162000~git533d875+1/Shaders/tree.vert fgfs-base-2.11.0+201305221600~giteef96e9/Shaders/tree.vert
--- fgfs-base-2.11.0+201305162000~git533d875+1/Shaders/tree.vert 2013-05-10 22:08:19.000000000 +0000
+++ fgfs-base-2.11.0+201305221600~giteef96e9/Shaders/tree.vert 2013-05-20 01:05:19.000000000 +0000
@@ -17,15 +17,16 @@
void main(void)
{
float numVarieties = gl_Normal.z;
- float texFract = floor(fract(gl_MultiTexCoord0.x) * numVarieties) / (numVarieties * 4.0);
- texFract += floor(gl_MultiTexCoord0.x) / (numVarieties * 4.0);
+ float texFract = floor(fract(gl_MultiTexCoord0.x) * numVarieties) / numVarieties;
+ texFract += floor(gl_MultiTexCoord0.x) / numVarieties;
// Determine the rotation for the tree. The Fog Coordinate provides rotation information
// to rotate one of the quands by 90 degrees. We then apply an additional position seed
// so that trees aren't all oriented N/S
float sr = sin(gl_FogCoord + gl_Color.x);
float cr = cos(gl_FogCoord + gl_Color.x);
- gl_TexCoord[0] = vec4(texFract + 0.5 * float(season), gl_MultiTexCoord0.y, 0.0, 0.0);
+ gl_TexCoord[0] = vec4(texFract, gl_MultiTexCoord0.y, 0.0, 0.0);
+ gl_TexCoord[0].y = gl_TexCoord[0].y + 0.5 * season;
// scaling
vec3 position = gl_Vertex.xyz * gl_Normal.xxy;
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures/Trees/coniferous.dds and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures/Trees/coniferous.dds differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures/Trees/coniferous.png and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures/Trees/coniferous.png differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures/Trees/deciduous.dds and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures/Trees/deciduous.dds differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures/Trees/deciduous.png and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures/Trees/deciduous.png differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures/Trees/mixed-shrub.dds and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures/Trees/mixed-shrub.dds differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures/Trees/mixed-shrub.png and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures/Trees/mixed-shrub.png differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures/Trees/mixed.dds and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures/Trees/mixed.dds differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures/Trees/mixed.png and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures/Trees/mixed.png differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures/Trees/tropical-alt.dds and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures/Trees/tropical-alt.dds differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures/Trees/tropical-alt.png and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures/Trees/tropical-alt.png differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures/Trees/tropical.dds and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures/Trees/tropical.dds differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures/Trees/tropical.png and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures/Trees/tropical.png differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures.high/Trees/coniferous.dds and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures.high/Trees/coniferous.dds differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures.high/Trees/coniferous.png and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures.high/Trees/coniferous.png differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures.high/Trees/coniferous.xcf and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures.high/Trees/coniferous.xcf differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures.high/Trees/deciduous.dds and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures.high/Trees/deciduous.dds differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures.high/Trees/deciduous.png and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures.high/Trees/deciduous.png differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures.high/Trees/deciduous.xcf and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures.high/Trees/deciduous.xcf differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures.high/Trees/mixed.dds and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures.high/Trees/mixed.dds differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures.high/Trees/mixed.png and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures.high/Trees/mixed.png differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures.high/Trees/mixed.xcf and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures.high/Trees/mixed.xcf differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures.high/Trees/tropical-alt.dds and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures.high/Trees/tropical-alt.dds differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures.high/Trees/tropical-alt.png and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures.high/Trees/tropical-alt.png differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures.high/Trees/tropical-alt.xcf and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures.high/Trees/tropical-alt.xcf differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures.high/Trees/tropical.dds and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures.high/Trees/tropical.dds differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures.high/Trees/tropical.png and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures.high/Trees/tropical.png differ
Binary files /tmp/KizhO1WSfO/fgfs-base-2.11.0+201305162000~git533d875+1/Textures.high/Trees/tropical.xcf and /tmp/oyeEzSiSpl/fgfs-base-2.11.0+201305221600~giteef96e9/Textures.high/Trees/tropical.xcf differ
diff -Nru fgfs-base-2.11.0+201305162000~git533d875+1/debian/changelog fgfs-base-2.11.0+201305221600~giteef96e9/debian/changelog
--- fgfs-base-2.11.0+201305162000~git533d875+1/debian/changelog 2013-05-18 10:53:33.000000000 +0000
+++ fgfs-base-2.11.0+201305221600~giteef96e9/debian/changelog 2013-05-22 21:05:08.000000000 +0000
@@ -1,3 +1,48 @@
+fgfs-base (2.11.0+201305221600~giteef96e9-0ubuntuppa1) raring; urgency=low
+
+ [ BARANGER Emmanuel ]
+ * Junkers W34 : Adding floats version. Correction "TURN" by Dany93 and add a livery by Tobias
+
+ [ Saikrishna Arcot ]
+
+ -- Saikrishna Arcot Wed, 22 May 2013 16:05:08 -0500
+
+fgfs-base (2.11.0+201305211600~git0bc0f00-0ubuntuppa1) raring; urgency=low
+
+ [ Stuart Buchanan ]
+ * Minor clean-up of weather dialog
+
+ [ Saikrishna Arcot ]
+
+ -- Saikrishna Arcot Tue, 21 May 2013 16:09:03 -0500
+
+fgfs-base (2.11.0+201305202000~git065e7f7-0ubuntuppa1) raring; urgency=low
+
+ [ BARANGER Emmanuel ]
+ * New airplane : Junkers W34
+
+ [ Saikrishna Arcot ]
+
+ -- Saikrishna Arcot Mon, 20 May 2013 20:05:25 -0500
+
+fgfs-base (2.11.0+201305192000~git6ed63bf-0ubuntuppa1) raring; urgency=low
+
+ [ Stuart Buchanan ]
+ * Use square tree textures with reduce UV coordinates.
+
+ [ Anders Gidenstam ]
+ * Aircraft/Generic/DualControl/Instruments/VHF-22: Converted to knob animations and added panel lighting.
+ * Aircraft/Generic/DualControl/Instruments/VIR-32: Converted to knob animations and added panel lighting.
+ * Aircraft/Generic/DualControl/Instruments/ADF-462: Converted to knob animations and added panel lighting.
+
+ [ Stuart Buchanan ]
+ * Square textures for mixed shrubs.
+ * Document additional spacing on tree textures.
+
+ [ Saikrishna Arcot ]
+
+ -- Saikrishna Arcot Sun, 19 May 2013 20:05:29 -0500
+
fgfs-base (2.11.0+201305162000~git533d875+1-0ubuntuppa1) raring; urgency=low
* Correct source package
diff -Nru fgfs-base-2.11.0+201305162000~git533d875+1/gui/dialogs/weather.xml fgfs-base-2.11.0+201305221600~giteef96e9/gui/dialogs/weather.xml
--- fgfs-base-2.11.0+201305162000~git533d875+1/gui/dialogs/weather.xml 2013-04-28 16:15:10.000000000 +0000
+++ fgfs-base-2.11.0+201305221600~giteef96e9/gui/dialogs/weather.xml 2013-05-21 21:08:53.000000000 +0000
@@ -5,8 +5,12 @@
hbox
- left
-
- true
-
+ center
table
+ 500
0
0
@@ -350,7 +352,7 @@
simple-weather
sim/gui/dialogs/metar/mode/global-weather
true
-
+
property-assign
sim/gui/dialogs/metar/mode/global-weather
@@ -394,6 +396,27 @@
+
+
+
@@ -412,12 +435,11 @@
hbox
- left
-
- true
-
+ center
table
+ 500
+
0
0
@@ -448,6 +470,27 @@
+
+
+
+
@@ -466,53 +509,7 @@
table
-
-