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

Fixed some android memory errors and weapon factory bugs

Browse Source
This commit is contained in:
Anuken
2018-01-09 20:11:56 -05:00
parent e4c755621c
commit 09333b60d4
15 changed files with 48 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/io/anuke/mindustry/ui/dialogs/HostDialog.java
View File

@@ -4,18 +4,19 @@ import io.anuke.mindustry.Vars;
import io.anuke.mindustry.net.Net;
import io.anuke.ucore.core.Settings;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.scene.ui.Dialog;
import io.anuke.ucore.util.Bundles;
import io.anuke.ucore.util.Strings;
import java.io.IOException;
//TODO add port specification
public class HostDialog extends Dialog{
public class HostDialog extends FloatingDialog{
float w = 300;
public HostDialog(){
super("$text.hostserver", "dialog");
super("$text.hostserver");
addCloseButton();
content().table(t -> {
t.add("$text.name").padRight(10);

2
core/src/io/anuke/mindustry/ui/fragments/BlocksFragment.java
View File

@@ -44,7 +44,7 @@ public class BlocksFragment implements Fragment{
blocks = new table(){{
itemtable = new Table("button");
itemtable.setVisible(() -> input.recipe == null);
itemtable.setVisible(() -> input.recipe == null && !Vars.control.getMode().infiniteResources);
desctable = new Table("button");
desctable.setVisible(() -> input.recipe != null);

3
core/src/io/anuke/mindustry/ui/fragments/ChatFragment.java
View File

@@ -79,8 +79,9 @@ public class ChatFragment extends Table implements Fragment{
bottom().left().marginBottom(offsety).marginLeft(offsetx*2).add(fieldlabel).padBottom(4f);
add(chatfield).padBottom(offsety).padLeft(offsetx).growX().padRight(offsetx).height(28);
if(Vars.android) {
addImageButton("icon-chat", 14 * 2, this::toggle).size(30f).visible(() -> chatOpen);
addImageButton("icon-arrow-right", 14 * 2, this::toggle).size(50f, 55f).visible(() -> chatOpen);
}
}

13
core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
View File

@@ -22,7 +22,7 @@ import io.anuke.ucore.util.Bundles;
import static io.anuke.mindustry.Vars.*;
public class HudFragment implements Fragment{
private ImageButton menu, flip, pause;
private ImageButton menu, flip;
private Table respawntable;
private Table wavetable;
private boolean shown = true;
@@ -43,7 +43,7 @@ public class HudFragment implements Fragment{
menu = new imagebutton("icon-menu", isize, ui.paused::show).get();
flip = new imagebutton("icon-arrow-up", isize, ()->{
flip = new imagebutton("icon-arrow-up", isize, () -> {
if(wavetable.getActions().size != 0) return;
float dur = 0.3f;
@@ -62,7 +62,7 @@ public class HudFragment implements Fragment{
}).get();
pause = new imagebutton("icon-pause", isize, ()->{
new imagebutton("icon-pause", isize, () -> {
if(Net.active() && Vars.android){
if(ui.chatfrag.chatOpen()){
ui.chatfrag.hide();
@@ -72,7 +72,7 @@ public class HudFragment implements Fragment{
}else {
GameState.set(GameState.is(State.paused) ? State.playing : State.paused);
}
}).update(i ->{
}).update(i -> {
if(Net.active() && Vars.android){
i.getStyle().imageUp = Core.skin.getDrawable("icon-chat");
}else {
@@ -194,7 +194,7 @@ public class HudFragment implements Fragment{
getEnemiesRemaining() :
(control.getTutorial().active() || Vars.control.getMode().toggleWaves) ? "$text.waiting"
: Bundles.format("text.wave.waiting", (int) (control.getWaveCountdown() / 60f)))
.minWidth(140).padLeft(-6).padRight(-12).left();
.minWidth(126).padLeft(-6).padRight(-12).left();
margin(10f);
get().marginLeft(6);
@@ -208,8 +208,7 @@ public class HudFragment implements Fragment{
private void playButton(float uheight){
new imagebutton("icon-play", 30f, ()->{
Vars.control.runWave();
}).height(uheight).fillX().right().padTop(-8f).padBottom(-12f).padRight(-36)
.padLeft(-10f).width(40f).update(l->{
}).height(uheight).fillX().right().padTop(-8f).padBottom(-12f).padRight(-36).width(40f).update(l->{
boolean vis = Vars.control.getMode().toggleWaves && Vars.control.getEnemiesRemaining() <= 0;
boolean paused = GameState.is(State.paused) || !vis;