mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-25 14:01:03 -08:00
Code Issues 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

19
core/src/mindustry/content/TechTree.java
View file

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

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

@ -188,7 +188,7 @@ public class DesktopInput extends InputHandler{
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;
}