William Moberg beb0967c3b Merge branch 'master' into OrderedSystemPipeline ...

# Conflicts:
#	src/Game/Game.cpp

2016-01-07 16:49:20 +01:00

..

Engine

Merge branch 'master' into OrderedSystemPipeline

2016-01-07 16:49:20 +01:00

Game

HealthSystemTest has been created. This runs a single test simple test with HealthEvents and HealthSystem. Also some minor changes

2016-01-07 14:53:31 +01:00