Added fullscreen, player outlines, better weapon display

This commit is contained in:
Anuken
2018-01-29 15:24:10 -05:00
parent 5b25d94a3e
commit aaa9f85206
26 changed files with 320 additions and 189 deletions

View File

@@ -8,6 +8,7 @@ import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.net.Net;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Graphics;
import io.anuke.ucore.core.Settings;
import io.anuke.ucore.function.Consumer;
import io.anuke.ucore.scene.ui.Image;
@@ -114,6 +115,13 @@ public class SettingsMenuDialog extends SettingsDialog{
graphics.checkPref("fps", false);
graphics.checkPref("vsync", true, b -> Gdx.graphics.setVSync(b));
graphics.checkPref("fullscreen", false, b -> {
if(b){
Gdx.graphics.setFullscreenMode(Gdx.graphics.getDisplayMode());
}else{
Gdx.graphics.setWindowedMode(600, 480);
}
});
graphics.checkPref("lasers", true);
graphics.checkPref("indicators", true);
graphics.checkPref("healthbars", true);
@@ -122,14 +130,21 @@ public class SettingsMenuDialog extends SettingsDialog{
renderer.pixelSurface.setScale(Core.cameraScale);
renderer.shadowSurface.setScale(Core.cameraScale);
renderer.shieldSurface.setScale(Core.cameraScale);
Graphics.getEffects1().setScale(Core.cameraScale);
Graphics.getEffects2().setScale(Core.cameraScale);
}else{
renderer.shadowSurface.setScale(1);
renderer.shieldSurface.setScale(1);
Graphics.getEffects1().setScale(1);
Graphics.getEffects2().setScale(1);
}
renderer.setPixelate(b);
});
Gdx.graphics.setVSync(Settings.getBool("vsync"));
if(!gwt && Settings.getBool("fullscreen")){
Gdx.graphics.setFullscreenMode(Gdx.graphics.getDisplayMode());
}
}
private void back(){

View File

@@ -57,6 +57,8 @@ public class DebugFragment implements Fragment {
row();
new button("spawn", () -> new Enemy(EnemyTypes.standard).set(player.x, player.y).add());
row();
new button("stuff", () -> netClient.test());
row();
}}.end();
row();
@@ -102,16 +104,23 @@ public class DebugFragment implements Fragment {
}}.end();
}
public static void printDebugInfo(){
Gdx.app.error("Minudstry Info Dump", debugInfo());
}
public static String debugInfo(){
return join(
"net.active: " + Net.active(),
"net.server: " + Net.server(),
Net.client() ? "chat.open: " + ui.chatfrag.chatOpen() : "",
Net.client() ? "chat.messages: " + ui.chatfrag.getMessagesSize() : "",
Net.client() ?
"chat.open: " + ui.chatfrag.chatOpen() + "\n" +
"chat.messages: " + ui.chatfrag.getMessagesSize() + "\n" +
"client.connecting: " + netClient.isConnecting() + "\n" +
"client.hasdata: " + netClient.hasData() : "",
"players: " + playerGroup.size(),
"enemies: " + enemyGroup.size(),
"tiles: " + tileGroup.size(),
world.getCore() != null ? "core.health: " + world.getCore().entity.health : "",
world.getCore() != null && world.getCore().entity != null ? "core.health: " + world.getCore().entity.health : "",
"",
!Net.server() ? clientDebug.getOut() : serverDebug.getOut()
);

View File

@@ -63,6 +63,7 @@ public class HudFragment implements Fragment{
}).get();
new imagebutton("icon-pause", isize, () -> {
if(android) DebugFragment.printDebugInfo();
if (Net.active() && android) {
ui.listfrag.visible = !ui.listfrag.visible;
} else {