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

Conflicts: Escape-the-Dawn/Systems/PlayerSystem.cpp
2015-06-02 00:08:35 +02:00
parent 074b2d6348 66303dfd6a
commit f2de6025eb
8 changed files with 23 additions and 16 deletions
@@ -32,7 +32,6 @@ namespace Systems
 	private:
 		float m_PlayerSpeed;
 		glm::vec3 m_PlayerOriginalBounds;
-
 		glm::vec3 m_CameraOffset;
 		glm::quat m_CameraOrientation;