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

# Conflicts:
#	src/Game/Game.cpp

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

..

CMakeLists.txt

HotFix: Updated the CMakeList.txt in src/Game so it has the HealthSystem.cpp. This is needed otherwise the solution cant find that file

2016-01-07 16:36:18 +01:00

Game.cpp

Merge branch 'master' into OrderedSystemPipeline

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

HealthSystem.cpp

Now using the easier/cleaner way of getting/setting the HealthProperties

2016-01-07 15:27:39 +01:00

main.cpp

Engine puzzle completed

2015-11-30 17:02:24 +01:00

PlayerSystem.cpp

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

2015-12-18 14:18:53 +01:00