Merge branch 'master' of git://gitorious.org/fg/fgdata
This commit is contained in:
commit
1523f86578
2 changed files with 4 additions and 0 deletions
|
@ -884,6 +884,7 @@ Shared parameters for various materials.
|
|||
<name>ShrubCover</name>
|
||||
<name>ShrubGrassCover</name>
|
||||
<name>ScrubCover</name>
|
||||
<name>Scrub</name>
|
||||
<name>Sclerophyllous</name>
|
||||
<name>Heath</name>
|
||||
<texture>Terrain/shrub.dds</texture>
|
||||
|
@ -2157,6 +2158,7 @@ Shared parameters for various materials.
|
|||
<name>ShrubCover</name>
|
||||
<name>ShrubGrassCover</name>
|
||||
<name>ScrubCover</name>
|
||||
<name>Scrub</name>
|
||||
<name>Sclerophyllous</name>
|
||||
<name>Heath</name>
|
||||
<texture>Terrain.winter/shrub.png</texture>
|
||||
|
|
|
@ -1065,6 +1065,7 @@ Shared parameters for various materials.
|
|||
<name>ShrubCover</name>
|
||||
<name>ShrubGrassCover</name>
|
||||
<name>ScrubCover</name>
|
||||
<name>Scrub</name>
|
||||
<name>Sclerophyllous</name>
|
||||
<texture>Terrain/shrub1.png</texture>
|
||||
<!--
|
||||
|
@ -1986,6 +1987,7 @@ Shared parameters for various materials.
|
|||
<name>ShrubCover</name>
|
||||
<name>ShrubGrassCover</name>
|
||||
<name>ScrubCover</name>
|
||||
<name>Scrub</name>
|
||||
<name>Sclerophyllous</name>
|
||||
<texture>Terrain.winter/shrub.png</texture>
|
||||
<texture>Terrain.winter/shrub2.png</texture>
|
||||
|
|
Loading…
Add table
Reference in a new issue