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
@@ -95,7 +95,6 @@ void Systems::LevelGenerationSystem::SpawnObstacle()

 void Systems::LevelGenerationSystem::Update( double dt )
 {
-	
 	elapsedtime += dt;
 	spawnFrequency = 10/velocity;

@@ -103,9 +102,6 @@ void Systems::LevelGenerationSystem::Update( double dt )
 		SpawnObstacle();
 		elapsedtime = 0;
 	}
-
-
-	
 }

 void Systems::LevelGenerationSystem::UpdateEntity( double dt, EntityID entity, EntityID parent )