Tim Herbst 3f56b033ba Merge branch 'development' into '44-settings-einfuegen' ... # Conflicts: # GoldWars/GoldWars/Scenes/MenuScene.swift		2020-05-10 18:11:14 +00:00
..
GoldWars	Merge branch 'development' into '44-settings-einfuegen'	2020-05-10 18:11:14 +00:00
GoldWars.xcodeproj	add SettingsScene with background and music also boolean query for multiple audioplayer start	2020-05-10 18:10:36 +02:00
GoldWarsTests	Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'"	2020-05-10 16:48:04 +00:00