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

Browse Source

...

This commit is contained in:

Tleety

2014-06-02 20:18:44 +02:00

parent 50ee6f805f c5043a9c36

commit 664f55cd71

111 changed files with 60916 additions and 24631 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/GUI/GloriousVictory.png

BIN

Binary file not shown.

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

Textures/GUI/ShamefulDefeat.png

BIN

Binary file not shown.

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

Textures/Sprites/BlackSmoke.png

BIN

Binary file not shown.

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

Textures/Sprites/Blast1.png

BIN

Binary file not shown.

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

Textures/Sprites/Dirt.png

BIN

Binary file not shown.

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

Textures/Sprites/Dust.png

BIN

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 163 B After Width:  |  Height:  |  Size: 101 KiB

Textures/Sprites/Geese.png

BIN

Binary file not shown.

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

Textures/Sprites/GraySmoke.jpg

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 16 KiB

Textures/Sprites/NewtonTreeDeleteASAPPlease.bmp

BIN

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 1.9 MiB

Textures/Sprites/Smoke1.png

BIN

Binary file not shown.

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

Textures/Sprites/Smoke2.png

BIN

Binary file not shown.

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