Merge branch 'developer' into feature/loadingscreen

# Conflicts: # worlds/rock.json
2016-06-22 02:17:44 +02:00
parent 9f455be8d6 5ad61e525f
commit 80f0c33b91
62 changed files with 11886 additions and 13221 deletions
@@ -16,7 +16,7 @@ Player::Player()
 	health = maxHp;
 	xp = 0;
 	maxXp = 100;
-	level = 5;
+	level = 1;
 	crystals = 0;

 	loadWeapons();