Jocke da81f21799 Merge remote-tracking branch 'origin/master' into SniperSprintBranch ...

# Conflicts:
#	include/Engine/Input/FirstPersonInputController.h

2016-03-03 12:16:09 +01:00

..

Engine

Updated all uses of EntityXMLFile to use the new EntityFile to load entities into a world.

2016-03-02 20:12:59 +01:00

Game

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

2016-03-03 12:16:09 +01:00

Tests

Renamed EntityFile to EntityXMLFile to be able to separate file parsing from entity creation

2016-03-02 18:53:40 +01:00