mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-25 05:51:47 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Anuken 2020-06-01 11:12:17 -04:00
commit e2d016f318
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/src/mindustry/input/MobileInput.java
View file

@ -241,7 +241,8 @@ public class MobileInput extends InputHandler implements GestureListener{
Boolp schem = () -> lastSchematic != null && !selectRequests.isEmpty();
group.fill(t -> {
t.bottom().left().visible(() -> (player.builder().isBuilding() || block != null || mode == breaking || !selectRequests.isEmpty()) && !schem.get());
t.visible(() -> (player.builder().isBuilding() || block != null || mode == breaking || !selectRequests.isEmpty()) && !schem.get());
t.bottom().left();
t.button("$cancel", Icon.cancel, () -> {
player.builder().clearBuilding();
selectRequests.clear();
@ -332,13 +333,11 @@ public class MobileInput extends InputHandler implements GestureListener{
if(mode == placing && block != null){
//draw placing
for(int i = 0; i < lineRequests.size; i++){
BuildRequest req = lineRequests.get(i);
if(i == lineRequests.size - 1 && req.block.rotate){
drawArrow(block, req.x, req.y, req.rotation);
}
BuildRequest request = lineRequests.get(i);
request.block.drawRequest(request, allRequests(), validPlace(request.x, request.y, request.block, request.rotation) && getRequest(req.x, request.y, request.block.size, null) == null);
if(i == lineRequests.size - 1 && request.block.rotate){
drawArrow(block, request.x, request.y, request.rotation);
}
request.block.drawRequest(request, allRequests(), validPlace(request.x, request.y, request.block, request.rotation) && getRequest(request.x, request.y, request.block.size, null) == null);
drawSelected(request.x, request.y, request.block, Pal.accent);
}
}else if(mode == breaking){

2
core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
View file

@ -103,7 +103,7 @@ public class SettingsMenuDialog extends SettingsDialog{
t.row();
t.button("$data.export", Icon.download, style, () -> {
t.button("$data.export", Icon.upload, style, () -> {
if(ios){
Fi file = Core.files.local("mindustry-data-export.zip");
try{