Merge branch 'develop' into 1273_Skybox

This commit is contained in:
Michael Rausch
2017-09-27 15:32:54 +13:00
9 changed files with 429 additions and 277 deletions
@@ -101,6 +101,10 @@ public class Sounds {
musicPlayer.setCycleCount(MediaPlayer.INDEFINITE);
musicPlayer.setVolume(0.3);
musicPlayer.play();
musicPlayer.setMute(musicMuted);
if (soundEffect != null) {
soundEffect.stop();
}
}