Tleety 2cb4a307eb Merge branch 'master' into HUD-Timers ...

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

2016-03-02 22:42:12 +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 branch 'master' into HUD-Timers

2016-03-02 22:42:12 +01:00