1
0
Fork 0

Merge commit 'refs/merge-requests/116' of git://gitorious.org/fg/fgdata into integration

This commit is contained in:
Vivian Meazza 2011-09-26 23:56:28 +01:00
commit 54291d2414
6 changed files with 39 additions and 0 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 128 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 127 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View file

@ -182,6 +182,13 @@ Shared parameters for various materials.
<wrapv>false</wrapv> <wrapv>false</wrapv>
</material> </material>
<material>
<name>pa_no_threshold</name>
<texture>Runway/pa_no_threshold.png</texture>
<wrapu>false</wrapu>
<wrapv>false</wrapv>
</material>
<material> <material>
<name>pa_stopway</name> <name>pa_stopway</name>
<texture>Runway/pa_stopway.png</texture> <texture>Runway/pa_stopway.png</texture>
@ -362,6 +369,12 @@ Shared parameters for various materials.
<wrapu>false</wrapu> <wrapu>false</wrapu>
</material> </material>
<material>
<name>pa_aim_uk</name>
<texture>Runway/pa_aim_uk.png</texture>
<wrapu>false</wrapu>
</material>
<material> <material>
<name>pa_tz_two_a</name> <name>pa_tz_two_a</name>
<texture>Runway/pa_tz_two_a.png</texture> <texture>Runway/pa_tz_two_a.png</texture>
@ -398,6 +411,12 @@ Shared parameters for various materials.
<wrapu>false</wrapu> <wrapu>false</wrapu>
</material> </material>
<material>
<name>pa_heli</name>
<texture>Runway/pa_helipad.png</texture>
<wrapu>false</wrapu>
</material>
<material> <material>
<name>pc_taxiway</name> <name>pc_taxiway</name>
<name>dirt_rwytaxiway</name> <name>dirt_rwytaxiway</name>
@ -430,6 +449,13 @@ Shared parameters for various materials.
<wrapv>false</wrapv> <wrapv>false</wrapv>
</material> </material>
<material>
<name>pc_no_threshold</name>
<texture>Runway/pc_no_threshold.png</texture>
<wrapu>false</wrapu>
<wrapv>false</wrapv>
</material>
<material> <material>
<name>pc_stopway</name> <name>pc_stopway</name>
<texture>Runway/pc_stopway.png</texture> <texture>Runway/pc_stopway.png</texture>
@ -639,6 +665,13 @@ Shared parameters for various materials.
<wrapu>false</wrapu> <wrapu>false</wrapu>
</material> </material>
<material>
<name>pc_aim_uk</name>
<name>dirt_rwyaim_uk</name>
<texture>Runway/pc_aim_uk.png</texture>
<wrapu>false</wrapu>
</material>
<material> <material>
<name>pc_tz_two_a</name> <name>pc_tz_two_a</name>
<name>dirt_rwytz_two_a</name> <name>dirt_rwytz_two_a</name>
@ -681,6 +714,12 @@ Shared parameters for various materials.
<wrapu>false</wrapu> <wrapu>false</wrapu>
</material> </material>
<material>
<name>pc_heli</name>
<texture>Runway/pc_helipad.png</texture>
<wrapu>false</wrapu>
</material>
<!-- Default Summer --> <!-- Default Summer -->
<material> <material>