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

Conflicts: Escape-the-Dawn/GameWorld.cpp
2014-03-13 01:06:07 +01:00
parent 9dd1733689 21b2e3bdc1
commit 40cab3d448
11 changed files with 142 additions and 30 deletions
@@ -5,11 +5,8 @@ Systems::PlayerSystem::PlayerSystem( World* world ) : System(world)
 {
 }

-
-
 void Systems::PlayerSystem::Update(double dt)
 {
-
 }

 void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID parent)
@@ -100,8 +97,6 @@ void Systems::PlayerSystem::UpdateEntity(double dt, EntityID entity, EntityID pa
 			else if(Euler.z > 0.f)
 				transform->Orientation = transform->Orientation * glm::angleAxis<float>((float)dt,glm::vec3(0,0,-1));
 		}
-
-
 	}
 }