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

Bugfixes

Browse Source
This commit is contained in:
Anuken
2020-07-31 11:34:53 -04:00
parent 2510b09201
commit acfd18ab7b
3 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/core/Renderer.java
View File

@@ -87,6 +87,10 @@ public class Renderer implements ApplicationListener{
} }
} }
public boolean isLanding(){
return landTime > 0;
}
public float weatherAlpha(){ public float weatherAlpha(){
return weatherAlpha; return weatherAlpha;
} }

33
core/src/mindustry/editor/WaveGraph.java
View File

@@ -173,22 +173,25 @@ public class WaveGraph extends Table{
colors.clear(); colors.clear();
colors.left(); colors.left();
for(UnitType type : used){ colors.pane(t -> {
colors.button(b -> { t.left();
Color tcolor = color(type).cpy(); for(UnitType type : used){
b.image().size(32f).update(i -> i.setColor(b.isChecked() ? Tmp.c1.set(tcolor).mul(0.5f) : tcolor)).get().act(1); t.button(b -> {
b.image(type.icon(Cicon.medium)).padRight(20).update(i -> i.setColor(b.isChecked() ? Color.gray : Color.white)).get().act(1); Color tcolor = color(type).cpy();
b.margin(0f); b.image().size(32f).update(i -> i.setColor(b.isChecked() ? Tmp.c1.set(tcolor).mul(0.5f) : tcolor)).get().act(1);
}, Styles.fullTogglet, () -> { b.image(type.icon(Cicon.medium)).padRight(20).update(i -> i.setColor(b.isChecked() ? Color.gray : Color.white)).get().act(1);
if(!hidden.add(type)){ b.margin(0f);
hidden.remove(type); }, Styles.fullTogglet, () -> {
} if(!hidden.add(type)){
hidden.remove(type);
}
used.clear(); used.clear();
used.addAll(usedCopy); used.addAll(usedCopy);
for(UnitType o : hidden) used.remove(o); for(UnitType o : hidden) used.remove(o);
}).update(b -> b.setChecked(hidden.contains(type))); }).update(b -> b.setChecked(hidden.contains(type)));
} }
}).get().setScrollingDisabled(false, true);
for(UnitType type : hidden){ for(UnitType type : hidden){
used.remove(type); used.remove(type);

7
core/src/mindustry/input/MobileInput.java
View File

@@ -422,7 +422,6 @@ public class MobileInput extends InputHandler implements GestureListener{
lastSchematic = schem; lastSchematic = schem;
} }
@Override @Override
public boolean touchDown(int screenX, int screenY, int pointer, KeyCode button){ public boolean touchDown(int screenX, int screenY, int pointer, KeyCode button){
if(state.isMenu()) return false; if(state.isMenu()) return false;
@@ -497,9 +496,7 @@ public class MobileInput extends InputHandler implements GestureListener{
}else{ }else{
Tile tile = tileAt(screenX, screenY); Tile tile = tileAt(screenX, screenY);
if(tile == null || tile.build == null) return false; tryDropItems(tile == null ? null : tile.build, Core.input.mouseWorld(screenX, screenY).x, Core.input.mouseWorld(screenX, screenY).y);
tryDropItems(tile.build, Core.input.mouseWorld(screenX, screenY).x, Core.input.mouseWorld(screenX, screenY).y);
} }
return false; return false;
} }
@@ -755,7 +752,7 @@ public class MobileInput extends InputHandler implements GestureListener{
shiftDeltaX %= tilesize; shiftDeltaX %= tilesize;
shiftDeltaY %= tilesize; shiftDeltaY %= tilesize;
} }
}else{ }else if(!renderer.isLanding()){
//pan player //pan player
Core.camera.position.x -= deltaX; Core.camera.position.x -= deltaX;
Core.camera.position.y -= deltaY; Core.camera.position.y -= deltaY;