Tleety e1ca104fc9 Merge remote-tracking branch 'origin/master' into HUD-Timers ...

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

2016-03-02 22:49:26 +01:00

..

Engine

Now here's the real fix for the lag when loading entity files: CONSOLE SPAM

2016-03-02 20:16:03 +01:00

Game

Merge remote-tracking branch 'origin/master' into HUD-Timers

2016-03-02 22:49:26 +01:00