Merge branch 'master' into gui

Browse Source

Conflicts:
	include/Game/GUI/HUD.h
	src/game/Core/Renderer.cpp

...

This commit is contained in:

sippeangelo

2015-10-08 23:47:25 +02:00

parent 7ee0bbc32b 848efa19ac

commit 7f344263da

73 changed files with 22402 additions and 302 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/GUI/HUD/GameOverScreen.png

BIN

Binary file not shown.

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

assets/Textures/GUI/HUD/WinScreen.png

BIN

Binary file not shown.

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

assets/Textures/Particles/Cloud_Particle.png

BIN

Binary file not shown.

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

assets/Textures/Particles/FadeBall.png

BIN

Binary file not shown.

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

assets/Textures/Particles/Ice_Particle.png

BIN

Binary file not shown.

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

assets/Textures/Particles/Normal_Dust_Particle.png

BIN

Binary file not shown.

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