Merge branch 'developer' into feature/weaponCollision

2016-06-22 03:30:47 +02:00
parent 2230682a85 c06298f78f
commit a1a0028f5a
120 changed files with 84830 additions and 13194 deletions
@@ -16,7 +16,7 @@ Player::Player()
 	health = maxHp;
 	xp = 0;
 	maxXp = 100;
-	level = 5;
+	level = 1;
 	crystals = 0;
    hit = false;