Merge remote-tracking branch 'origin/developer' into developer

# Conflicts: # worlds/worlds.json
2016-06-22 03:03:20 +02:00
parent e7c7dbaf39 9a31e09bff
commit b6b42b3afc
23 changed files with 2613 additions and 4 deletions
@@ -340,7 +340,7 @@ void World::update(float elapsedTime)
 			player->HpDown(enemy->damage);
 			continue;
 		}
-		enemy->position.y = getHeight(enemy->position.x, enemy->position.z) + 2.0f;
+		enemy->position.y = getHeight(enemy->position.x, enemy->position.z);
 		
 		if(!remove)
 			count++;