Merge branch 'master' into directx

Conflicts: include/Core/Engine.h
2015-10-20 15:13:20 +02:00
parent a4b9521c34 b4f098c80d
commit d197ec07ad
68 changed files with 3619 additions and 509 deletions
@@ -29,6 +29,8 @@
 #include "Core/CTemplate.h"
 #include "Core/EventBroker.h"
 #include "Core/World.h"
+#include "Core/ResourceManager.h"
+#include "Core/ConfigFile.h"
 #include "Game/EScreenShake.h"
 #include "Rendering/Model.h"
 #include "Rendering/Texture.h"