diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java index faa71151cd..6ec9968c15 100644 --- a/core/src/io/anuke/mindustry/content/Zones.java +++ b/core/src/io/anuke/mindustry/content/Zones.java @@ -137,7 +137,7 @@ public class Zones implements ContentList{ conditionWave = 30; launchPeriod = 15; zoneRequirements = new Zone[]{desolateRift}; - blockRequirements = new Block[]{Blocks.blastDrill, Blocks.thermalGenerator}; + blockRequirements = new Block[]{Blocks.thermalGenerator}; resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium, Items.thorium, Items.sand}; rules = () -> new Rules(){{ waves = true; diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index 3d3bc18fd8..b763694e90 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -16,8 +16,12 @@ import io.anuke.arc.scene.ui.ImageButton; import io.anuke.arc.scene.ui.TextButton; import io.anuke.arc.scene.ui.layout.Stack; import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.layout.Unit; import io.anuke.arc.scene.utils.Elements; -import io.anuke.arc.util.*; +import io.anuke.arc.util.Align; +import io.anuke.arc.util.Scaling; +import io.anuke.arc.util.Time; +import io.anuke.arc.util.Tmp; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.game.EventType.StateChangeEvent; import io.anuke.mindustry.game.UnlockableContent; @@ -30,8 +34,6 @@ import io.anuke.mindustry.ui.Bar; import io.anuke.mindustry.ui.IntFormat; import io.anuke.mindustry.ui.dialogs.FloatingDialog; -import java.lang.StringBuilder; - import static io.anuke.mindustry.Vars.*; public class HudFragment extends Fragment{ @@ -103,7 +105,7 @@ public class HudFragment extends Fragment{ select.addImage("blank").color(Pal.accent).width(3f).fillY(); - float size = dsize; + float size = Unit.dp.scl(dsize); Array children = new Array<>(select.getChildren()); int index = 0; diff --git a/ios/data/icon-100.png b/ios/data/icon-100.png deleted file mode 100644 index a07de991ff..0000000000 Binary files a/ios/data/icon-100.png and /dev/null differ diff --git a/ios/data/icon-1024.png b/ios/data/icon-1024.png deleted file mode 100644 index 789b3c2331..0000000000 Binary files a/ios/data/icon-1024.png and /dev/null differ diff --git a/ios/data/icon-114.png b/ios/data/icon-114.png deleted file mode 100644 index 0df81ec95f..0000000000 Binary files a/ios/data/icon-114.png and /dev/null differ diff --git a/ios/data/icon-120.png b/ios/data/icon-120.png deleted file mode 100644 index 11b2ed403b..0000000000 Binary files a/ios/data/icon-120.png and /dev/null differ diff --git a/ios/data/icon-128.png b/ios/data/icon-128.png deleted file mode 100644 index b75daea34f..0000000000 Binary files a/ios/data/icon-128.png and /dev/null differ diff --git a/ios/data/icon-144.png b/ios/data/icon-144.png deleted file mode 100644 index 846da99800..0000000000 Binary files a/ios/data/icon-144.png and /dev/null differ diff --git a/ios/data/icon-152.png b/ios/data/icon-152.png deleted file mode 100644 index a43099f158..0000000000 Binary files a/ios/data/icon-152.png and /dev/null differ diff --git a/ios/data/icon-16.png b/ios/data/icon-16.png deleted file mode 100644 index a70719785b..0000000000 Binary files a/ios/data/icon-16.png and /dev/null differ diff --git a/ios/data/icon-167.png b/ios/data/icon-167.png deleted file mode 100644 index f1982121ac..0000000000 Binary files a/ios/data/icon-167.png and /dev/null differ diff --git a/ios/data/icon-172.png b/ios/data/icon-172.png deleted file mode 100644 index 294235d745..0000000000 Binary files a/ios/data/icon-172.png and /dev/null differ diff --git a/ios/data/icon-180.png b/ios/data/icon-180.png deleted file mode 100644 index ef59efc58c..0000000000 Binary files a/ios/data/icon-180.png and /dev/null differ diff --git a/ios/data/icon-196.png b/ios/data/icon-196.png deleted file mode 100644 index cb929ade7d..0000000000 Binary files a/ios/data/icon-196.png and /dev/null differ diff --git a/ios/data/icon-20.png b/ios/data/icon-20.png deleted file mode 100644 index 906c26bd71..0000000000 Binary files a/ios/data/icon-20.png and /dev/null differ diff --git a/ios/data/icon-256.png b/ios/data/icon-256.png deleted file mode 100644 index 2142b4250c..0000000000 Binary files a/ios/data/icon-256.png and /dev/null differ diff --git a/ios/data/icon-29.png b/ios/data/icon-29.png deleted file mode 100644 index 9fff3879ef..0000000000 Binary files a/ios/data/icon-29.png and /dev/null differ diff --git a/ios/data/icon-32.png b/ios/data/icon-32.png deleted file mode 100644 index a73c362973..0000000000 Binary files a/ios/data/icon-32.png and /dev/null differ diff --git a/ios/data/icon-40.png b/ios/data/icon-40.png deleted file mode 100644 index 079cc3a033..0000000000 Binary files a/ios/data/icon-40.png and /dev/null differ diff --git a/ios/data/icon-48.png b/ios/data/icon-48.png deleted file mode 100644 index 8b53a66dad..0000000000 Binary files a/ios/data/icon-48.png and /dev/null differ diff --git a/ios/data/icon-50.png b/ios/data/icon-50.png deleted file mode 100644 index 6ef1d383ab..0000000000 Binary files a/ios/data/icon-50.png and /dev/null differ diff --git a/ios/data/icon-512.png b/ios/data/icon-512.png deleted file mode 100644 index b4e62c192d..0000000000 Binary files a/ios/data/icon-512.png and /dev/null differ diff --git a/ios/data/icon-55.png b/ios/data/icon-55.png deleted file mode 100644 index 99f60f4f0b..0000000000 Binary files a/ios/data/icon-55.png and /dev/null differ diff --git a/ios/data/icon-57.png b/ios/data/icon-57.png deleted file mode 100644 index ee01e4267d..0000000000 Binary files a/ios/data/icon-57.png and /dev/null differ diff --git a/ios/data/icon-58.png b/ios/data/icon-58.png deleted file mode 100644 index 5b900b096b..0000000000 Binary files a/ios/data/icon-58.png and /dev/null differ diff --git a/ios/data/icon-60.png b/ios/data/icon-60.png deleted file mode 100644 index bd927e0b6f..0000000000 Binary files a/ios/data/icon-60.png and /dev/null differ diff --git a/ios/data/icon-64.png b/ios/data/icon-64.png deleted file mode 100644 index 8ca235f88b..0000000000 Binary files a/ios/data/icon-64.png and /dev/null differ diff --git a/ios/data/icon-72.png b/ios/data/icon-72.png deleted file mode 100644 index 675d140c46..0000000000 Binary files a/ios/data/icon-72.png and /dev/null differ diff --git a/ios/data/icon-76.png b/ios/data/icon-76.png deleted file mode 100644 index 1e9ac3e1d4..0000000000 Binary files a/ios/data/icon-76.png and /dev/null differ diff --git a/ios/data/icon-80.png b/ios/data/icon-80.png deleted file mode 100644 index faace9356f..0000000000 Binary files a/ios/data/icon-80.png and /dev/null differ diff --git a/ios/data/icon-87.png b/ios/data/icon-87.png deleted file mode 100644 index 4da4e3431d..0000000000 Binary files a/ios/data/icon-87.png and /dev/null differ diff --git a/ios/data/icon-88.png b/ios/data/icon-88.png deleted file mode 100644 index 53f5deefcb..0000000000 Binary files a/ios/data/icon-88.png and /dev/null differ diff --git a/ios/src/io/anuke/mindustry/IOSLauncher.java b/ios/src/io/anuke/mindustry/IOSLauncher.java index a4ce1935dd..7ba5f28f03 100644 --- a/ios/src/io/anuke/mindustry/IOSLauncher.java +++ b/ios/src/io/anuke/mindustry/IOSLauncher.java @@ -32,6 +32,8 @@ public class IOSLauncher extends IOSApplication.Delegate { if(UIDevice.getCurrentDevice().getUserInterfaceIdiom() == UIUserInterfaceIdiom.Pad){ Unit.dp.addition = 0.5f; + }else{ + Unit.dp.addition = -0.5f; } Platform.instance = new Platform() {