Tleety 96bc5db7bb Merge commit '0e8b97dbbade6bb39c6f2b8af6c1cfc43ce67cde' into ScoreBoard ...

# Conflicts:
#	resources/Schema/Entities/Player.xml
#	src/Game/Game.cpp

2016-03-03 13:22:28 +01:00

..

Engine

Merge commit '0e8b97dbbade6bb39c6f2b8af6c1cfc43ce67cde' into ScoreBoard

2016-03-03 13:22:28 +01:00

Game

Merge commit '0e8b97dbbade6bb39c6f2b8af6c1cfc43ce67cde' into ScoreBoard

2016-03-03 13:22:28 +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