1
0
Fork 0

Merge Textures.high into Textures

This commit is contained in:
Clément de l'Hamaide 2014-08-27 19:37:48 +02:00
parent a8be29dc58
commit 1fa06dc92f
408 changed files with 58 additions and 23 deletions

View file

@ -48,7 +48,7 @@
<internal-format>normalized</internal-format>
</texture>
<texture n="13">
<image>Textures.high/Terrain/rock_alt.png</image>
<image>Textures/Terrain/rock_alt.png</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>
@ -56,7 +56,7 @@
<internal-format>normalized</internal-format>
</texture>
<texture n="14">
<image>Textures.high/Terrain/grain_texture.png</image>
<image>Textures/Terrain/grain_texture.png</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>

View file

@ -4,7 +4,7 @@
<inherits-from>Effects/terrain-default</inherits-from>
<parameters>
<texture n="13">
<image>Textures.high/Terrain/airport_grass2.png</image>
<image>Textures/Terrain/airport_grass2.png</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>

View file

@ -4,7 +4,7 @@
<inherits-from>Effects/runway</inherits-from>
<parameters>
<texture n="16">
<image>Textures.high/Terrain/sand_hires_ochre.png</image>
<image>Textures/Terrain/sand_hires_ochre.png</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>
@ -12,7 +12,7 @@
<internal-format>normalized</internal-format>
</texture>
<texture n="17">
<image>Textures.high/Terrain/airport_grass2.png</image>
<image>Textures/Terrain/airport_grass2.png</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>

View file

@ -27,7 +27,7 @@
<type>2d</type>
</texture>
<texture n="5">
<image>Textures.high/Terrain/forest-relief.png</image>
<image>Textures/Terrain/forest-relief.png</image>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>
<wrap-t>repeat</wrap-t>

View file

@ -27,7 +27,7 @@
<internal-format>normalized</internal-format>
</texture>
<texture n="5">
<image>Textures.high/Terrain/forest-relief.png</image>
<image>Textures/Terrain/forest-relief.png</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>

View file

@ -27,7 +27,7 @@
<internal-format>normalized</internal-format>
</texture>
<texture n="5">
<image>Textures.high/Terrain/forest-relief.png</image>
<image>Textures/Terrain/forest-relief.png</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>

View file

@ -4,7 +4,7 @@
<inherits-from>Effects/landmass</inherits-from>
<parameters>
<texture n="2">
<image>Textures.high/Terrain/shrubcover-relief.png</image>
<image>Textures/Terrain/shrubcover-relief.png</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>

View file

@ -4,7 +4,7 @@
<inherits-from>Effects/terrain-default</inherits-from>
<parameters>
<texture n="2">
<image>Textures.high/Terrain/forest-relief.png</image>
<image>Textures/Terrain/forest-relief.png</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>

View file

@ -32,7 +32,7 @@
<internal-format>normalized</internal-format>
</texture>
<texture n="10">
<image>Textures.high/Terrain/snow3.png</image>
<image>Textures/Terrain/snow3.png</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>
@ -56,7 +56,7 @@
<internal-format>normalized</internal-format>
</texture>
<texture n="13">
<image>Textures.high/Terrain/rock_alt.png</image>
<image>Textures/Terrain/rock_alt.png</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>
@ -64,7 +64,7 @@
<internal-format>normalized</internal-format>
</texture>
<texture n="14">
<image>Textures.high/Terrain/grain_texture.png</image>
<image>Textures/Terrain/grain_texture.png</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>

View file

@ -4,7 +4,7 @@
<inherits-from>Effects/transition</inherits-from>
<parameters>
<texture n="3">
<image>Textures.high/Terrain/dirt3.dds</image>
<image>Textures/Terrain/dirt3.dds</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>

View file

@ -4,7 +4,7 @@
<inherits-from>Effects/transition</inherits-from>
<parameters>
<texture n="3">
<image>Textures.high/Terrain/herbtundra.dds</image>
<image>Textures/Terrain/herbtundra.dds</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>

View file

