Merge remote-tracking branch 'origin/master' into water

Conflicts: src/game/Game/LevelSystem.cpp
2015-10-08 21:44:50 +02:00
parent 2545cef90f d5e7481866
commit 96ccef6ed8
23 changed files with 4040 additions and 45 deletions
@@ -16,7 +16,8 @@ enum Type
 	PowerUp = 1 << 4,
 	Other = 1 << 5,
 	Wall = 1 << 6,
-	LifeBuoy = 1 << 7
+	LifeBuoy = 1 << 7,
+	Projectile = 1 << 8
 };
 }