Merge branch 'deferred_rendering'

Browse Source

...

This commit is contained in:

Tleety

2014-06-05 04:56:41 +02:00

parent d013629690 664f55cd71

commit 1239626cb4

48 changed files with 91 additions and 195 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/ErrorTexture.png

BIN

Binary file not shown.

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

Textures/ErrorTextureBlue.png

BIN

Binary file not shown.

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

Textures/ErrorTextureGreen.png

BIN

Binary file not shown.

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

Textures/ErrorTextureRed.png

BIN

Binary file not shown.

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

Textures/Ground/Rock.png

BIN

Binary file not shown.

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

Textures/Ground/WaterPlain0017_6_S.png

BIN

Binary file not shown.

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

Textures/NeutralNormalMap.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.7 KiB After Width:  |  Height:  |  Size: 2.7 KiB

Textures/Skybox/Sky34/back.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Sky34/bottom.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Sky34/front.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Sky34/left.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Sky34/right.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Sky34/top.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Sky36/back.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Sky36/bottom.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Sky36/front.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Sky36/left.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Sky36/right.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Sky36/top.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Test1/Back.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Test1/Bottom.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Test1/Front.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Test1/Left.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Test1/Right.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Test1/Top.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Test1/back.png

BIN

Binary file not shown.

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

Textures/Skybox/Test1/bottom.png

BIN

Binary file not shown.

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

Textures/Skybox/Test1/front.png

BIN

Binary file not shown.

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

Textures/Skybox/Test1/images/Back.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Test1/images/Back.png

BIN

Binary file not shown.

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

Textures/Skybox/Test1/images/Bottom.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Test1/images/Bottom.png

BIN

Binary file not shown.

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

Textures/Skybox/Test1/images/Front.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Test1/images/Front.png

BIN

Binary file not shown.

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

Textures/Skybox/Test1/images/Left.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Test1/images/Left.png

BIN

Binary file not shown.

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

Textures/Skybox/Test1/images/Right.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Test1/images/Right.png

BIN

Binary file not shown.

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

Textures/Skybox/Test1/images/Top.jpg

BIN

Binary file not shown.

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

Textures/Skybox/Test1/images/Top.png

BIN

Binary file not shown.

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

Textures/Skybox/Test1/left.png

BIN

Binary file not shown.

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

Textures/Skybox/Test1/right.png

BIN

Binary file not shown.

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

Textures/Skybox/Test1/top.png

BIN

Binary file not shown.

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