diff --git a/core/assets-raw/sprites/mechs/mechs/alpha-mech.png b/core/assets-raw/sprites/mechs/mechs/alpha-mech.png index 83d62471d5..623b8e7791 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/alpha-mech.png and b/core/assets-raw/sprites/mechs/mechs/alpha-mech.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/delta-mech.png b/core/assets-raw/sprites/mechs/mechs/delta-mech.png index e3d6e6424b..826e9e1bec 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/delta-mech.png and b/core/assets-raw/sprites/mechs/mechs/delta-mech.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/omega-mech.png b/core/assets-raw/sprites/mechs/mechs/omega-mech.png index 1f7c0ad626..2129eb3c08 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/omega-mech.png and b/core/assets-raw/sprites/mechs/mechs/omega-mech.png differ diff --git a/core/assets-raw/sprites/mechs/mechs/tau-mech.png b/core/assets-raw/sprites/mechs/mechs/tau-mech.png index 9b6b934213..6f23a1364c 100644 Binary files a/core/assets-raw/sprites/mechs/mechs/tau-mech.png and b/core/assets-raw/sprites/mechs/mechs/tau-mech.png differ diff --git a/core/assets-raw/sprites/mechs/ships/dart-ship.png b/core/assets-raw/sprites/mechs/ships/dart-ship.png index 6ca70bcc85..47ac3ef5cc 100644 Binary files a/core/assets-raw/sprites/mechs/ships/dart-ship.png and b/core/assets-raw/sprites/mechs/ships/dart-ship.png differ diff --git a/core/assets-raw/sprites/mechs/ships/glaive-ship.png b/core/assets-raw/sprites/mechs/ships/glaive-ship.png index 34aac96310..6374f07725 100644 Binary files a/core/assets-raw/sprites/mechs/ships/glaive-ship.png and b/core/assets-raw/sprites/mechs/ships/glaive-ship.png differ diff --git a/core/assets-raw/sprites/mechs/ships/javelin-ship.png b/core/assets-raw/sprites/mechs/ships/javelin-ship.png index 174d6e59cd..a9dff9a99b 100644 Binary files a/core/assets-raw/sprites/mechs/ships/javelin-ship.png and b/core/assets-raw/sprites/mechs/ships/javelin-ship.png differ diff --git a/core/assets-raw/sprites/mechs/ships/trident-ship.png b/core/assets-raw/sprites/mechs/ships/trident-ship.png index 0a4c15e5a3..e7fc0b88b1 100644 Binary files a/core/assets-raw/sprites/mechs/ships/trident-ship.png and b/core/assets-raw/sprites/mechs/ships/trident-ship.png differ diff --git a/core/assets-raw/sprites/weapons/blaster-equip.png b/core/assets-raw/sprites/weapons/blaster-equip.png index e8d35d7c9e..b5679122a5 100644 Binary files a/core/assets-raw/sprites/weapons/blaster-equip.png and b/core/assets-raw/sprites/weapons/blaster-equip.png differ diff --git a/core/assets-raw/sprites/weapons/flakgun-equip.png b/core/assets-raw/sprites/weapons/flakgun-equip.png index c264823bb3..931b33dd1d 100644 Binary files a/core/assets-raw/sprites/weapons/flakgun-equip.png and b/core/assets-raw/sprites/weapons/flakgun-equip.png differ diff --git a/core/assets-raw/sprites/weapons/heal-blaster-equip.png b/core/assets-raw/sprites/weapons/heal-blaster-equip.png index 4499364ab9..52f579ce68 100644 Binary files a/core/assets-raw/sprites/weapons/heal-blaster-equip.png and b/core/assets-raw/sprites/weapons/heal-blaster-equip.png differ diff --git a/core/assets-raw/sprites/weapons/shockgun-equip.png b/core/assets-raw/sprites/weapons/shockgun-equip.png index 5710b7c655..c53587d7ee 100644 Binary files a/core/assets-raw/sprites/weapons/shockgun-equip.png and b/core/assets-raw/sprites/weapons/shockgun-equip.png differ diff --git a/core/assets-raw/sprites/weapons/swarmer-equip.png b/core/assets-raw/sprites/weapons/swarmer-equip.png index 68de627f44..6d818dcaac 100644 Binary files a/core/assets-raw/sprites/weapons/swarmer-equip.png and b/core/assets-raw/sprites/weapons/swarmer-equip.png differ diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index d4d4211c33..fae8a4b29b 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/sprites/sprites3.png b/core/assets/sprites/sprites3.png index b17996082b..c348277858 100644 Binary files a/core/assets/sprites/sprites3.png and b/core/assets/sprites/sprites3.png differ diff --git a/core/src/io/anuke/mindustry/Mindustry.java b/core/src/io/anuke/mindustry/Mindustry.java index 82f14aaa05..5a58e9b30e 100644 --- a/core/src/io/anuke/mindustry/Mindustry.java +++ b/core/src/io/anuke/mindustry/Mindustry.java @@ -43,7 +43,7 @@ public class Mindustry extends ApplicationCore{ int targetfps = Core.settings.getInt("fpscap", 120); - if(targetfps > 0 && targetfps <= 120){ + if(targetfps > 0 && targetfps <= 240){ long target = (1000 * 1000000) / targetfps; //target in nanos long elapsed = Time.timeSinceNanos(lastTime); if(elapsed < target){ diff --git a/core/src/io/anuke/mindustry/ui/BorderImage.java b/core/src/io/anuke/mindustry/ui/BorderImage.java index 6c7a8e54d9..a1191e2414 100644 --- a/core/src/io/anuke/mindustry/ui/BorderImage.java +++ b/core/src/io/anuke/mindustry/ui/BorderImage.java @@ -7,7 +7,7 @@ import io.anuke.arc.scene.ui.layout.Unit; import io.anuke.mindustry.graphics.Pal; public class BorderImage extends Image{ - private float thickness = 3f; + private float thickness = 4f; public BorderImage(){ @@ -34,7 +34,7 @@ public class BorderImage extends Image{ float scaleX = getScaleX(); float scaleY = getScaleY(); - Draw.color(Pal.accent); + Draw.color(Pal.gray); Draw.alpha(parentAlpha); Lines.stroke(Unit.dp.scl(thickness)); Lines.rect(x + imageX, y + imageY, imageWidth * scaleX, imageHeight * scaleY); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index 4cbdbbbf0b..e3e42f842d 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -184,7 +184,7 @@ public class SettingsMenuDialog extends SettingsDialog{ } }); - graphics.sliderPref("fpscap", 125, 5, 125, 5, s -> (s > 120 ? Core.bundle.get("setting.fpscap.none") : Core.bundle.format("setting.fpscap.text", s))); + graphics.sliderPref("fpscap", 241, 5, 241, 5, s -> (s > 240 ? Core.bundle.get("setting.fpscap.none") : Core.bundle.format("setting.fpscap.text", s))); graphics.sliderPref("chatopacity", 100, 0, 100, 5, s -> s + "%"); if(!mobile){ diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java index 27456f21be..058ceaba08 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java @@ -9,6 +9,7 @@ import io.anuke.arc.scene.ui.Image; import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.scene.ui.layout.Unit; import io.anuke.arc.util.Interval; +import io.anuke.arc.util.Scaling; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.graphics.Pal; @@ -81,15 +82,15 @@ public class PlayerListFragment extends Fragment{ @Override public void draw(){ super.draw(); - Draw.color(Pal.accent); + Draw.color(Pal.gray); Draw.alpha(parentAlpha); - Lines.stroke(Unit.dp.scl(3f)); + Lines.stroke(Unit.dp.scl(4f)); Lines.rect(x, y, width, height); Draw.reset(); } }; table.margin(8); - table.add(new Image(user.mech.iconRegion)).grow(); + table.add(new Image(user.mech.getContentIcon()).setScaling(Scaling.none)).grow(); button.add(table).size(h); button.labelWrap("[#" + user.color.toString().toUpperCase() + "]" + user.name).width(170f).pad(10); @@ -135,7 +136,7 @@ public class PlayerListFragment extends Fragment{ content.add(button).padBottom(-6).width(350f).maxHeight(h + 14); content.row(); - content.addImage("whiteui").height(3f).color(state.rules.pvp ? user.getTeam().color : Pal.accent).growX(); + content.addImage("whiteui").height(4f).color(state.rules.pvp ? user.getTeam().color : Pal.gray).growX(); content.row(); });