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

Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl

Browse Source 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/Vars.java
#	core/src/mindustry/entities/traits/SaveTrait.java
#	core/src/mindustry/maps/generators/MapGenerator.java
#	core/src/mindustry/ui/dialogs/DeployDialog.java
#	core/src/mindustry/world/blocks/Floor.java
#	desktop/src/mindustry/desktop/DesktopLauncher.java
#	gradle.properties
This commit is contained in:
Anuken
2020-02-04 12:25:18 -05:00
parent 878f570472 2fe3fea7f4
commit be50997f94
82 changed files with 1708 additions and 502 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/game/MusicControl.java
View File

@@ -48,7 +48,7 @@ public class MusicControl{
public void update(){
if(state.is(State.menu)){
silenced = false;
if(ui.deploy.isShown()){
if(ui.planet.isShown()){
play(Musics.launch);
}else if(ui.editor.isShown()){
play(Musics.editor);