Merge branch 'master' of https://github.com/teamfisk/TacticalZ into Importer

# Conflicts: # include/Engine/Collision/Collision.h # src/Engine/Rendering/Model.cpp # src/Engine/Rendering/RawModelAssimp.cpp
2016-01-15 18:00:30 +01:00
parent 8437b9c734 d28583ca9e
commit 16c39df439
109 changed files with 3705 additions and 1382 deletions
@@ -7,10 +7,10 @@

 #include <vector>

-#include "Core/Ray.h"
-#include "Core/AABB.h"
+#include "../Core/Ray.h"
+#include "../Core/AABB.h"
 #include "Engine/Rendering/RawModelAssimp.h"
-#include "Core/Entity.h"
+#include "../Core/Entity.h"

 class World;
 struct ComponentWrapper;