Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Conflicts:
	Escape-the-Dawn/GameWorld.cpp
	Escape-the-Dawn/plane.obj
This commit is contained in:
ViktorLjung
2014-03-13 02:02:41 +01:00
17 changed files with 314 additions and 64 deletions
+1
View File
@@ -9,6 +9,7 @@
#include "Components/Model.h"
#include "Components/Transform.h"
#include "Components/Camera.h"
#include "Components/Bounds.h"
#include "Renderer.h"
namespace Systems