viktorljung 2a93e2ae7f Merge remote-tracking branch 'origin/master' into TextRendering ...

# Conflicts:
#	include/Engine/Rendering/RenderQueue.h
#	include/Engine/Rendering/RenderSystem.h
#	include/Game/Game.h
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Rendering/RenderSystem.cpp

2016-01-18 17:44:26 +01:00

..

Events

Spawner, SpawnPoint and PlayerSpawn components, and base work on their systems

2016-01-15 18:32:47 +01:00

Systems

Removed class PlayerSystem and associated files.

2016-01-18 13:07:04 +01:00

Game.h

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

2016-01-18 17:44:26 +01:00