Merge into master

Browse Source

...

This commit is contained in:

tleety

2015-09-11 15:17:49 +02:00

parent bda864ac11 748f61883b

commit 7b984c7cc3

31 changed files with 522 additions and 28 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

assets/Textures/Test/Brick_Diffuse.png

Executable

BIN

Binary file not shown.

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

assets/Textures/Test/Brick_Normal.png

Executable

BIN

Binary file not shown.

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

assets/Textures/Test/Brick_Specular.png

Executable

BIN

Binary file not shown.

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

assets/Textures/Test/Single_Brick_Diffuse.png

Executable

BIN

Binary file not shown.

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

assets/Textures/Test/Single_Brick_Diffuse2.png

Executable

BIN

Binary file not shown.

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

assets/Textures/Test/Single_Brick_Diffuse3.png

Executable

BIN

Binary file not shown.

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

assets/Textures/Test/Single_Brick_Diffuse4.png

Executable

BIN

Binary file not shown.

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

assets/Textures/Test/Single_Brick_Normal.png

Executable

BIN

Binary file not shown.

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

assets/Textures/Test/Single_Brick_Normal2.png

Executable

BIN

Binary file not shown.

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

assets/Textures/Test/Single_Brick_Normal3.png

Executable

BIN

Binary file not shown.

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

assets/Textures/Test/Single_Brick_Normal4.png

Executable

BIN

Binary file not shown.

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

assets/Textures/Test/Single_Brick_Specular.png

Executable

BIN

Binary file not shown.

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

assets/Textures/Test/Single_Brick_Specular2.png

Executable

BIN

Binary file not shown.

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

assets/Textures/Test/Single_Brick_Specular3.png

Executable

BIN

Binary file not shown.

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

assets/Textures/Test/Single_Brick_Specular4.png

Executable

BIN

Binary file not shown.

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

assets/Textures/Test/TestBrick.psd

Executable

BIN

Binary file not shown.

assets/Textures/Test/TestBrick_Diffuse.png

Executable

BIN

Binary file not shown.

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

assets/Textures/Test/TestBrick_Diffuse_Simple.png

Executable

BIN

Binary file not shown.

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

assets/Textures/Test/TestBrick_Normal.png

Executable

BIN

Binary file not shown.

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

assets/Textures/Test/TestBrick_Specular.png

Executable

BIN

Binary file not shown.

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