Merge branch 'developer' into revertLoadingscreenShit

# Conflicts: # Weapon.cpp # World.cpp
2016-06-22 03:22:38 +02:00
parent 83240e2c57 b6b42b3afc
commit 3b131e949d
3 changed files with 3 additions and 20 deletions
@@ -248,7 +248,6 @@ float World::getHeight(float x, float y)

 void World::draw()
 {
-
 	player->setCamera();

 	float lightPosition[4] = { 0, 2, 1, 0 };