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

Browse Source

Conflicts:
	include/Core/Engine.h
	include/Core/RenderQueue.h
	include/Core/Renderer.h
	src/game/Core/Renderer.cpp

...

This commit is contained in:

sippeangelo

2015-09-25 02:27:00 +02:00

parent c9854d2b83 f79d5ec68b

commit d2bc91be48

24 changed files with 1716 additions and 83 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/Background.png

Executable

BIN

Binary file not shown.

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

assets/Textures/Test/Water.png

Executable

BIN

Binary file not shown.

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

assets/Textures/Test/Water.psd

Executable

BIN

Binary file not shown.