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

Conflicts: Escape-the-Dawn/GameWorld.cpp
2014-03-12 21:47:26 +01:00
parent 77aff3c078 3bcdb3c067
commit c4e7a2aade
7 changed files with 36388 additions and 289 deletions
@@ -95,8 +95,6 @@ void GameWorld::Initialize()
 	transform->Position = glm::vec3(10.f, 0.f, 0.f);
 	model = AddComponent<Components::Model>(ent, "Model");
 	model->ModelFile = "ship.obj";
-
-	// Camera
 }

 void GameWorld::Update(double dt)