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

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

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

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

BIN

Binary file not shown.

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

BIN

Binary file not shown.

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

BIN

Binary file not shown.

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

BIN

Binary file not shown.

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

BIN

Binary file not shown.

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

BIN

Binary file not shown.

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

BIN

Binary file not shown.

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

BIN

Binary file not shown.

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

BIN

Binary file not shown.

Textures/Ground/Cliffs.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 944 KiB

Textures/Ground/Cliffs2.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 740 KiB

Textures/Ground/Cliffs2NM.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 MiB

Textures/Ground/Grass0126_2_S.jpg

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 509 KiB

Textures/Ground/Grass0126_2_SNM.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 MiB

Textures/Ground/RockSharp0007_1_S.jpg

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 112 KiB

Textures/Ground/RockSmoothErosion0027_1_S.jpg

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 368 KiB

Textures/Ground/SoilBeach0087_11_S.jpg

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 214 KiB

Textures/Ground/SoilBeach0087_11_SNM.png

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 MiB