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

Fixed #5734 / New derelict icon

Browse Source
This commit is contained in:
Anuken
2021-08-10 19:56:31 -04:00
parent a97690d219
commit 14dc293a09
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites/teams/team-derelict.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 608 B

After

Width:  |  Height:  |  Size: 490 B

2
core/src/mindustry/editor/MapEditorDialog.java
View File

@@ -42,7 +42,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
private BaseDialog menu; private BaseDialog menu;
private Table blockSelection; private Table blockSelection;
private Rules lastSavedRules; private Rules lastSavedRules;
private boolean saved = false; private boolean saved = false; //currently never read
private boolean shownWithMap = false; private boolean shownWithMap = false;
private Seq<Block> blocksOut = new Seq<>(); private Seq<Block> blocksOut = new Seq<>();

2
core/src/mindustry/editor/MapView.java
View File

@@ -196,7 +196,7 @@ public class MapView extends Element implements GestureListener{
if(Core.scene.getScrollFocus() != this) return; if(Core.scene.getScrollFocus() != this) return;
zoom += Core.input.axis(KeyCode.scroll) / 10f * zoom; zoom += Core.input.axis(Binding.zoom) / 10f * zoom;
clampZoom(); clampZoom();
} }

4
core/src/mindustry/input/InputHandler.java
View File

@@ -454,6 +454,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
public void update(){ public void update(){
player.typing = ui.chatfrag.shown(); player.typing = ui.chatfrag.shown();
if(player.dead()){
droppingItem = false;
}
if(player.isBuilder()){ if(player.isBuilder()){
player.unit().updateBuilding(isBuilding); player.unit().updateBuilding(isBuilding);
} }