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

Fixed #2416 / Fixed #2417

Browse Source
This commit is contained in:
Anuken
2020-08-25 09:24:49 -04:00
parent 174e4b8632
commit 7b2b9b3988
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/mindustry/content/TechTree.java
View File

@@ -38,7 +38,6 @@ public class TechTree implements ContentList{
node(distributor); node(distributor);
node(sorter, () -> { node(sorter, () -> {
node(invertedSorter); node(invertedSorter);
node(message);
node(overflowGate, () -> { node(overflowGate, () -> {
node(underflowGate); node(underflowGate);
}); });
@@ -206,13 +205,8 @@ public class TechTree implements ContentList{
}); });
node(microProcessor, () -> { node(microProcessor, () -> {
node(logicProcessor, () -> {
node(hyperProcessor, () -> {
});
});
node(switchBlock, () -> { node(switchBlock, () -> {
node(message, () -> {
node(logicDisplay, () -> { node(logicDisplay, () -> {
}); });
@@ -221,6 +215,13 @@ public class TechTree implements ContentList{
}); });
}); });
node(logicProcessor, () -> {
node(hyperProcessor, () -> {
});
});
});
}); });
}); });
}); });

2
core/src/mindustry/input/DesktopInput.java
View File

@@ -188,7 +188,7 @@ public class DesktopInput extends InputHandler{
panning = true; panning = true;
} }
if((Math.abs(Core.input.axis(Binding.move_x)) > 0 || Math.abs(Core.input.axis(Binding.move_y)) > 0) && (!scene.hasField())){ if((Math.abs(Core.input.axis(Binding.move_x)) > 0 || Math.abs(Core.input.axis(Binding.move_y)) > 0 || input.keyDown(Binding.mouse_move)) && (!scene.hasField())){
panning = false; panning = false;
} }