antc13 aa20b48188 Merge remote-tracking branch 'origin/master' into Importer ...

# Conflicts:
#	resources/Schema/Entities/MovementTest.xml
#	resources/Schema/Entities/Player.xml

2016-01-24 16:22:22 +01:00

..

Engine

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

2016-01-24 16:22:22 +01:00

Game

Source-like movement

2016-01-23 19:45:23 +01:00