Jace d2bc91be48 Merge remote-tracking branch 'origin/master' into gui ...

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

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

..

Models

Merge and some small fixes

2015-09-25 01:49:08 +02:00

Sounds

Stop sound event up and running.

2015-09-23 14:14:11 +02:00

Textures

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

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