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

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

Browse Source 
 Conflicts:
	core/src/mindustry/core/ContentLoader.java
	core/src/mindustry/world/Block.java
This commit is contained in:
Anuken
2022-01-27 14:58:44 -05:00
parent 7cdd9edb5f 0b9483cffc
commit e4595b6831
16 changed files with 152 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ui/fragments/BlockConfigFragment.java
View File

@@ -49,6 +49,7 @@ public class BlockConfigFragment extends Fragment{
}
public void showConfig(Building tile){
if(configTile != null) configTile.onConfigureClosed();
if(tile.configTapped()){
configTile = tile;
@@ -82,6 +83,7 @@ public class BlockConfigFragment extends Fragment{
}
public void hideConfig(){
if(configTile != null) configTile.onConfigureClosed();
configTile = null;
table.actions(Actions.scaleTo(0f, 1f, 0.06f, Interp.pow3Out), Actions.visible(false));
}