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

Aircraft/c172p/Instruments/Turn/Turn.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0"?>
-
-<PropertyList>
-
- <path>Turn.ac</path>
-
- <animation>
-  <type>material</type>
-  <object-name>Face</object-name>
-  <object-name>PtrTip</object-name>   
-  <object-name>BallEnclosure</object-name>
-  <emission>
-   <red>1.0</red>
-   <green>0.2</green>
-   <blue>0.0</blue>
-   <factor-prop>sim/model//material/instruments/factor</factor-prop>
-  </emission>
- </animation>
-
- <animation>
-  <type>rotate</type>
-  <object-name>PtrCtr</object-name>
-  <object-name>PtrTip</object-name>
-  <property>instrumentation/turn-indicator/indicated-turn-rate</property>
-  <factor>20.0</factor>
-  <axis>
-   <x>-1</x>
-   <y>0</y>
-   <z>0</z>
-  </axis>
- </animation>
-
- <animation>
-  <type>rotate</type>
-  <object-name>Ball</object-name>
-  <property>instrumentation/slip-skid-ball/indicated-slip-skid</property>
-  <factor>21</factor>
-  <min-deg>-19</min-deg>
-  <max-deg>19</max-deg>
-  <center>
-   <x-m>0</x-m>
-   <y-m>0</y-m>
-   <z-m>0.05</z-m>
-  </center>
-  <axis>
-   <x>-1</x>
-   <y>0</y>
-   <z>0</z>
-  </axis>
- </animation>
-
-</PropertyList>
-
-

Aircraft/c172p/Models/c172p.xml

@@ -144,7 +144,7 @@
 
  <model>
    <name>Turn</name>
-   <path>Aircraft/c172p/Instruments/Turn/Turn.xml</path>
+   <path>Aircraft/Instruments-3d/tc/tc.xml</path>
    <offsets>
      <x-m>-0.368</x-m>
      <y-m>-0.311</y-m>