Ayumiwii 37aa1eaa18 Merge remote-tracking branch 'origin/master' into CoolDeathAnimation ...

# Conflicts:
#	include/Engine/Rendering/DrawScenePass.h
#	include/Engine/Rendering/RenderQueue.h
#	include/Engine/Rendering/RenderQueueFactory.h
#	include/Engine/Rendering/Renderer.h
#	include/Game/Game.h
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Test.xml
#	resources/Schema/Types/Entity.xsd
#	src/Engine/Rendering/DrawScenePass.cpp
#	src/Engine/Rendering/RenderQueueFactory.cpp
#	src/Engine/Rendering/Renderer.cpp
#	src/Game/Game.cpp

2016-01-18 16:02:43 +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

ExplosionEffectSystem.h

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

2016-01-18 16:02:43 +01:00

Game.h

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

2016-01-18 16:02:43 +01:00