viktorljung 9a23d8887a Merge remote-tracking branch 'origin/master' into TextRendering ...

# Conflicts:
#	include/Engine/Rendering/RenderSystem.h
#	src/Engine/Rendering/RenderSystem.cpp

2016-01-23 11:48:10 +01:00

..

Events

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

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

Systems

Changed some files so it works with the changes in master. (weaponsystem,capturepoint,some tests)

2016-01-21 17:36:47 +01:00

Game.h

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

2016-01-21 10:19:32 +01:00