fly/fgdata
1
0
Fork 0
Code Activity

Manual merge of the following commits from data/materials-dds.xml

Browse source 
532c93cfa06c3be2d5b47cbffe33a89c04433b8a
c32204a079ea204ff10c2961e75e5cea9ae98afc
d66d417dea5dc0cf06222627ba3ccf9de6506630
This commit is contained in:
Stuart Buchanan 2012-04-24 22:47:04 +01:00
parent 15dc296a0a
commit fef7170857
2 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Materials/dds/materials.xml
View file

@ -67,7 +67,6 @@
<a>1.0</a> <a>1.0</a>
</specular> </specular>
<texture>Runway/pa_shoulder.dds</texture> <texture>Runway/pa_shoulder.dds</texture>
<ysize>5</ysize>
<wrapu>false</wrapu> <wrapu>false</wrapu>
</material> </material>
@ -86,7 +85,6 @@
<a>1.0</a> <a>1.0</a>
</specular> </specular>
<texture>Runway/pa_shoulder_f.dds</texture> <texture>Runway/pa_shoulder_f.dds</texture>
<ysize>5</ysize>
<wrapu>false</wrapu> <wrapu>false</wrapu>
</material> </material>
@ -361,7 +359,6 @@
<a>1.0</a> <a>1.0</a>
</specular> </specular>
<texture>Runway/pc_shoulder.dds</texture> <texture>Runway/pc_shoulder.dds</texture>
<ysize>5</ysize>
<wrapu>false</wrapu> <wrapu>false</wrapu>
</material> </material>
@ -380,7 +377,6 @@
<a>1.0</a> <a>1.0</a>
</specular> </specular>
<texture>Runway/pc_shoulder_f.dds</texture> <texture>Runway/pc_shoulder_f.dds</texture>
<ysize>5</ysize>
<wrapu>false</wrapu> <wrapu>false</wrapu>
</material> </material>
@ -1722,9 +1718,7 @@
</equals> </equals>
</condition> </condition>
<name>Sand</name> <name>Sand</name>
<texture>Terrain.winter/sand4.png</texture> <texture>Terrain.winter/sand.png</texture>
<texture>Terrain.winter/sand5.png</texture>
<texture>Terrain.winter/sand6.png</texture>
<xsize>2000</xsize> <xsize>2000</xsize>
<ysize>2000</ysize> <ysize>2000</ysize>
<light-coverage>10000000.0</light-coverage> <light-coverage>10000000.0</light-coverage>
@ -1938,9 +1932,7 @@
<name>DryLake</name> <name>DryLake</name>
<name>IntermittentReservoir</name> <name>IntermittentReservoir</name>
<name>IntermittentLake</name> <name>IntermittentLake</name>
<texture>Terrain.winter/sand1.png</texture> <texture>Terrain.winter/sand.png</texture>
<texture>Terrain.winter/sand2.png</texture>
<texture>Terrain.winter/sand3.png</texture>
<xsize>2000</xsize> <xsize>2000</xsize>
<ysize>2000</ysize> <ysize>2000</ysize>
<solid>1</solid> <solid>1</solid>
@ -2300,7 +2292,7 @@
</equals> </equals>
</condition> </condition>
<name>GolfCourse</name> <name>GolfCourse</name>
<texture>Terrain.winter/golfcourse.png</texture> <texture>Terrain.winter/golfcourse1.png</texture>
<object-mask>Terrain/golfcourse1.mask.png</object-mask> <object-mask>Terrain/golfcourse1.mask.png</object-mask>
<xsize>800</xsize> <xsize>800</xsize>
<ysize>800</ysize> <ysize>800</ysize>

2
Materials/default/materials.xml
View file

@ -331,13 +331,11 @@
<material include="Materials/base/runway_effect.xml"> <material include="Materials/base/runway_effect.xml">
<name>pc_shoulder</name> <name>pc_shoulder</name>
<texture>Runway/pc_shoulder.png</texture> <texture>Runway/pc_shoulder.png</texture>
<ysize>5</ysize>
</material> </material>
<material include="Materials/base/runway_effect.xml"> <material include="Materials/base/runway_effect.xml">
<name>pc_shoulder_f</name> <name>pc_shoulder_f</name>
<texture>Runway/pc_shoulder_f.png</texture> <texture>Runway/pc_shoulder_f.png</texture>
<ysize>5</ysize>
</material> </material>
<material include="Materials/base/runway_effect.xml"> <material include="Materials/base/runway_effect.xml">