Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sound re-organized

Browse Source
This commit is contained in:
Anuken
2019-08-05 20:39:16 -04:00
parent b02053a70c
commit e8bbc2bf4c
10 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets/music/editor.mp3
View File

Binary file not shown.

BIN
core/assets/music/game1.mp3 Normal file
View File

Binary file not shown.

BIN
core/assets/music/game2.mp3 Normal file
View File

Binary file not shown.

BIN
core/assets/music/game3.mp3 Normal file
View File

Binary file not shown.

BIN
core/assets/music/menu.mp3
View File

Binary file not shown.

BIN
core/assets/sounds/back.ogg
View File

Binary file not shown.

BIN
core/assets/sounds/place.mp3
View File

Binary file not shown.

BIN
core/assets/sounds/place.ogg Normal file
View File

Binary file not shown.

BIN
core/assets/sounds/press.ogg
View File

Binary file not shown.

2
core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -13,6 +13,7 @@ import io.anuke.arc.scene.ui.layout.*;
import io.anuke.arc.util.*; import io.anuke.arc.util.*;
import io.anuke.mindustry.core.GameState.*; import io.anuke.mindustry.core.GameState.*;
import io.anuke.mindustry.core.*; import io.anuke.mindustry.core.*;
import io.anuke.mindustry.gen.*;
import io.anuke.mindustry.graphics.*; import io.anuke.mindustry.graphics.*;
import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net;
@@ -32,6 +33,7 @@ public class SettingsMenuDialog extends SettingsDialog{
setStyle(Core.scene.skin.get("dialog", WindowStyle.class)); setStyle(Core.scene.skin.get("dialog", WindowStyle.class));
hidden(() -> { hidden(() -> {
Sounds.back.play();
if(!state.is(State.menu)){ if(!state.is(State.menu)){
if(!wasPaused || Net.active()) if(!wasPaused || Net.active())
state.set(State.playing); state.set(State.playing);