diff --git a/core/assets-raw/sprites/blocks/liquid/liquid-tank-liquid.png b/core/assets-raw/sprites/blocks/liquid/liquid-tank-liquid.png index e5f2a7e855..3e7b0e032e 100644 Binary files a/core/assets-raw/sprites/blocks/liquid/liquid-tank-liquid.png and b/core/assets-raw/sprites/blocks/liquid/liquid-tank-liquid.png differ diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 3519e45d47..3f42a52387 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index 934a2a5abd..8dba94e9ea 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java @@ -335,7 +335,12 @@ public class MapEditorDialog extends Dialog implements Disposable{ @Override public Dialog show(){ - return super.show(Core.scene, Actions.sequence()); + return super.show(Core.scene, Actions.sequence(Actions.alpha(1f))); + } + + @Override + public void hide(){ + super.hide(Actions.sequence(Actions.alpha(0f))); } @Override diff --git a/core/src/io/anuke/mindustry/editor/MapView.java b/core/src/io/anuke/mindustry/editor/MapView.java index 59958e548e..98eed1bb57 100644 --- a/core/src/io/anuke/mindustry/editor/MapView.java +++ b/core/src/io/anuke/mindustry/editor/MapView.java @@ -240,10 +240,6 @@ public class MapView extends Element implements GestureListener{ editor.renderer().draw(centerx - sclwidth / 2, centery - sclheight / 2, sclwidth, sclheight); Draw.reset(); - if(!ScissorStack.pushScissors(rect.set(x, y, width, height))){ - return; - } - if(grid){ Draw.color(Color.GRAY); image.setBounds(centerx - sclwidth / 2, centery - sclheight / 2, sclwidth, sclheight); @@ -303,7 +299,6 @@ public class MapView extends Element implements GestureListener{ Draw.reset(); ScissorStack.popScissors(); - ScissorStack.popScissors(); } private boolean active(){ diff --git a/core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java b/core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java index c994102e68..4fc4d67064 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java @@ -1,6 +1,7 @@ package io.anuke.mindustry.ui.fragments; import io.anuke.arc.scene.Group; +import io.anuke.arc.scene.actions.*; import io.anuke.arc.scene.event.Touchable; import io.anuke.arc.scene.ui.Label; import io.anuke.arc.scene.ui.TextButton; @@ -44,11 +45,12 @@ public class LoadingFragment extends Fragment{ public void show(String text){ table.