@ -4,7 +4,7 @@
<inherits-from>Effects/transition</inherits-from>
<parameters>
<texture n="2">
<image>Textures.high/Terrain/grass10c.dds</image>
<image>Textures/Terrain/grass10c.dds</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>
@ -12,7 +12,7 @@
<internal-format>normalized</internal-format>
</texture>
<texture n="3">
<image>Textures.high/Terrain/rock7.dds</image>
<image>Textures/Terrain/rock7.dds</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>
@ -20,7 +20,7 @@
<internal-format>normalized</internal-format>
</texture>
<texture n="4">
<image>Textures.high/Terrain.winter/mixedforest1c.dds</image>
<image>Textures/Terrain.winter/mixedforest1c.dds</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>

View file

@ -4,7 +4,7 @@
<inherits-from>Effects/transition</inherits-from>
<parameters>
<texture n="3">
<image>Textures.high/Terrain/rock7.dds</image>
<image>Textures/Terrain/rock7.dds</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>

View file

@ -16,7 +16,7 @@ parameters :
<inherits-from>Effects/terrain-default</inherits-from>
<parameters>
<texture n="2">
<image>Textures.high/Terrain/transition1.dds</image>
<image>Textures/Terrain/transition1.dds</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>
@ -24,7 +24,7 @@ parameters :
<internal-format>normalized</internal-format>
</texture>
<texture n="3">
<image>Textures.high/Terrain/transition2.dds</image>
<image>Textures/Terrain/transition2.dds</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>
@ -32,7 +32,7 @@ parameters :
<internal-format>normalized</internal-format>
</texture>
<texture n="4">
<image>Textures.high/Terrain/snow3.dds</image>
<image>Textures/Terrain/snow3.dds</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>

View file

@ -60,7 +60,7 @@
<internal-format>normalized</internal-format>
</texture>
<texture n="10">
<image>Textures.high/Terrain/packice-overlay.png</image>
<image>Textures/Terrain/packice-overlay.png</image>
<type>2d</type>
<filter>linear-mipmap-linear</filter>
<wrap-s>repeat</wrap-s>

Binary file not shown.

BIN
Textures/Runway/pa_0l.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_0l.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

BIN
Textures/Runway/pa_0r.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_0r.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

BIN
Textures/Runway/pa_11.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_11.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

BIN
Textures/Runway/pa_1c.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_1c.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

BIN
Textures/Runway/pa_1l.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_1l.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

BIN
Textures/Runway/pa_1r.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_1r.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

BIN
Textures/Runway/pa_2c.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_2c.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 64 KiB

BIN
Textures/Runway/pa_2l.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_2l.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

BIN
Textures/Runway/pa_2r.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_2r.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

BIN
Textures/Runway/pa_3c.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_3c.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

BIN
Textures/Runway/pa_3l.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_3l.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

BIN
Textures/Runway/pa_3r.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_3r.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

BIN
Textures/Runway/pa_4c.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_4c.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

BIN
Textures/Runway/pa_4r.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_4r.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

BIN
Textures/Runway/pa_5c.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_5c.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

BIN
Textures/Runway/pa_5r.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_5r.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

BIN
Textures/Runway/pa_6c.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_6c.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

BIN
Textures/Runway/pa_6r.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_6r.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

BIN
Textures/Runway/pa_7c.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_7c.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

BIN
Textures/Runway/pa_7r.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_7r.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

BIN
Textures/Runway/pa_8c.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_8c.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

BIN
Textures/Runway/pa_8r.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_8r.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

BIN
Textures/Runway/pa_9c.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_9c.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

BIN
Textures/Runway/pa_9r.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_9r.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

BIN
Textures/Runway/pa_C.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_C.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

BIN
Textures/Runway/pa_L.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_L.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

BIN
Textures/Runway/pa_R.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_R.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 63 KiB

BIN
Textures/Runway/pa_aim.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_aim.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 247 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 262 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 123 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 123 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 240 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 512 KiB

BIN
Textures/Runway/pa_rest.dds Normal file

Binary file not shown.

BIN
Textures/Runway/pa_rest.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 123 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 218 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 105 KiB

After

Width:  |  Height:  |  Size: 379 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 122 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 420 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 123 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 217 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 KiB

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show more