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

Implemented desktop-specific recipes, removed Configurable

Browse Source
This commit is contained in:
Anuken
2018-01-09 17:47:34 -05:00
parent 8e676494e3
commit 9c48ab1128
21 changed files with 76 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -27,7 +27,6 @@ public class SettingsMenuDialog extends SettingsDialog{
private Table prefs;
private Table menu;
private boolean built = false;
private boolean wasPaused;
public SettingsMenuDialog(){
@@ -114,20 +113,20 @@ public class SettingsMenuDialog extends SettingsDialog{
game.checkPref("indicators", true);
game.checkPref("effects", true);
game.sliderPref("sensitivity", 100, 10, 300, i -> i + "%");
game.sliderPref("saveinterval", 90, 15, 5*120, i -> Bundles.format("setting.seconds", i));
game.sliderPref("saveinterval", 90, 10, 5*120, i -> Bundles.format("setting.seconds", i));
graphics.checkPref("fps", false);
graphics.checkPref("vsync", true, b -> Gdx.graphics.setVSync(b));
graphics.checkPref("lasers", true);
graphics.checkPref("healthbars", true);
graphics.checkPref("pixelate", true, b->{
graphics.checkPref("pixelate", true, b -> {
if(b){
Vars.renderer.pixelSurface.setScale(Core.cameraScale);
Vars.renderer.shadowSurface.setScale(Core.cameraScale);
Vars.renderer.shieldSurface.setScale(Core.cameraScale);
renderer.pixelSurface.setScale(Core.cameraScale);
renderer.shadowSurface.setScale(Core.cameraScale);
renderer.shieldSurface.setScale(Core.cameraScale);
}else{
Vars.renderer.shadowSurface.setScale(1);
Vars.renderer.shieldSurface.setScale(1);
renderer.shadowSurface.setScale(1);
renderer.shieldSurface.setScale(1);
}
renderer.setPixelate(b);
});

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

@@ -6,7 +6,6 @@ import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Align;
import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.Blocks;
import io.anuke.mindustry.world.blocks.types.Configurable;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Graphics;
import io.anuke.ucore.scene.Element;
@@ -35,7 +34,7 @@ public class BlockConfigFragment implements Fragment {
configTile = tile;
table.clear();
((Configurable)tile.block()).buildTable(tile, table);
tile.block().buildTable(tile, table);
table.pack();
table.setTransform(true);
table.actions(Actions.scaleTo(0f, 1f), Actions.visible(true),

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

@@ -80,6 +80,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);
}
}
@Override
@@ -144,6 +147,7 @@ public class ChatFragment extends Table implements Fragment{
if(!chatOpen && (scene.getKeyboardFocus() == null || !scene.getKeyboardFocus().getParent().isVisible())){
scene.setKeyboardFocus(chatfield);
chatfield.fireClick();
chatOpen = !chatOpen;
fadetime = messagesShown + 1;
}else if(chatOpen){
@@ -154,6 +158,12 @@ public class ChatFragment extends Table implements Fragment{
}
}
public void hide(){
scene.setKeyboardFocus(null);
chatOpen = false;
chatfield.setText("");
}
public boolean chatOpen(){
return chatOpen;
}

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

@@ -64,8 +64,11 @@ public class HudFragment implements Fragment{
pause = new imagebutton("icon-pause", isize, ()->{
if(Net.active() && Vars.android){
//TODO open android chat
ui.chatfrag.toggle();
if(ui.chatfrag.chatOpen()){
ui.chatfrag.hide();
}else{
ui.chatfrag.toggle();
}
}else {
GameState.set(GameState.is(State.paused) ? State.playing : State.paused);
}