Merge remote-tracking branch 'origin/master' into deferred_rendering

BTH/fishtanks-assets

Fork 0

Browse Source

This commit is contained in:

Tleety

2014-05-30 19:28:49 +02:00

parent 20edf7934a b6631a391e

commit 5de9bdcff8

184 changed files with 59596 additions and 46988 deletions

Textures/GUI/.mayaSwatches/Logo.png.swatch

BIN

View File

Binary file not shown.

Textures/GUI/Logo.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 122 KiB

Textures/GUI/MainMenu/BackGround.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 7.9 MiB

Textures/GUI/MainMenu/ExitButton.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 86 KiB

Textures/GUI/MainMenu/PlayButton.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 86 KiB

Textures/GUI/MenuBackground.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 7.9 MiB

Textures/GUI/VehicleSelection/0.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 2.5 MiB

Textures/GUI/VehicleSelection/1.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 2.7 MiB

Textures/GUI/VehicleSelection/2.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 2.5 MiB

Textures/GUI/VehicleSelection/3.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 2.6 MiB

Textures/GUI/VehicleSelection/4.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 2.7 MiB

Textures/GUI/crosshair.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 5.4 KiB

Textures/Ground/.mayaSwatches/Cliffs.png.swatch

BIN

View File

Binary file not shown.

Textures/Ground/.mayaSwatches/Cliffs2.png.swatch

BIN

View File

Binary file not shown.

Textures/Ground/.mayaSwatches/Cliffs2NM.png.swatch

BIN

View File

Binary file not shown.

Textures/Ground/.mayaSwatches/Grass0126_2_S.jpg.swatch

BIN

View File

Binary file not shown.

Textures/Ground/.mayaSwatches/Grass0126_2_SNM.png.swatch

BIN

View File

Binary file not shown.

Textures/Ground/.mayaSwatches/RockSharp0007_1_S.jpg.swatch

BIN

View File

Binary file not shown.

Textures/Ground/.mayaSwatches/RockSmoothErosion0027_1_S.jpg.swatch

BIN

View File

Binary file not shown.

Textures/Ground/.mayaSwatches/SoilBeach0087_11_S.jpg.swatch

BIN

View File

Binary file not shown.

Textures/Ground/.mayaSwatches/SoilBeach0087_11_SNM.png.swatch

BIN

View File

Binary file not shown.

Textures/Ground/Cliffs.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 944 KiB

Textures/Ground/Cliffs2.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 740 KiB

Textures/Ground/Cliffs2NM.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.4 MiB

Textures/Ground/Grass0126_2_S.jpg

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 509 KiB

Textures/Ground/Grass0126_2_SNM.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.4 MiB

Textures/Ground/RockSharp0007_1_S.jpg

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 112 KiB

Textures/Ground/RockSmoothErosion0027_1_S.jpg

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 368 KiB

Textures/Ground/SoilBeach0087_11_S.jpg

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 214 KiB

Textures/Ground/SoilBeach0087_11_SNM.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 1.4 MiB

Textures/Sprites/.mayaSwatches/Grass.png.swatch

BIN

View File

Binary file not shown.

Textures/Sprites/BlackSmoke.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 27 KiB

Textures/Sprites/Fire.png

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 43 KiB

Textures/Sprites/GraySmoke.jpg

BIN

View File

Binary file not shown.

After

Width: | Height: | Size: 16 KiB