diff --git a/.gitignore b/.gitignore index dbc99c23a0..bafe066cda 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,14 @@ +##Packr, build stuff + +/deploy/ +/desktop/packr-out/ +/desktop/packr-export/ + ## Java *.class *.war *.ear -*.gif hs_err_pid* ## Robovm diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 724ebd0c63..107558455e 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="4" + android:versionName="1.1" > diff --git a/android/assets/sprites/conveyor.png b/android/assets/sprites/conveyor.png deleted file mode 100644 index 4432f5b42e..0000000000 Binary files a/android/assets/sprites/conveyor.png and /dev/null differ diff --git a/android/assets/sprites/mindustry.png b/android/assets/sprites/mindustry.png deleted file mode 100644 index a354a2536d..0000000000 Binary files a/android/assets/sprites/mindustry.png and /dev/null differ diff --git a/android/assets/ui/uiskin.png b/android/assets/ui/uiskin.png deleted file mode 100644 index 35af964871..0000000000 Binary files a/android/assets/ui/uiskin.png and /dev/null differ diff --git a/android/src/io/anuke/mindustry/AndroidLauncher.java b/android/src/io/anuke/mindustry/AndroidLauncher.java index e01156c389..73be0c1675 100644 --- a/android/src/io/anuke/mindustry/AndroidLauncher.java +++ b/android/src/io/anuke/mindustry/AndroidLauncher.java @@ -1,9 +1,14 @@ package io.anuke.mindustry; +import java.text.SimpleDateFormat; +import java.util.Date; + import com.badlogic.gdx.backends.android.AndroidApplication; import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration; import android.os.Bundle; +import io.anuke.mindustry.io.SaveIO; +import io.anuke.mindustry.io.SaveIO.FormatProvider; public class AndroidLauncher extends AndroidApplication { @Override @@ -11,6 +16,15 @@ public class AndroidLauncher extends AndroidApplication { super.onCreate(savedInstanceState); AndroidApplicationConfiguration config = new AndroidApplicationConfiguration(); config.useImmersiveMode = true; + + SaveIO.setFormatProvider(new FormatProvider(){ + SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss"); + + public String format(Date date){ + return format.format(date); + } + }); + initialize(new Mindustry(), config); } } diff --git a/build.gradle b/build.gradle index 03164a0771..7f86325d1e 100644 --- a/build.gradle +++ b/build.gradle @@ -8,6 +8,7 @@ buildscript { dependencies { classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6' classpath 'com.android.tools.build:gradle:2.2.0' + classpath 'org.akhikhl.gretty:gretty:+' } } @@ -77,8 +78,7 @@ project(":core") { apply plugin: "java" dependencies { - //compile fileTree(dir: '../core/lib', include: '*.jar') - //compile 'com.github.Anuken:ucore:88b945b' + compile fileTree(dir: '../core/lib', include: '*.jar') compile "com.badlogicgames.gdx:gdx:$gdxVersion" compile "com.badlogicgames.gdx:gdx-ai:1.8.1" } diff --git a/core/assets-raw/sprites/block.png b/core/assets-raw/sprites/block.png new file mode 100644 index 0000000000..7fe4b2a3a9 Binary files /dev/null and b/core/assets-raw/sprites/block.png differ diff --git a/core/assets-raw/sprites/bossmech.png b/core/assets-raw/sprites/bossmech.png new file mode 100644 index 0000000000..7cfbfcd2a6 Binary files /dev/null and b/core/assets-raw/sprites/bossmech.png differ diff --git a/core/assets-raw/sprites/bullet.png b/core/assets-raw/sprites/bullet.png new file mode 100644 index 0000000000..5f1c82cdbc Binary files /dev/null and b/core/assets-raw/sprites/bullet.png differ diff --git a/core/assets-raw/sprites/circle.png b/core/assets-raw/sprites/circle.png new file mode 100644 index 0000000000..4675e89777 Binary files /dev/null and b/core/assets-raw/sprites/circle.png differ diff --git a/core/assets-raw/sprites/coal1.png b/core/assets-raw/sprites/coal1.png new file mode 100644 index 0000000000..8f784eff3c Binary files /dev/null and b/core/assets-raw/sprites/coal1.png differ diff --git a/core/assets-raw/sprites/coal2.png b/core/assets-raw/sprites/coal2.png new file mode 100644 index 0000000000..65b531eac5 Binary files /dev/null and b/core/assets-raw/sprites/coal2.png differ diff --git a/core/assets-raw/sprites/coal3.png b/core/assets-raw/sprites/coal3.png new file mode 100644 index 0000000000..1457793e91 Binary files /dev/null and b/core/assets-raw/sprites/coal3.png differ diff --git a/core/assets-raw/sprites/coaldrill.png b/core/assets-raw/sprites/coaldrill.png new file mode 100644 index 0000000000..1f633ad9ec Binary files /dev/null and b/core/assets-raw/sprites/coaldrill.png differ diff --git a/core/assets-raw/sprites/conveyor.png b/core/assets-raw/sprites/conveyor.png new file mode 100644 index 0000000000..7f7f7e47d5 Binary files /dev/null and b/core/assets-raw/sprites/conveyor.png differ diff --git a/core/assets-raw/sprites/conveyormove.png b/core/assets-raw/sprites/conveyormove.png new file mode 100644 index 0000000000..2976fc1ae9 Binary files /dev/null and b/core/assets-raw/sprites/conveyormove.png differ diff --git a/core/assets-raw/sprites/core.png b/core/assets-raw/sprites/core.png new file mode 100644 index 0000000000..73b6411c99 Binary files /dev/null and b/core/assets-raw/sprites/core.png differ diff --git a/core/assets-raw/sprites/deepwater.png b/core/assets-raw/sprites/deepwater.png new file mode 100644 index 0000000000..373e04e03e Binary files /dev/null and b/core/assets-raw/sprites/deepwater.png differ diff --git a/core/assets-raw/sprites/dirt1.png b/core/assets-raw/sprites/dirt1.png new file mode 100644 index 0000000000..0fb5519b3f Binary files /dev/null and b/core/assets-raw/sprites/dirt1.png differ diff --git a/core/assets-raw/sprites/dirt2.png b/core/assets-raw/sprites/dirt2.png new file mode 100644 index 0000000000..c139b1eb08 Binary files /dev/null and b/core/assets-raw/sprites/dirt2.png differ diff --git a/core/assets-raw/sprites/dirt3.png b/core/assets-raw/sprites/dirt3.png new file mode 100644 index 0000000000..0092f124fa Binary files /dev/null and b/core/assets-raw/sprites/dirt3.png differ diff --git a/core/assets-raw/sprites/dirtblock.png b/core/assets-raw/sprites/dirtblock.png new file mode 100644 index 0000000000..86e5ac689c Binary files /dev/null and b/core/assets-raw/sprites/dirtblock.png differ diff --git a/core/assets-raw/sprites/dirtedge.png b/core/assets-raw/sprites/dirtedge.png new file mode 100644 index 0000000000..472724f19c Binary files /dev/null and b/core/assets-raw/sprites/dirtedge.png differ diff --git a/core/assets-raw/sprites/doubleturret.png b/core/assets-raw/sprites/doubleturret.png new file mode 100644 index 0000000000..a028ea8fca Binary files /dev/null and b/core/assets-raw/sprites/doubleturret.png differ diff --git a/core/assets-raw/sprites/drill.png b/core/assets-raw/sprites/drill.png new file mode 100644 index 0000000000..1f855be7a0 Binary files /dev/null and b/core/assets-raw/sprites/drill.png differ diff --git a/core/assets-raw/sprites/fastmech.png b/core/assets-raw/sprites/fastmech.png new file mode 100644 index 0000000000..4b95f08a69 Binary files /dev/null and b/core/assets-raw/sprites/fastmech.png differ diff --git a/core/assets-raw/sprites/firemech.png b/core/assets-raw/sprites/firemech.png new file mode 100644 index 0000000000..349b6ad560 Binary files /dev/null and b/core/assets-raw/sprites/firemech.png differ diff --git a/core/assets-raw/sprites/flameturret.png b/core/assets-raw/sprites/flameturret.png new file mode 100644 index 0000000000..734af9bed1 Binary files /dev/null and b/core/assets-raw/sprites/flameturret.png differ diff --git a/core/assets-raw/sprites/furnace.png b/core/assets-raw/sprites/furnace.png new file mode 100644 index 0000000000..691c6b7df3 Binary files /dev/null and b/core/assets-raw/sprites/furnace.png differ diff --git a/core/assets-raw/sprites/grass1.png b/core/assets-raw/sprites/grass1.png new file mode 100644 index 0000000000..68768bb0d2 Binary files /dev/null and b/core/assets-raw/sprites/grass1.png differ diff --git a/core/assets-raw/sprites/grass2.png b/core/assets-raw/sprites/grass2.png new file mode 100644 index 0000000000..9b17dd53a9 Binary files /dev/null and b/core/assets-raw/sprites/grass2.png differ diff --git a/core/assets-raw/sprites/grass3.png b/core/assets-raw/sprites/grass3.png new file mode 100644 index 0000000000..6896fa10c2 Binary files /dev/null and b/core/assets-raw/sprites/grass3.png differ diff --git a/core/assets-raw/sprites/grassblock.png b/core/assets-raw/sprites/grassblock.png new file mode 100644 index 0000000000..1263fd50b9 Binary files /dev/null and b/core/assets-raw/sprites/grassblock.png differ diff --git a/core/assets-raw/sprites/grassblock2.png b/core/assets-raw/sprites/grassblock2.png new file mode 100644 index 0000000000..74fd93f2dc Binary files /dev/null and b/core/assets-raw/sprites/grassblock2.png differ diff --git a/core/assets-raw/sprites/grassedge.png b/core/assets-raw/sprites/grassedge.png new file mode 100644 index 0000000000..32b6f87c0f Binary files /dev/null and b/core/assets-raw/sprites/grassedge.png differ diff --git a/core/assets-raw/sprites/icon-coal.png b/core/assets-raw/sprites/icon-coal.png new file mode 100644 index 0000000000..1da1774788 Binary files /dev/null and b/core/assets-raw/sprites/icon-coal.png differ diff --git a/core/assets-raw/sprites/icon-iron.png b/core/assets-raw/sprites/icon-iron.png new file mode 100644 index 0000000000..d46c14a816 Binary files /dev/null and b/core/assets-raw/sprites/icon-iron.png differ diff --git a/core/assets-raw/sprites/icon-steel.png b/core/assets-raw/sprites/icon-steel.png new file mode 100644 index 0000000000..ee6ffe781c Binary files /dev/null and b/core/assets-raw/sprites/icon-steel.png differ diff --git a/core/assets-raw/sprites/icon-stone.png b/core/assets-raw/sprites/icon-stone.png new file mode 100644 index 0000000000..3eabbf1cec Binary files /dev/null and b/core/assets-raw/sprites/icon-stone.png differ diff --git a/core/assets-raw/sprites/iron1.png b/core/assets-raw/sprites/iron1.png new file mode 100644 index 0000000000..7e8c332d80 Binary files /dev/null and b/core/assets-raw/sprites/iron1.png differ diff --git a/core/assets-raw/sprites/iron2.png b/core/assets-raw/sprites/iron2.png new file mode 100644 index 0000000000..97bcdf16b6 Binary files /dev/null and b/core/assets-raw/sprites/iron2.png differ diff --git a/core/assets-raw/sprites/iron3.png b/core/assets-raw/sprites/iron3.png new file mode 100644 index 0000000000..6110bcfd78 Binary files /dev/null and b/core/assets-raw/sprites/iron3.png differ diff --git a/core/assets-raw/sprites/irondrill.png b/core/assets-raw/sprites/irondrill.png new file mode 100644 index 0000000000..ef0550b268 Binary files /dev/null and b/core/assets-raw/sprites/irondrill.png differ diff --git a/core/assets-raw/sprites/ironwall.png b/core/assets-raw/sprites/ironwall.png new file mode 100644 index 0000000000..9d0971a89a Binary files /dev/null and b/core/assets-raw/sprites/ironwall.png differ diff --git a/core/assets-raw/sprites/junction.png b/core/assets-raw/sprites/junction.png new file mode 100644 index 0000000000..b1b9237d42 Binary files /dev/null and b/core/assets-raw/sprites/junction.png differ diff --git a/core/assets-raw/sprites/laser.png b/core/assets-raw/sprites/laser.png new file mode 100644 index 0000000000..25509df010 Binary files /dev/null and b/core/assets-raw/sprites/laser.png differ diff --git a/core/assets-raw/sprites/laserend.png b/core/assets-raw/sprites/laserend.png new file mode 100644 index 0000000000..ce1df97dae Binary files /dev/null and b/core/assets-raw/sprites/laserend.png differ diff --git a/core/assets-raw/sprites/machineturret.png b/core/assets-raw/sprites/machineturret.png new file mode 100644 index 0000000000..4757ab8631 Binary files /dev/null and b/core/assets-raw/sprites/machineturret.png differ diff --git a/core/assets-raw/sprites/mech1.png b/core/assets-raw/sprites/mech1.png new file mode 100644 index 0000000000..bb51dd68a4 Binary files /dev/null and b/core/assets-raw/sprites/mech1.png differ diff --git a/core/assets-raw/sprites/megarepairturret.png b/core/assets-raw/sprites/megarepairturret.png new file mode 100644 index 0000000000..7bf6173a93 Binary files /dev/null and b/core/assets-raw/sprites/megarepairturret.png differ diff --git a/core/assets-raw/sprites/mossblock.png b/core/assets-raw/sprites/mossblock.png new file mode 100644 index 0000000000..194f078ee7 Binary files /dev/null and b/core/assets-raw/sprites/mossblock.png differ diff --git a/core/assets-raw/sprites/mossstone.png b/core/assets-raw/sprites/mossstone.png new file mode 100644 index 0000000000..f49713af7c Binary files /dev/null and b/core/assets-raw/sprites/mossstone.png differ diff --git a/core/assets-raw/sprites/pack.json b/core/assets-raw/sprites/pack.json new file mode 100644 index 0000000000..80c754a8cc --- /dev/null +++ b/core/assets-raw/sprites/pack.json @@ -0,0 +1,4 @@ +{ + duplicatePadding: true, + combineSubdirectories: true +} diff --git a/core/assets-raw/sprites/player.png b/core/assets-raw/sprites/player.png new file mode 100644 index 0000000000..a4c0cf20c5 Binary files /dev/null and b/core/assets-raw/sprites/player.png differ diff --git a/core/assets-raw/sprites/repairturret.png b/core/assets-raw/sprites/repairturret.png new file mode 100644 index 0000000000..66c8b6e288 Binary files /dev/null and b/core/assets-raw/sprites/repairturret.png differ diff --git a/core/assets-raw/sprites/rock.png b/core/assets-raw/sprites/rock.png new file mode 100644 index 0000000000..4d1fcdddea Binary files /dev/null and b/core/assets-raw/sprites/rock.png differ diff --git a/core/assets-raw/sprites/rock2.png b/core/assets-raw/sprites/rock2.png new file mode 100644 index 0000000000..c1298987cc Binary files /dev/null and b/core/assets-raw/sprites/rock2.png differ diff --git a/core/assets-raw/sprites/rock2shadow.png b/core/assets-raw/sprites/rock2shadow.png new file mode 100644 index 0000000000..ea2870359e Binary files /dev/null and b/core/assets-raw/sprites/rock2shadow.png differ diff --git a/core/assets-raw/sprites/rockshadow.png b/core/assets-raw/sprites/rockshadow.png new file mode 100644 index 0000000000..2d9cafbedc Binary files /dev/null and b/core/assets-raw/sprites/rockshadow.png differ diff --git a/core/assets-raw/sprites/router.png b/core/assets-raw/sprites/router.png new file mode 100644 index 0000000000..8094c272f6 Binary files /dev/null and b/core/assets-raw/sprites/router.png differ diff --git a/core/assets-raw/sprites/shadow.png b/core/assets-raw/sprites/shadow.png new file mode 100644 index 0000000000..a4f6243e61 Binary files /dev/null and b/core/assets-raw/sprites/shadow.png differ diff --git a/core/assets-raw/sprites/shotgunturret.png b/core/assets-raw/sprites/shotgunturret.png new file mode 100644 index 0000000000..752f95fb0c Binary files /dev/null and b/core/assets-raw/sprites/shotgunturret.png differ diff --git a/core/assets-raw/sprites/shrub.png b/core/assets-raw/sprites/shrub.png new file mode 100644 index 0000000000..aa5d6ee818 Binary files /dev/null and b/core/assets-raw/sprites/shrub.png differ diff --git a/core/assets-raw/sprites/shrubshadow.png b/core/assets-raw/sprites/shrubshadow.png new file mode 100644 index 0000000000..f78fab2767 Binary files /dev/null and b/core/assets-raw/sprites/shrubshadow.png differ diff --git a/core/assets-raw/sprites/smelter.png b/core/assets-raw/sprites/smelter.png new file mode 100644 index 0000000000..dd197aad34 Binary files /dev/null and b/core/assets-raw/sprites/smelter.png differ diff --git a/core/assets-raw/sprites/sniperturret.png b/core/assets-raw/sprites/sniperturret.png new file mode 100644 index 0000000000..1d1a2a3649 Binary files /dev/null and b/core/assets-raw/sprites/sniperturret.png differ diff --git a/core/assets-raw/sprites/steelconveyor.png b/core/assets-raw/sprites/steelconveyor.png new file mode 100644 index 0000000000..ff6a0abd21 Binary files /dev/null and b/core/assets-raw/sprites/steelconveyor.png differ diff --git a/core/assets-raw/sprites/steelconveyormove.png b/core/assets-raw/sprites/steelconveyormove.png new file mode 100644 index 0000000000..371a4a8720 Binary files /dev/null and b/core/assets-raw/sprites/steelconveyormove.png differ diff --git a/core/assets-raw/sprites/steelwall.png b/core/assets-raw/sprites/steelwall.png new file mode 100644 index 0000000000..ab8652474a Binary files /dev/null and b/core/assets-raw/sprites/steelwall.png differ diff --git a/core/assets-raw/sprites/stone.png b/core/assets-raw/sprites/stone.png new file mode 100644 index 0000000000..68fd5ac409 Binary files /dev/null and b/core/assets-raw/sprites/stone.png differ diff --git a/core/assets-raw/sprites/stone1.png b/core/assets-raw/sprites/stone1.png new file mode 100644 index 0000000000..71457fcfff Binary files /dev/null and b/core/assets-raw/sprites/stone1.png differ diff --git a/core/assets-raw/sprites/stone2.png b/core/assets-raw/sprites/stone2.png new file mode 100644 index 0000000000..c655c1abd4 Binary files /dev/null and b/core/assets-raw/sprites/stone2.png differ diff --git a/core/assets-raw/sprites/stone3.png b/core/assets-raw/sprites/stone3.png new file mode 100644 index 0000000000..c5d121ca8d Binary files /dev/null and b/core/assets-raw/sprites/stone3.png differ diff --git a/core/assets-raw/sprites/stoneblock.png b/core/assets-raw/sprites/stoneblock.png new file mode 100644 index 0000000000..37510d29e5 Binary files /dev/null and b/core/assets-raw/sprites/stoneblock.png differ diff --git a/core/assets-raw/sprites/stoneblock2.png b/core/assets-raw/sprites/stoneblock2.png new file mode 100644 index 0000000000..db2b3a59dd Binary files /dev/null and b/core/assets-raw/sprites/stoneblock2.png differ diff --git a/core/assets-raw/sprites/stoneblock3.png b/core/assets-raw/sprites/stoneblock3.png new file mode 100644 index 0000000000..67fcf95616 Binary files /dev/null and b/core/assets-raw/sprites/stoneblock3.png differ diff --git a/core/assets-raw/sprites/stonedrill.png b/core/assets-raw/sprites/stonedrill.png new file mode 100644 index 0000000000..0fd9b107be Binary files /dev/null and b/core/assets-raw/sprites/stonedrill.png differ diff --git a/core/assets-raw/sprites/stoneedge.png b/core/assets-raw/sprites/stoneedge.png new file mode 100644 index 0000000000..abae1e4174 Binary files /dev/null and b/core/assets-raw/sprites/stoneedge.png differ diff --git a/core/assets-raw/sprites/stonewall.png b/core/assets-raw/sprites/stonewall.png new file mode 100644 index 0000000000..4bacdfdee2 Binary files /dev/null and b/core/assets-raw/sprites/stonewall.png differ diff --git a/core/assets-raw/sprites/turret.png b/core/assets-raw/sprites/turret.png new file mode 100644 index 0000000000..696bd2ff8b Binary files /dev/null and b/core/assets-raw/sprites/turret.png differ diff --git a/core/assets-raw/sprites/water.png b/core/assets-raw/sprites/water.png new file mode 100644 index 0000000000..9855f81c1a Binary files /dev/null and b/core/assets-raw/sprites/water.png differ diff --git a/core/assets-raw/sprites/wateredge.png b/core/assets-raw/sprites/wateredge.png new file mode 100644 index 0000000000..cca7fdd058 Binary files /dev/null and b/core/assets-raw/sprites/wateredge.png differ diff --git a/core/assets-raw/sprites/weapon-blaster.png b/core/assets-raw/sprites/weapon-blaster.png new file mode 100644 index 0000000000..f086440ffc Binary files /dev/null and b/core/assets-raw/sprites/weapon-blaster.png differ diff --git a/core/assets-raw/sprites/weapon-flamethrower.png b/core/assets-raw/sprites/weapon-flamethrower.png new file mode 100644 index 0000000000..057fd81f9b Binary files /dev/null and b/core/assets-raw/sprites/weapon-flamethrower.png differ diff --git a/core/assets-raw/sprites/weapon-multigun.png b/core/assets-raw/sprites/weapon-multigun.png new file mode 100644 index 0000000000..5c10563611 Binary files /dev/null and b/core/assets-raw/sprites/weapon-multigun.png differ diff --git a/core/assets-raw/sprites/weapon-trishot.png b/core/assets-raw/sprites/weapon-trishot.png new file mode 100644 index 0000000000..736f80682a Binary files /dev/null and b/core/assets-raw/sprites/weapon-trishot.png differ diff --git a/android/assets/ui/out/blank.png b/core/assets-raw/ui/blank.png similarity index 100% rename from android/assets/ui/out/blank.png rename to core/assets-raw/ui/blank.png diff --git a/android/assets/ui/out/border-circle-error.png b/core/assets-raw/ui/border-circle-error.png similarity index 100% rename from android/assets/ui/out/border-circle-error.png rename to core/assets-raw/ui/border-circle-error.png diff --git a/android/assets/ui/out/border-circle.png b/core/assets-raw/ui/border-circle.png similarity index 100% rename from android/assets/ui/out/border-circle.png rename to core/assets-raw/ui/border-circle.png diff --git a/android/assets/ui/out/border-dark-blue.9.png b/core/assets-raw/ui/border-dark-blue.9.png similarity index 100% rename from android/assets/ui/out/border-dark-blue.9.png rename to core/assets-raw/ui/border-dark-blue.9.png diff --git a/android/assets/ui/out/border-error.9.png b/core/assets-raw/ui/border-error.9.png similarity index 100% rename from android/assets/ui/out/border-error.9.png rename to core/assets-raw/ui/border-error.9.png diff --git a/android/assets/ui/out/border-white.9.png b/core/assets-raw/ui/border-white.9.png similarity index 100% rename from android/assets/ui/out/border-white.9.png rename to core/assets-raw/ui/border-white.9.png diff --git a/android/assets/ui/out/border.9.png b/core/assets-raw/ui/border.9.png similarity index 100% rename from android/assets/ui/out/border.9.png rename to core/assets-raw/ui/border.9.png diff --git a/android/assets/ui/out/bump.9.png b/core/assets-raw/ui/bump.9.png similarity index 100% rename from android/assets/ui/out/bump.9.png rename to core/assets-raw/ui/bump.9.png diff --git a/android/assets/ui/out/button-blue-down.9.png b/core/assets-raw/ui/button-blue-down.9.png similarity index 100% rename from android/assets/ui/out/button-blue-down.9.png rename to core/assets-raw/ui/button-blue-down.9.png diff --git a/android/assets/ui/out/button-blue-over.9.png b/core/assets-raw/ui/button-blue-over.9.png similarity index 100% rename from android/assets/ui/out/button-blue-over.9.png rename to core/assets-raw/ui/button-blue-over.9.png diff --git a/android/assets/ui/out/button-blue.9.png b/core/assets-raw/ui/button-blue.9.png similarity index 100% rename from android/assets/ui/out/button-blue.9.png rename to core/assets-raw/ui/button-blue.9.png diff --git a/android/assets/ui/out/button-down.9.png b/core/assets-raw/ui/button-down.9.png similarity index 100% rename from android/assets/ui/out/button-down.9.png rename to core/assets-raw/ui/button-down.9.png diff --git a/android/assets/ui/out/button-gray-over.9.png b/core/assets-raw/ui/button-gray-over.9.png similarity index 100% rename from android/assets/ui/out/button-gray-over.9.png rename to core/assets-raw/ui/button-gray-over.9.png diff --git a/android/assets/ui/out/button-gray.9.png b/core/assets-raw/ui/button-gray.9.png similarity index 100% rename from android/assets/ui/out/button-gray.9.png rename to core/assets-raw/ui/button-gray.9.png diff --git a/android/assets/ui/out/button-map-down.9.png b/core/assets-raw/ui/button-map-down.9.png similarity index 100% rename from android/assets/ui/out/button-map-down.9.png rename to core/assets-raw/ui/button-map-down.9.png diff --git a/android/assets/ui/out/button-map-over.9.png b/core/assets-raw/ui/button-map-over.9.png similarity index 100% rename from android/assets/ui/out/button-map-over.9.png rename to core/assets-raw/ui/button-map-over.9.png diff --git a/android/assets/ui/out/button-map.9.png b/core/assets-raw/ui/button-map.9.png similarity index 100% rename from android/assets/ui/out/button-map.9.png rename to core/assets-raw/ui/button-map.9.png diff --git a/android/assets/ui/out/button-over.9.png b/core/assets-raw/ui/button-over.9.png similarity index 100% rename from android/assets/ui/out/button-over.9.png rename to core/assets-raw/ui/button-over.9.png diff --git a/android/assets/ui/out/button-red.9.png b/core/assets-raw/ui/button-red.9.png similarity index 100% rename from android/assets/ui/out/button-red.9.png rename to core/assets-raw/ui/button-red.9.png diff --git a/android/assets/ui/out/button-select.9.png b/core/assets-raw/ui/button-select.9.png similarity index 100% rename from android/assets/ui/out/button-select.9.png rename to core/assets-raw/ui/button-select.9.png diff --git a/android/assets/ui/out/button-window-bg.9.png b/core/assets-raw/ui/button-window-bg.9.png similarity index 100% rename from android/assets/ui/out/button-window-bg.9.png rename to core/assets-raw/ui/button-window-bg.9.png diff --git a/android/assets/ui/out/button-window-over.9.png b/core/assets-raw/ui/button-window-over.9.png similarity index 100% rename from android/assets/ui/out/button-window-over.9.png rename to core/assets-raw/ui/button-window-over.9.png diff --git a/android/assets/ui/out/button.9.png b/core/assets-raw/ui/button.9.png similarity index 100% rename from android/assets/ui/out/button.9.png rename to core/assets-raw/ui/button.9.png diff --git a/android/assets/ui/out/check-off.png b/core/assets-raw/ui/check-off.png similarity index 100% rename from android/assets/ui/out/check-off.png rename to core/assets-raw/ui/check-off.png diff --git a/android/assets/ui/out/check-on.png b/core/assets-raw/ui/check-on.png similarity index 100% rename from android/assets/ui/out/check-on.png rename to core/assets-raw/ui/check-on.png diff --git a/android/assets/ui/out/check-over.png b/core/assets-raw/ui/check-over.png similarity index 100% rename from android/assets/ui/out/check-over.png rename to core/assets-raw/ui/check-over.png diff --git a/android/assets/ui/out/clear.png b/core/assets-raw/ui/clear.png similarity index 100% rename from android/assets/ui/out/clear.png rename to core/assets-raw/ui/clear.png diff --git a/android/assets/ui/out/color-picker-bar-selector.png b/core/assets-raw/ui/color-picker-bar-selector.png similarity index 100% rename from android/assets/ui/out/color-picker-bar-selector.png rename to core/assets-raw/ui/color-picker-bar-selector.png diff --git a/android/assets/ui/out/color-picker-cross.png b/core/assets-raw/ui/color-picker-cross.png similarity index 100% rename from android/assets/ui/out/color-picker-cross.png rename to core/assets-raw/ui/color-picker-cross.png diff --git a/android/assets/ui/out/color-picker-selector-horizontal.png b/core/assets-raw/ui/color-picker-selector-horizontal.png similarity index 100% rename from android/assets/ui/out/color-picker-selector-horizontal.png rename to core/assets-raw/ui/color-picker-selector-horizontal.png diff --git a/android/assets/ui/out/color-picker-selector-vertical.png b/core/assets-raw/ui/color-picker-selector-vertical.png similarity index 100% rename from android/assets/ui/out/color-picker-selector-vertical.png rename to core/assets-raw/ui/color-picker-selector-vertical.png diff --git a/android/assets/ui/out/cursor-normal.png b/core/assets-raw/ui/cursor-normal.png similarity index 100% rename from android/assets/ui/out/cursor-normal.png rename to core/assets-raw/ui/cursor-normal.png diff --git a/android/assets/ui/out/cursor.png b/core/assets-raw/ui/cursor.png similarity index 100% rename from android/assets/ui/out/cursor.png rename to core/assets-raw/ui/cursor.png diff --git a/android/assets/ui/out/default-pane-no-border.9.png b/core/assets-raw/ui/default-pane-no-border.9.png similarity index 100% rename from android/assets/ui/out/default-pane-no-border.9.png rename to core/assets-raw/ui/default-pane-no-border.9.png diff --git a/android/assets/ui/out/default-pane.9.png b/core/assets-raw/ui/default-pane.9.png similarity index 100% rename from android/assets/ui/out/default-pane.9.png rename to core/assets-raw/ui/default-pane.9.png diff --git a/android/assets/ui/out/default-select-selection.9.png b/core/assets-raw/ui/default-select-selection.9.png similarity index 100% rename from android/assets/ui/out/default-select-selection.9.png rename to core/assets-raw/ui/default-select-selection.9.png diff --git a/android/assets/ui/out/default-select.9.png b/core/assets-raw/ui/default-select.9.png similarity index 100% rename from android/assets/ui/out/default-select.9.png rename to core/assets-raw/ui/default-select.9.png diff --git a/android/assets/ui/out/grey.png b/core/assets-raw/ui/grey.png similarity index 100% rename from android/assets/ui/out/grey.png rename to core/assets-raw/ui/grey.png diff --git a/android/assets/ui/out/icon-cancel.png b/core/assets-raw/ui/icon-cancel.png similarity index 100% rename from android/assets/ui/out/icon-cancel.png rename to core/assets-raw/ui/icon-cancel.png diff --git a/android/assets/ui/out/icon-check.png b/core/assets-raw/ui/icon-check.png similarity index 100% rename from android/assets/ui/out/icon-check.png rename to core/assets-raw/ui/icon-check.png diff --git a/android/assets/ui/out/icon-close-down.png b/core/assets-raw/ui/icon-close-down.png similarity index 100% rename from android/assets/ui/out/icon-close-down.png rename to core/assets-raw/ui/icon-close-down.png diff --git a/android/assets/ui/out/icon-close-over.png b/core/assets-raw/ui/icon-close-over.png similarity index 100% rename from android/assets/ui/out/icon-close-over.png rename to core/assets-raw/ui/icon-close-over.png diff --git a/android/assets/ui/out/icon-close.png b/core/assets-raw/ui/icon-close.png similarity index 100% rename from android/assets/ui/out/icon-close.png rename to core/assets-raw/ui/icon-close.png diff --git a/android/assets/ui/out/icon-defense.png b/core/assets-raw/ui/icon-defense.png similarity index 100% rename from android/assets/ui/out/icon-defense.png rename to core/assets-raw/ui/icon-defense.png diff --git a/android/assets/ui/out/icon-distribution.png b/core/assets-raw/ui/icon-distribution.png similarity index 100% rename from android/assets/ui/out/icon-distribution.png rename to core/assets-raw/ui/icon-distribution.png diff --git a/android/assets/ui/out/icon-production.png b/core/assets-raw/ui/icon-production.png similarity index 100% rename from android/assets/ui/out/icon-production.png rename to core/assets-raw/ui/icon-production.png diff --git a/android/assets/ui/out/icon-rotate.png b/core/assets-raw/ui/icon-rotate.png similarity index 100% rename from android/assets/ui/out/icon-rotate.png rename to core/assets-raw/ui/icon-rotate.png diff --git a/android/assets/ui/out/list-selection.png b/core/assets-raw/ui/list-selection.png similarity index 100% rename from android/assets/ui/out/list-selection.png rename to core/assets-raw/ui/list-selection.png diff --git a/android/assets/ui/out/menu-bg.png b/core/assets-raw/ui/menu-bg.png similarity index 100% rename from android/assets/ui/out/menu-bg.png rename to core/assets-raw/ui/menu-bg.png diff --git a/android/assets/ui/out/padded-list-selection.9.png b/core/assets-raw/ui/padded-list-selection.9.png similarity index 100% rename from android/assets/ui/out/padded-list-selection.9.png rename to core/assets-raw/ui/padded-list-selection.9.png diff --git a/android/assets/ui/out/progressbar-filled-vertical.png b/core/assets-raw/ui/progressbar-filled-vertical.png similarity index 100% rename from android/assets/ui/out/progressbar-filled-vertical.png rename to core/assets-raw/ui/progressbar-filled-vertical.png diff --git a/android/assets/ui/out/progressbar-filled.png b/core/assets-raw/ui/progressbar-filled.png similarity index 100% rename from android/assets/ui/out/progressbar-filled.png rename to core/assets-raw/ui/progressbar-filled.png diff --git a/android/assets/ui/out/progressbar-vertical.png b/core/assets-raw/ui/progressbar-vertical.png similarity index 100% rename from android/assets/ui/out/progressbar-vertical.png rename to core/assets-raw/ui/progressbar-vertical.png diff --git a/android/assets/ui/out/progressbar.png b/core/assets-raw/ui/progressbar.png similarity index 100% rename from android/assets/ui/out/progressbar.png rename to core/assets-raw/ui/progressbar.png diff --git a/android/assets/ui/out/radio-off.png b/core/assets-raw/ui/radio-off.png similarity index 100% rename from android/assets/ui/out/radio-off.png rename to core/assets-raw/ui/radio-off.png diff --git a/android/assets/ui/out/radio-on.png b/core/assets-raw/ui/radio-on.png similarity index 100% rename from android/assets/ui/out/radio-on.png rename to core/assets-raw/ui/radio-on.png diff --git a/android/assets/ui/out/scroll-horizontal.9.png b/core/assets-raw/ui/scroll-horizontal.9.png similarity index 100% rename from android/assets/ui/out/scroll-horizontal.9.png rename to core/assets-raw/ui/scroll-horizontal.9.png diff --git a/android/assets/ui/out/scroll-knob-horizontal.9.png b/core/assets-raw/ui/scroll-knob-horizontal.9.png similarity index 100% rename from android/assets/ui/out/scroll-knob-horizontal.9.png rename to core/assets-raw/ui/scroll-knob-horizontal.9.png diff --git a/android/assets/ui/out/scroll-knob-vertical.9.png b/core/assets-raw/ui/scroll-knob-vertical.9.png similarity index 100% rename from android/assets/ui/out/scroll-knob-vertical.9.png rename to core/assets-raw/ui/scroll-knob-vertical.9.png diff --git a/android/assets/ui/out/scroll.9.png b/core/assets-raw/ui/scroll.9.png similarity index 100% rename from android/assets/ui/out/scroll.9.png rename to core/assets-raw/ui/scroll.9.png diff --git a/android/assets/ui/out/select-box-list-bg.png b/core/assets-raw/ui/select-box-list-bg.png similarity index 100% rename from android/assets/ui/out/select-box-list-bg.png rename to core/assets-raw/ui/select-box-list-bg.png diff --git a/android/assets/ui/out/select-down.png b/core/assets-raw/ui/select-down.png similarity index 100% rename from android/assets/ui/out/select-down.png rename to core/assets-raw/ui/select-down.png diff --git a/android/assets/ui/out/select-up.png b/core/assets-raw/ui/select-up.png similarity index 100% rename from android/assets/ui/out/select-up.png rename to core/assets-raw/ui/select-up.png diff --git a/android/assets/ui/out/selection.png b/core/assets-raw/ui/selection.png similarity index 100% rename from android/assets/ui/out/selection.png rename to core/assets-raw/ui/selection.png diff --git a/android/assets/ui/out/separator-menu.png b/core/assets-raw/ui/separator-menu.png similarity index 100% rename from android/assets/ui/out/separator-menu.png rename to core/assets-raw/ui/separator-menu.png diff --git a/android/assets/ui/out/separator.png b/core/assets-raw/ui/separator.png similarity index 100% rename from android/assets/ui/out/separator.png rename to core/assets-raw/ui/separator.png diff --git a/android/assets/ui/out/slider-knob-disabled.png b/core/assets-raw/ui/slider-knob-disabled.png similarity index 100% rename from android/assets/ui/out/slider-knob-disabled.png rename to core/assets-raw/ui/slider-knob-disabled.png diff --git a/android/assets/ui/out/slider-knob-down.png b/core/assets-raw/ui/slider-knob-down.png similarity index 100% rename from android/assets/ui/out/slider-knob-down.png rename to core/assets-raw/ui/slider-knob-down.png diff --git a/android/assets/ui/out/slider-knob-over.png b/core/assets-raw/ui/slider-knob-over.png similarity index 100% rename from android/assets/ui/out/slider-knob-over.png rename to core/assets-raw/ui/slider-knob-over.png diff --git a/android/assets/ui/out/slider-knob.png b/core/assets-raw/ui/slider-knob.png similarity index 100% rename from android/assets/ui/out/slider-knob.png rename to core/assets-raw/ui/slider-knob.png diff --git a/android/assets/ui/out/slider-vertical.png b/core/assets-raw/ui/slider-vertical.png similarity index 100% rename from android/assets/ui/out/slider-vertical.png rename to core/assets-raw/ui/slider-vertical.png diff --git a/android/assets/ui/out/slider.png b/core/assets-raw/ui/slider.png similarity index 100% rename from android/assets/ui/out/slider.png rename to core/assets-raw/ui/slider.png diff --git a/android/assets/ui/out/slot.9.png b/core/assets-raw/ui/slot.9.png similarity index 100% rename from android/assets/ui/out/slot.9.png rename to core/assets-raw/ui/slot.9.png diff --git a/android/assets/ui/out/splitpane-over.png b/core/assets-raw/ui/splitpane-over.png similarity index 100% rename from android/assets/ui/out/splitpane-over.png rename to core/assets-raw/ui/splitpane-over.png diff --git a/android/assets/ui/out/splitpane-vertical-over.png b/core/assets-raw/ui/splitpane-vertical-over.png similarity index 100% rename from android/assets/ui/out/splitpane-vertical-over.png rename to core/assets-raw/ui/splitpane-vertical-over.png diff --git a/android/assets/ui/out/splitpane-vertical.png b/core/assets-raw/ui/splitpane-vertical.png similarity index 100% rename from android/assets/ui/out/splitpane-vertical.png rename to core/assets-raw/ui/splitpane-vertical.png diff --git a/android/assets/ui/out/splitpane.png b/core/assets-raw/ui/splitpane.png similarity index 100% rename from android/assets/ui/out/splitpane.png rename to core/assets-raw/ui/splitpane.png diff --git a/android/assets/ui/out/sub-menu.png b/core/assets-raw/ui/sub-menu.png similarity index 100% rename from android/assets/ui/out/sub-menu.png rename to core/assets-raw/ui/sub-menu.png diff --git a/android/assets/ui/out/textfield-over.9.png b/core/assets-raw/ui/textfield-over.9.png similarity index 100% rename from android/assets/ui/out/textfield-over.9.png rename to core/assets-raw/ui/textfield-over.9.png diff --git a/android/assets/ui/out/textfield.9.png b/core/assets-raw/ui/textfield.9.png similarity index 100% rename from android/assets/ui/out/textfield.9.png rename to core/assets-raw/ui/textfield.9.png diff --git a/android/assets/ui/out/tooltip-bg.9.png b/core/assets-raw/ui/tooltip-bg.9.png similarity index 100% rename from android/assets/ui/out/tooltip-bg.9.png rename to core/assets-raw/ui/tooltip-bg.9.png diff --git a/android/assets/ui/out/touchpad-knob.png b/core/assets-raw/ui/touchpad-knob.png similarity index 100% rename from android/assets/ui/out/touchpad-knob.png rename to core/assets-raw/ui/touchpad-knob.png diff --git a/android/assets/ui/out/tree-minus.png b/core/assets-raw/ui/tree-minus.png similarity index 100% rename from android/assets/ui/out/tree-minus.png rename to core/assets-raw/ui/tree-minus.png diff --git a/android/assets/ui/out/tree-over.png b/core/assets-raw/ui/tree-over.png similarity index 100% rename from android/assets/ui/out/tree-over.png rename to core/assets-raw/ui/tree-over.png diff --git a/android/assets/ui/out/tree-plus.png b/core/assets-raw/ui/tree-plus.png similarity index 100% rename from android/assets/ui/out/tree-plus.png rename to core/assets-raw/ui/tree-plus.png diff --git a/android/assets/ui/out/tree-selection.9.png b/core/assets-raw/ui/tree-selection.9.png similarity index 100% rename from android/assets/ui/out/tree-selection.9.png rename to core/assets-raw/ui/tree-selection.9.png diff --git a/android/assets/ui/out/white.png b/core/assets-raw/ui/white.png similarity index 100% rename from android/assets/ui/out/white.png rename to core/assets-raw/ui/white.png diff --git a/android/assets/ui/out/window-bg.png b/core/assets-raw/ui/window-bg.png similarity index 100% rename from android/assets/ui/out/window-bg.png rename to core/assets-raw/ui/window-bg.png diff --git a/android/assets/ui/out/window-border-bg.9.png b/core/assets-raw/ui/window-border-bg.9.png similarity index 100% rename from android/assets/ui/out/window-border-bg.9.png rename to core/assets-raw/ui/window-border-bg.9.png diff --git a/android/assets/ui/out/window-gray.9.png b/core/assets-raw/ui/window-gray.9.png similarity index 100% rename from android/assets/ui/out/window-gray.9.png rename to core/assets-raw/ui/window-gray.9.png diff --git a/android/assets/ui/out/window-noborder.9.png b/core/assets-raw/ui/window-noborder.9.png similarity index 100% rename from android/assets/ui/out/window-noborder.9.png rename to core/assets-raw/ui/window-noborder.9.png diff --git a/android/assets/ui/out/window-resizable.9.png b/core/assets-raw/ui/window-resizable.9.png similarity index 100% rename from android/assets/ui/out/window-resizable.9.png rename to core/assets-raw/ui/window-resizable.9.png diff --git a/android/assets/ui/out/window.9.png b/core/assets-raw/ui/window.9.png similarity index 100% rename from android/assets/ui/out/window.9.png rename to core/assets-raw/ui/window.9.png diff --git a/android/assets/maps/canyon.png b/core/assets/maps/canyon.png similarity index 100% rename from android/assets/maps/canyon.png rename to core/assets/maps/canyon.png diff --git a/android/assets/maps/delta.png b/core/assets/maps/delta.png similarity index 100% rename from android/assets/maps/delta.png rename to core/assets/maps/delta.png diff --git a/android/assets/maps/map.png b/core/assets/maps/map.png similarity index 100% rename from android/assets/maps/map.png rename to core/assets/maps/map.png diff --git a/android/assets/maps/maze.png b/core/assets/maps/maze.png similarity index 100% rename from android/assets/maps/maze.png rename to core/assets/maps/maze.png diff --git a/android/assets/maps/pit.png b/core/assets/maps/pit.png similarity index 100% rename from android/assets/maps/pit.png rename to core/assets/maps/pit.png diff --git a/android/assets/maps/test.png b/core/assets/maps/test.png similarity index 100% rename from android/assets/maps/test.png rename to core/assets/maps/test.png diff --git a/android/assets/music/1.mp3 b/core/assets/music/1.mp3 similarity index 100% rename from android/assets/music/1.mp3 rename to core/assets/music/1.mp3 diff --git a/android/assets/music/2.mp3 b/core/assets/music/2.mp3 similarity index 100% rename from android/assets/music/2.mp3 rename to core/assets/music/2.mp3 diff --git a/android/assets/music/3.mp3 b/core/assets/music/3.mp3 similarity index 100% rename from android/assets/music/3.mp3 rename to core/assets/music/3.mp3 diff --git a/android/assets/music/place.wav b/core/assets/music/place.wav similarity index 100% rename from android/assets/music/place.wav rename to core/assets/music/place.wav diff --git a/android/assets/music/shoot.wav b/core/assets/music/shoot.wav similarity index 100% rename from android/assets/music/shoot.wav rename to core/assets/music/shoot.wav diff --git a/android/assets/sounds/bloop.wav b/core/assets/sounds/bloop.wav similarity index 100% rename from android/assets/sounds/bloop.wav rename to core/assets/sounds/bloop.wav diff --git a/android/assets/sounds/break.wav b/core/assets/sounds/break.wav similarity index 100% rename from android/assets/sounds/break.wav rename to core/assets/sounds/break.wav diff --git a/android/assets/sounds/corexplode.wav b/core/assets/sounds/corexplode.wav similarity index 100% rename from android/assets/sounds/corexplode.wav rename to core/assets/sounds/corexplode.wav diff --git a/android/assets/sounds/die.wav b/core/assets/sounds/die.wav similarity index 100% rename from android/assets/sounds/die.wav rename to core/assets/sounds/die.wav diff --git a/android/assets/sounds/enemyshoot.wav b/core/assets/sounds/enemyshoot.wav similarity index 100% rename from android/assets/sounds/enemyshoot.wav rename to core/assets/sounds/enemyshoot.wav diff --git a/android/assets/sounds/explosion.wav b/core/assets/sounds/explosion.wav similarity index 100% rename from android/assets/sounds/explosion.wav rename to core/assets/sounds/explosion.wav diff --git a/android/assets/sounds/flame.wav b/core/assets/sounds/flame.wav similarity index 100% rename from android/assets/sounds/flame.wav rename to core/assets/sounds/flame.wav diff --git a/android/assets/sounds/flame2.wav b/core/assets/sounds/flame2.wav similarity index 100% rename from android/assets/sounds/flame2.wav rename to core/assets/sounds/flame2.wav diff --git a/android/assets/sounds/missile.wav b/core/assets/sounds/missile.wav similarity index 100% rename from android/assets/sounds/missile.wav rename to core/assets/sounds/missile.wav diff --git a/android/assets/sounds/place.wav b/core/assets/sounds/place.wav similarity index 100% rename from android/assets/sounds/place.wav rename to core/assets/sounds/place.wav diff --git a/android/assets/sounds/purchase.wav b/core/assets/sounds/purchase.wav similarity index 100% rename from android/assets/sounds/purchase.wav rename to core/assets/sounds/purchase.wav diff --git a/android/assets/sounds/resonate.wav b/core/assets/sounds/resonate.wav similarity index 100% rename from android/assets/sounds/resonate.wav rename to core/assets/sounds/resonate.wav diff --git a/android/assets/sounds/respawn.wav b/core/assets/sounds/respawn.wav similarity index 100% rename from android/assets/sounds/respawn.wav rename to core/assets/sounds/respawn.wav diff --git a/android/assets/sounds/shoot.wav b/core/assets/sounds/shoot.wav similarity index 100% rename from android/assets/sounds/shoot.wav rename to core/assets/sounds/shoot.wav diff --git a/android/assets/sounds/spawn.wav b/core/assets/sounds/spawn.wav similarity index 100% rename from android/assets/sounds/spawn.wav rename to core/assets/sounds/spawn.wav diff --git a/android/assets/sprites/back.png b/core/assets/sprites/back.png similarity index 100% rename from android/assets/sprites/back.png rename to core/assets/sprites/back.png diff --git a/android/assets/sprites/conveyort.png b/core/assets/sprites/conveyort.png similarity index 100% rename from android/assets/sprites/conveyort.png rename to core/assets/sprites/conveyort.png diff --git a/android/assets/sprites/mindustry.atlas b/core/assets/sprites/sprites.atlas similarity index 99% rename from android/assets/sprites/mindustry.atlas rename to core/assets/sprites/sprites.atlas index 0282756873..f8d5f87250 100644 --- a/android/assets/sprites/mindustry.atlas +++ b/core/assets/sprites/sprites.atlas @@ -1,5 +1,5 @@ -mindustry.png +sprites.png size: 512,32 format: RGBA8888 filter: Nearest,Nearest diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png new file mode 100644 index 0000000000..8ffc4f6024 Binary files /dev/null and b/core/assets/sprites/sprites.png differ diff --git a/android/assets/ui/backup/uiskin.atlas b/core/assets/ui/backup/uiskin.atlas similarity index 100% rename from android/assets/ui/backup/uiskin.atlas rename to core/assets/ui/backup/uiskin.atlas diff --git a/android/assets/ui/backup/uiskin.png b/core/assets/ui/backup/uiskin.png similarity index 100% rename from android/assets/ui/backup/uiskin.png rename to core/assets/ui/backup/uiskin.png diff --git a/android/assets/ui/prose.fnt b/core/assets/ui/prose.fnt similarity index 100% rename from android/assets/ui/prose.fnt rename to core/assets/ui/prose.fnt diff --git a/android/assets/ui/prose.png b/core/assets/ui/prose.png similarity index 100% rename from android/assets/ui/prose.png rename to core/assets/ui/prose.png diff --git a/android/assets/ui/uiskin.atlas b/core/assets/ui/uiskin.atlas similarity index 100% rename from android/assets/ui/uiskin.atlas rename to core/assets/ui/uiskin.atlas diff --git a/android/assets/ui/uiskin.json b/core/assets/ui/uiskin.json similarity index 100% rename from android/assets/ui/uiskin.json rename to core/assets/ui/uiskin.json diff --git a/core/assets/ui/uiskin.png b/core/assets/ui/uiskin.png new file mode 100644 index 0000000000..657f6cafe6 Binary files /dev/null and b/core/assets/ui/uiskin.png differ diff --git a/core/build.gradle b/core/build.gradle index 6740168669..45f183a492 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -2,9 +2,22 @@ apply plugin: "java" sourceCompatibility = 1.8 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' sourceSets.main.java.srcDirs = ["src/"] + +def TEXPACK_DIR = "$System.env.TEXPACK_DIR" + +task packSprites(type: Exec){ + commandLine "java", "-cp", TEXPACK_DIR, "com.badlogic.gdx.tools.texturepacker.TexturePacker", "assets-raw/sprites/", "assets/sprites/", "sprites.atlas" +} + +task packUI(type: Exec){ + commandLine "java", "-cp", TEXPACK_DIR, "com.badlogic.gdx.tools.texturepacker.TexturePacker", "assets-raw/ui/", "assets/ui/", "uiskin.atlas" +} + +task pack(){ + dependsOn 'packSprites' + dependsOn 'packUI' +} + eclipse.project { name = appName + "-core" -} -dependencies { - compile files('lib/ucore.jar') } \ No newline at end of file diff --git a/core/src/io/anuke/mindustry/Control.java b/core/src/io/anuke/mindustry/Control.java index 1999dde58b..c8e79f03f7 100644 --- a/core/src/io/anuke/mindustry/Control.java +++ b/core/src/io/anuke/mindustry/Control.java @@ -56,7 +56,7 @@ public class Control extends RendererModule{ Draw.addSurface("shadow", cameraScale); - atlas = new Atlas("mindustry.atlas"); + atlas = new Atlas("sprites.atlas"); Sounds.load("shoot.wav", "place.wav", "explosion.wav", "enemyshoot.wav", "corexplode.wav", "break.wav", "spawn.wav", "flame.wav", "die.wav", diff --git a/core/src/io/anuke/mindustry/UI.java b/core/src/io/anuke/mindustry/UI.java index 019726d483..4969d1c92f 100644 --- a/core/src/io/anuke/mindustry/UI.java +++ b/core/src/io/anuke/mindustry/UI.java @@ -62,7 +62,7 @@ public class UI extends SceneModule{ Dialog.closePadT = 4; Textures.load("sprites/"); - Textures.repeatWrap("conveyor", "conveyort", "back"); + Textures.repeatWrap("conveyort", "back"); } void drawBackground(){ @@ -400,12 +400,14 @@ public class UI extends SceneModule{ new button("Play", () -> { levels.show(); }); - - row(); - new button("Load Game", () -> { - load.show(); - }); + if(Gdx.app.getType() != ApplicationType.WebGL){ + row(); + + new button("Load Game", () -> { + load.show(); + }); + } row(); diff --git a/core/src/io/anuke/mindustry/io/SaveIO.java b/core/src/io/anuke/mindustry/io/SaveIO.java index ccdd39e6e8..121528d128 100644 --- a/core/src/io/anuke/mindustry/io/SaveIO.java +++ b/core/src/io/anuke/mindustry/io/SaveIO.java @@ -1,9 +1,10 @@ package io.anuke.mindustry.io; +import static io.anuke.mindustry.Vars.android; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import java.text.SimpleDateFormat; import java.util.Date; import com.badlogic.gdx.Gdx; @@ -66,6 +67,7 @@ import io.anuke.ucore.entities.Entity; * Tile type (boolean)- whether the block has a tile entity attached * Block ID - the block ID * (the following only applies to tile entity blocks) + * Block rotation (byte) * Block health (int) * Amount of items (byte) * (item list) @@ -75,9 +77,9 @@ import io.anuke.ucore.entities.Entity; */ public class SaveIO{ /**Save file version ID. Should be incremented every breaking release.*/ - private static final int fileVersionID = 0; + private static final int fileVersionID = 2; - private static final SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss"); + private static FormatProvider provider = null; //TODO automatic registration of types? private static final ObjectMap, Byte> enemyIDs = new ObjectMap, Byte>(){{ @@ -113,7 +115,7 @@ public class SaveIO{ try(DataInputStream stream = new DataInputStream(fileFor(slot).read())){ stream.readInt(); Date date = new Date(stream.readLong()); - return format.format(date); + return provider.format(date); }catch (IOException e){ throw new RuntimeException(e); } @@ -123,6 +125,10 @@ public class SaveIO{ return Gdx.files.local("mindustry-saves/" + slot + ".mins"); } + public static void setFormatProvider(FormatProvider prov){ + provider = prov; + } + public static void write(FileHandle file){ try(DataOutputStream stream = new DataOutputStream(file.write(false))){ @@ -212,6 +218,7 @@ public class SaveIO{ stream.writeInt(tile.block().id); //block ID if(tile.entity != null){ + stream.writeByte(tile.rotation); stream.writeInt(tile.entity.health); //health stream.writeByte(tile.entity.items.size); //amount of items @@ -282,6 +289,8 @@ public class SaveIO{ //enemies + Entities.clear(); + int enemies = stream.readInt(); for(int i = 0; i < enemies; i ++){ @@ -304,6 +313,9 @@ public class SaveIO{ Vars.control.setWaveData(enemies, wave, wavetime); + if(!android) + Vars.player.add(); + //map int mapid = stream.readByte(); @@ -333,10 +345,12 @@ public class SaveIO{ tile.setBlock(Block.getByID(blockid)); if(hasEntity){ + int rotation = stream.readByte(); int health = stream.readInt(); int items = stream.readByte(); tile.entity.health = health; + tile.rotation = rotation; for(int j = 0; j < items; j ++){ int itemid = stream.readByte(); @@ -350,4 +364,8 @@ public class SaveIO{ throw new RuntimeException(e); } } + + public static interface FormatProvider{ + public String format(Date date); + } } diff --git a/core/src/io/anuke/mindustry/ui/LevelDialog.java b/core/src/io/anuke/mindustry/ui/LevelDialog.java index 55dc9604d7..873bc7378a 100644 --- a/core/src/io/anuke/mindustry/ui/LevelDialog.java +++ b/core/src/io/anuke/mindustry/ui/LevelDialog.java @@ -38,7 +38,7 @@ public class LevelDialog extends Dialog{ Timers.run(18, ()->{ Vars.ui.hideLoading(); }); - }); + }).pad(3).size(180, 44).units(Unit.dp); ButtonGroup mapgroup = new ButtonGroup<>(); diff --git a/core/src/io/anuke/mindustry/ui/MenuDialog.java b/core/src/io/anuke/mindustry/ui/MenuDialog.java index 2fb758cec0..cac0becb79 100644 --- a/core/src/io/anuke/mindustry/ui/MenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/MenuDialog.java @@ -2,11 +2,15 @@ package io.anuke.mindustry.ui; import static io.anuke.mindustry.Vars.ui; +import com.badlogic.gdx.Application.ApplicationType; +import com.badlogic.gdx.Gdx; + import io.anuke.mindustry.GameState; import io.anuke.mindustry.GameState.State; import io.anuke.mindustry.Vars; import io.anuke.ucore.scene.ui.ConfirmDialog; import io.anuke.ucore.scene.ui.Dialog; +import io.anuke.ucore.scene.ui.layout.Cell; import io.anuke.ucore.scene.ui.layout.Unit; public class MenuDialog extends Dialog{ @@ -38,22 +42,27 @@ public class MenuDialog extends Dialog{ }); } - content().row(); - content().addButton("Save Game", ()->{ - save.show(); - }); + if(Gdx.app.getType() != ApplicationType.WebGL){ + content().row(); + content().addButton("Save Game", ()->{ + save.show(); + }); - content().row(); - content().addButton("Load Game", ()->{ - load.show(); - }); + content().row(); + content().addButton("Load Game", ()->{ + load.show(); + }); + } content().row(); content().addButton("Back to menu", ()->{ new ConfirmDialog("Confirm", "Are you sure you want to quit?", ()->{ hide(); GameState.set(State.menu); - }).show(); + }){{ + for(Cell cell : getButtonTable().getCells()) + cell.pad(3).size(180, 44).units(Unit.dp); + }}.show(); }); } } diff --git a/core/src/io/anuke/mindustry/ui/TutorialDialog.java b/core/src/io/anuke/mindustry/ui/TutorialDialog.java index 12c36689a1..9892bfbb75 100644 --- a/core/src/io/anuke/mindustry/ui/TutorialDialog.java +++ b/core/src/io/anuke/mindustry/ui/TutorialDialog.java @@ -6,6 +6,7 @@ import io.anuke.mindustry.GameState; import io.anuke.mindustry.GameState.State; import io.anuke.ucore.core.Settings; import io.anuke.ucore.scene.ui.TextDialog; +import io.anuke.ucore.scene.ui.layout.Unit; public class TutorialDialog extends TextDialog{ @@ -23,7 +24,7 @@ public class TutorialDialog extends TextDialog{ getButtonTable().addButton("OK", ()->{ hide(); - }); + }).pad(2).size(180, 44).units(Unit.dp); content().pad(8); diff --git a/desktop/build.gradle b/desktop/build.gradle index 6372fb3d8c..b5ecc5798b 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -4,7 +4,9 @@ sourceCompatibility = 1.8 sourceSets.main.java.srcDirs = [ "src/" ] project.ext.mainClassName = "io.anuke.mindustry.desktop.DesktopLauncher" -project.ext.assetsDir = new File("../android/assets"); +project.ext.assetsDir = new File("../core/assets"); + +def PACKR_DIR = "/home/anuke/Documents/Packr/" task run(dependsOn: classes, type: JavaExec) { main = project.mainClassName @@ -36,6 +38,51 @@ task dist(type: Jar) { dist.dependsOn classes +task clearOut(type: Delete){ + delete "packr-out/" +} + +ext.getPlatform = { + if(project.gradle.startParameter.taskNames.size() == 0 || !project.gradle.startParameter.taskNames.first().contains("packr")) return; + + if (project.hasProperty("platform")) { + def lc = platform.toLowerCase() + if(lc.equals("windows")){ + return "windows64"; + }else if(lc.equals("linux")){ + return "linux64"; + }else if(lc.equals("mac")){ + return "mac"; + }else{ + throw new InvalidUserDataException("Invalid platform. Set platform with -Pplatform=windows/linux/mac"); + } + }else{ + throw new InvalidUserDataException("No platform defined. Set platform with -Pplatform=windows/linux/mac"); + } +} + +//note: call desktop:dist beforehand +task packrCmd(type: Exec) { + + copy{ + into PACKR_DIR + from "build/libs/desktop-1.0.jar" + } + + commandLine "java", "-jar", PACKR_DIR+"packr.jar", "--verbose", /*"--resources", project.ext.assetsDir,*/ "--platform", getPlatform(), "--executable", appName, "--output", "packr-out/", "--mainclass", project.ext.mainClassName, "--jdk", PACKR_DIR+"jdk-"+getPlatform()+".zip", "--classpath", + "--", PACKR_DIR+"config.json" + +} + +task packrZip(type: Zip) { + dependsOn "packrCmd" + finalizedBy "clearOut" + + from "packr-out/" + archiveName appName + "-" + getPlatform() + ".zip" + destinationDir(file("packr-export")) +} + eclipse { project { name = appName + "-desktop" diff --git a/desktop/gifexport/recording1493769807.gif b/desktop/gifexport/recording1493769807.gif new file mode 100644 index 0000000000..2599004947 Binary files /dev/null and b/desktop/gifexport/recording1493769807.gif differ diff --git a/desktop/gifexport/recording1493777288.gif b/desktop/gifexport/recording1493777288.gif new file mode 100644 index 0000000000..7b56bb911b Binary files /dev/null and b/desktop/gifexport/recording1493777288.gif differ diff --git a/desktop/gifexport/recording1493777471.gif b/desktop/gifexport/recording1493777471.gif new file mode 100644 index 0000000000..f08b941246 Binary files /dev/null and b/desktop/gifexport/recording1493777471.gif differ diff --git a/desktop/gifexport/recording1493777483.gif b/desktop/gifexport/recording1493777483.gif new file mode 100644 index 0000000000..5ec133ce18 Binary files /dev/null and b/desktop/gifexport/recording1493777483.gif differ diff --git a/desktop/gifexport/recording1493777703.gif b/desktop/gifexport/recording1493777703.gif new file mode 100644 index 0000000000..3578a6b898 Binary files /dev/null and b/desktop/gifexport/recording1493777703.gif differ diff --git a/desktop/mindustry-saves/0.mins b/desktop/mindustry-saves/0.mins index 08e8cccaf3..fd2c5b9353 100644 Binary files a/desktop/mindustry-saves/0.mins and b/desktop/mindustry-saves/0.mins differ diff --git a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java index 6827911a6d..2bc63f2308 100644 --- a/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java +++ b/desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java @@ -1,9 +1,14 @@ package io.anuke.mindustry.desktop; +import java.text.SimpleDateFormat; +import java.util.Date; + import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application; import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration; import io.anuke.mindustry.Mindustry; +import io.anuke.mindustry.io.SaveIO; +import io.anuke.mindustry.io.SaveIO.FormatProvider; public class DesktopLauncher { public static void main (String[] arg) { @@ -12,6 +17,15 @@ public class DesktopLauncher { config.setMaximized(true); config.useVsync(false); config.setWindowedMode(800, 600); + + SaveIO.setFormatProvider(new FormatProvider(){ + SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss"); + + public String format(Date date){ + return format.format(date); + } + }); + new Lwjgl3Application(new Mindustry(), config); } } diff --git a/html/build.gradle b/html/build.gradle index 49138f23a7..3a564c47a6 100644 --- a/html/build.gradle +++ b/html/build.gradle @@ -1,5 +1,5 @@ apply plugin: "java" -apply plugin: "jetty" +apply plugin: 'org.akhikhl.gretty' gwt { gwtVersion='2.8.0' // Should match the gwt version used for building the gwt backend @@ -50,12 +50,20 @@ task dist(dependsOn: [clean, compileGwt]) { } } +task distZip(type: Zip, dependsOn: dist){ + from "build/dist" + archiveName appName + "-html5.zip" + destinationDir(file("build/dist-zipped")) +} + draftWar { from "war" } -task addSource << { - sourceSets.main.compileClasspath += files(project(':core').sourceSets.main.allJava.srcDirs) +task addSource{ + doLast{ + sourceSets.main.compileClasspath += files(project(':core').sourceSets.main.allJava.srcDirs) + } } tasks.compileGwt.dependsOn(addSource) diff --git a/html/src/io/anuke/mindustry/GdxDefinition.gwt.xml b/html/src/io/anuke/mindustry/GdxDefinition.gwt.xml index d79d1ffccc..5744fc9945 100644 --- a/html/src/io/anuke/mindustry/GdxDefinition.gwt.xml +++ b/html/src/io/anuke/mindustry/GdxDefinition.gwt.xml @@ -9,5 +9,5 @@ - + diff --git a/html/src/io/anuke/mindustry/client/HtmlLauncher.java b/html/src/io/anuke/mindustry/client/HtmlLauncher.java index a162763b88..4eb1d891d3 100644 --- a/html/src/io/anuke/mindustry/client/HtmlLauncher.java +++ b/html/src/io/anuke/mindustry/client/HtmlLauncher.java @@ -1,5 +1,7 @@ package io.anuke.mindustry.client; +import java.util.Date; + import com.badlogic.gdx.ApplicationListener; import com.badlogic.gdx.backends.gwt.GwtApplication; import com.badlogic.gdx.backends.gwt.GwtApplicationConfiguration; @@ -9,6 +11,8 @@ import com.google.gwt.user.client.ui.HasVerticalAlignment; import com.google.gwt.user.client.ui.VerticalPanel; import io.anuke.mindustry.Mindustry; +import io.anuke.mindustry.io.SaveIO; +import io.anuke.mindustry.io.SaveIO.FormatProvider; public class HtmlLauncher extends GwtApplication { static final int WIDTH = 800; @@ -49,6 +53,14 @@ public class HtmlLauncher extends GwtApplication { setupResizeHook(); } }); + + SaveIO.setFormatProvider(new FormatProvider(){ + + public String format(Date date){ + return "saving not supported"; + } + }); + return new Mindustry(); } diff --git a/ui/blank.png b/ui/blank.png deleted file mode 100644 index b2f9501f47..0000000000 Binary files a/ui/blank.png and /dev/null differ diff --git a/ui/border-circle-error.png b/ui/border-circle-error.png deleted file mode 100644 index 6aaeb4ecba..0000000000 Binary files a/ui/border-circle-error.png and /dev/null differ diff --git a/ui/border-circle.png b/ui/border-circle.png deleted file mode 100644 index 1d9c9bb057..0000000000 Binary files a/ui/border-circle.png and /dev/null differ diff --git a/ui/border-dark-blue.9.png b/ui/border-dark-blue.9.png deleted file mode 100644 index 59a7443282..0000000000 Binary files a/ui/border-dark-blue.9.png and /dev/null differ diff --git a/ui/border-error.9.png b/ui/border-error.9.png deleted file mode 100644 index 996a663927..0000000000 Binary files a/ui/border-error.9.png and /dev/null differ diff --git a/ui/border-white.9.png b/ui/border-white.9.png deleted file mode 100644 index e5d219eef9..0000000000 Binary files a/ui/border-white.9.png and /dev/null differ diff --git a/ui/border.9.png b/ui/border.9.png deleted file mode 100644 index 6e0dea69e0..0000000000 Binary files a/ui/border.9.png and /dev/null differ diff --git a/ui/bump.9.png b/ui/bump.9.png deleted file mode 100644 index 12a1b3d66b..0000000000 Binary files a/ui/bump.9.png and /dev/null differ diff --git a/ui/button-blue-down.9.png b/ui/button-blue-down.9.png deleted file mode 100644 index bd14b14179..0000000000 Binary files a/ui/button-blue-down.9.png and /dev/null differ diff --git a/ui/button-blue-over.9.png b/ui/button-blue-over.9.png deleted file mode 100644 index 071dc99259..0000000000 Binary files a/ui/button-blue-over.9.png and /dev/null differ diff --git a/ui/button-blue.9.png b/ui/button-blue.9.png deleted file mode 100644 index 7364829a7a..0000000000 Binary files a/ui/button-blue.9.png and /dev/null differ diff --git a/ui/button-down.9.png b/ui/button-down.9.png deleted file mode 100644 index dd54656563..0000000000 Binary files a/ui/button-down.9.png and /dev/null differ diff --git a/ui/button-gray-over.9.png b/ui/button-gray-over.9.png deleted file mode 100644 index 31a904acba..0000000000 Binary files a/ui/button-gray-over.9.png and /dev/null differ diff --git a/ui/button-gray.9.png b/ui/button-gray.9.png deleted file mode 100644 index d47e70b84f..0000000000 Binary files a/ui/button-gray.9.png and /dev/null differ diff --git a/ui/button-map-down.9.png b/ui/button-map-down.9.png deleted file mode 100644 index b34035f63c..0000000000 Binary files a/ui/button-map-down.9.png and /dev/null differ diff --git a/ui/button-map-over.9.png b/ui/button-map-over.9.png deleted file mode 100644 index 02b2542e97..0000000000 Binary files a/ui/button-map-over.9.png and /dev/null differ diff --git a/ui/button-map.9.png b/ui/button-map.9.png deleted file mode 100644 index 0162270254..0000000000 Binary files a/ui/button-map.9.png and /dev/null differ diff --git a/ui/button-over.9.png b/ui/button-over.9.png deleted file mode 100644 index 9d1144c6ac..0000000000 Binary files a/ui/button-over.9.png and /dev/null differ diff --git a/ui/button-red.9.png b/ui/button-red.9.png deleted file mode 100644 index 1bebf700e4..0000000000 Binary files a/ui/button-red.9.png and /dev/null differ diff --git a/ui/button-select.9.png b/ui/button-select.9.png deleted file mode 100644 index 4d793ce8fe..0000000000 Binary files a/ui/button-select.9.png and /dev/null differ diff --git a/ui/button-window-bg.9.png b/ui/button-window-bg.9.png deleted file mode 100644 index 564a70a904..0000000000 Binary files a/ui/button-window-bg.9.png and /dev/null differ diff --git a/ui/button-window-over.9.png b/ui/button-window-over.9.png deleted file mode 100644 index 2e45f28378..0000000000 Binary files a/ui/button-window-over.9.png and /dev/null differ diff --git a/ui/button.9.png b/ui/button.9.png deleted file mode 100644 index e3f0d440f2..0000000000 Binary files a/ui/button.9.png and /dev/null differ diff --git a/ui/check-off.png b/ui/check-off.png deleted file mode 100644 index d73a1a6e1f..0000000000 Binary files a/ui/check-off.png and /dev/null differ diff --git a/ui/check-on.png b/ui/check-on.png deleted file mode 100644 index f1d36ec60c..0000000000 Binary files a/ui/check-on.png and /dev/null differ diff --git a/ui/check-over.png b/ui/check-over.png deleted file mode 100644 index d0fe60dbba..0000000000 Binary files a/ui/check-over.png and /dev/null differ diff --git a/ui/clear.png b/ui/clear.png deleted file mode 100644 index a38cc5d663..0000000000 Binary files a/ui/clear.png and /dev/null differ diff --git a/ui/color-picker-bar-selector.png b/ui/color-picker-bar-selector.png deleted file mode 100644 index 84e626e0e2..0000000000 Binary files a/ui/color-picker-bar-selector.png and /dev/null differ diff --git a/ui/color-picker-cross.png b/ui/color-picker-cross.png deleted file mode 100644 index 70489c4919..0000000000 Binary files a/ui/color-picker-cross.png and /dev/null differ diff --git a/ui/color-picker-selector-horizontal.png b/ui/color-picker-selector-horizontal.png deleted file mode 100644 index 8b6025462f..0000000000 Binary files a/ui/color-picker-selector-horizontal.png and /dev/null differ diff --git a/ui/color-picker-selector-vertical.png b/ui/color-picker-selector-vertical.png deleted file mode 100644 index c36d51297c..0000000000 Binary files a/ui/color-picker-selector-vertical.png and /dev/null differ diff --git a/ui/cursor-normal.png b/ui/cursor-normal.png deleted file mode 100644 index 7724fe99db..0000000000 Binary files a/ui/cursor-normal.png and /dev/null differ diff --git a/ui/cursor.png b/ui/cursor.png deleted file mode 100644 index 67ff25cb9a..0000000000 Binary files a/ui/cursor.png and /dev/null differ diff --git a/ui/default-pane-no-border.9.png b/ui/default-pane-no-border.9.png deleted file mode 100644 index d2c3e66a49..0000000000 Binary files a/ui/default-pane-no-border.9.png and /dev/null differ diff --git a/ui/default-pane.9.png b/ui/default-pane.9.png deleted file mode 100644 index 6ff8c37650..0000000000 Binary files a/ui/default-pane.9.png and /dev/null differ diff --git a/ui/default-select-selection.9.png b/ui/default-select-selection.9.png deleted file mode 100644 index faa20b6bb8..0000000000 Binary files a/ui/default-select-selection.9.png and /dev/null differ diff --git a/ui/default-select.9.png b/ui/default-select.9.png deleted file mode 100644 index c837c8313e..0000000000 Binary files a/ui/default-select.9.png and /dev/null differ diff --git a/ui/grey.png b/ui/grey.png deleted file mode 100644 index d57b4a1bb5..0000000000 Binary files a/ui/grey.png and /dev/null differ diff --git a/ui/icon-cancel.png b/ui/icon-cancel.png deleted file mode 100644 index bf4c7ed9a0..0000000000 Binary files a/ui/icon-cancel.png and /dev/null differ diff --git a/ui/icon-check.png b/ui/icon-check.png deleted file mode 100644 index b3958fa59e..0000000000 Binary files a/ui/icon-check.png and /dev/null differ diff --git a/ui/icon-close-down.png b/ui/icon-close-down.png deleted file mode 100644 index 204c2eb911..0000000000 Binary files a/ui/icon-close-down.png and /dev/null differ diff --git a/ui/icon-close-over.png b/ui/icon-close-over.png deleted file mode 100644 index e526739fb6..0000000000 Binary files a/ui/icon-close-over.png and /dev/null differ diff --git a/ui/icon-close.png b/ui/icon-close.png deleted file mode 100644 index 02b26e0a25..0000000000 Binary files a/ui/icon-close.png and /dev/null differ diff --git a/ui/icon-defense.png b/ui/icon-defense.png deleted file mode 100644 index 003074bc56..0000000000 Binary files a/ui/icon-defense.png and /dev/null differ diff --git a/ui/icon-distribution.png b/ui/icon-distribution.png deleted file mode 100644 index 0c1ea5112e..0000000000 Binary files a/ui/icon-distribution.png and /dev/null differ diff --git a/ui/icon-production.png b/ui/icon-production.png deleted file mode 100644 index 2191bedfac..0000000000 Binary files a/ui/icon-production.png and /dev/null differ diff --git a/ui/icon-rotate.png b/ui/icon-rotate.png deleted file mode 100644 index 50ca4688dd..0000000000 Binary files a/ui/icon-rotate.png and /dev/null differ diff --git a/ui/list-selection.png b/ui/list-selection.png deleted file mode 100644 index c31c5175b0..0000000000 Binary files a/ui/list-selection.png and /dev/null differ diff --git a/ui/menu-bg.png b/ui/menu-bg.png deleted file mode 100644 index d57b4a1bb5..0000000000 Binary files a/ui/menu-bg.png and /dev/null differ diff --git a/ui/padded-list-selection.9.png b/ui/padded-list-selection.9.png deleted file mode 100644 index 9e6045b908..0000000000 Binary files a/ui/padded-list-selection.9.png and /dev/null differ diff --git a/ui/progressbar-filled-vertical.png b/ui/progressbar-filled-vertical.png deleted file mode 100644 index 6713cc9ea9..0000000000 Binary files a/ui/progressbar-filled-vertical.png and /dev/null differ diff --git a/ui/progressbar-filled.png b/ui/progressbar-filled.png deleted file mode 100644 index 50f58e3535..0000000000 Binary files a/ui/progressbar-filled.png and /dev/null differ diff --git a/ui/progressbar-vertical.png b/ui/progressbar-vertical.png deleted file mode 100644 index adeec047fe..0000000000 Binary files a/ui/progressbar-vertical.png and /dev/null differ diff --git a/ui/progressbar.png b/ui/progressbar.png deleted file mode 100644 index 439795f5d5..0000000000 Binary files a/ui/progressbar.png and /dev/null differ diff --git a/ui/radio-off.png b/ui/radio-off.png deleted file mode 100644 index 6b418cf4ea..0000000000 Binary files a/ui/radio-off.png and /dev/null differ diff --git a/ui/radio-on.png b/ui/radio-on.png deleted file mode 100644 index 8192c2d22f..0000000000 Binary files a/ui/radio-on.png and /dev/null differ diff --git a/ui/scroll-horizontal.9.png b/ui/scroll-horizontal.9.png deleted file mode 100644 index 6569566c4b..0000000000 Binary files a/ui/scroll-horizontal.9.png and /dev/null differ diff --git a/ui/scroll-knob-horizontal.9.png b/ui/scroll-knob-horizontal.9.png deleted file mode 100644 index 2b898da798..0000000000 Binary files a/ui/scroll-knob-horizontal.9.png and /dev/null differ diff --git a/ui/scroll-knob-vertical.9.png b/ui/scroll-knob-vertical.9.png deleted file mode 100644 index 36f994e9c9..0000000000 Binary files a/ui/scroll-knob-vertical.9.png and /dev/null differ diff --git a/ui/scroll.9.png b/ui/scroll.9.png deleted file mode 100644 index efbaeea0e3..0000000000 Binary files a/ui/scroll.9.png and /dev/null differ diff --git a/ui/select-box-list-bg.png b/ui/select-box-list-bg.png deleted file mode 100644 index 640981b220..0000000000 Binary files a/ui/select-box-list-bg.png and /dev/null differ diff --git a/ui/select-down.png b/ui/select-down.png deleted file mode 100644 index 4390d83447..0000000000 Binary files a/ui/select-down.png and /dev/null differ diff --git a/ui/select-up.png b/ui/select-up.png deleted file mode 100644 index 67fcb85d76..0000000000 Binary files a/ui/select-up.png and /dev/null differ diff --git a/ui/selection.png b/ui/selection.png deleted file mode 100644 index e779aea9b1..0000000000 Binary files a/ui/selection.png and /dev/null differ diff --git a/ui/separator-menu.png b/ui/separator-menu.png deleted file mode 100644 index 5c633eb1c7..0000000000 Binary files a/ui/separator-menu.png and /dev/null differ diff --git a/ui/separator.png b/ui/separator.png deleted file mode 100644 index 114704cbce..0000000000 Binary files a/ui/separator.png and /dev/null differ diff --git a/ui/slider-knob-disabled.png b/ui/slider-knob-disabled.png deleted file mode 100644 index 7bbf8cabc5..0000000000 Binary files a/ui/slider-knob-disabled.png and /dev/null differ diff --git a/ui/slider-knob-down.png b/ui/slider-knob-down.png deleted file mode 100644 index 369c253da6..0000000000 Binary files a/ui/slider-knob-down.png and /dev/null differ diff --git a/ui/slider-knob-over.png b/ui/slider-knob-over.png deleted file mode 100644 index dce3813656..0000000000 Binary files a/ui/slider-knob-over.png and /dev/null differ diff --git a/ui/slider-knob.png b/ui/slider-knob.png deleted file mode 100644 index 9e7bd21cc6..0000000000 Binary files a/ui/slider-knob.png and /dev/null differ diff --git a/ui/slider-vertical.png b/ui/slider-vertical.png deleted file mode 100644 index e4139783a0..0000000000 Binary files a/ui/slider-vertical.png and /dev/null differ diff --git a/ui/slider.png b/ui/slider.png deleted file mode 100644 index 7986f4f53b..0000000000 Binary files a/ui/slider.png and /dev/null differ diff --git a/ui/slot.9.png b/ui/slot.9.png deleted file mode 100644 index 66d175ec16..0000000000 Binary files a/ui/slot.9.png and /dev/null differ diff --git a/ui/splitpane-over.png b/ui/splitpane-over.png deleted file mode 100644 index feaf4d9010..0000000000 Binary files a/ui/splitpane-over.png and /dev/null differ diff --git a/ui/splitpane-vertical-over.png b/ui/splitpane-vertical-over.png deleted file mode 100644 index 211cba34aa..0000000000 Binary files a/ui/splitpane-vertical-over.png and /dev/null differ diff --git a/ui/splitpane-vertical.png b/ui/splitpane-vertical.png deleted file mode 100644 index 4328d75f8d..0000000000 Binary files a/ui/splitpane-vertical.png and /dev/null differ diff --git a/ui/splitpane.png b/ui/splitpane.png deleted file mode 100644 index ff4820d685..0000000000 Binary files a/ui/splitpane.png and /dev/null differ diff --git a/ui/sub-menu.png b/ui/sub-menu.png deleted file mode 100644 index 43fe36b6b3..0000000000 Binary files a/ui/sub-menu.png and /dev/null differ diff --git a/ui/textfield-over.9.png b/ui/textfield-over.9.png deleted file mode 100644 index 3fe1f1ec4f..0000000000 Binary files a/ui/textfield-over.9.png and /dev/null differ diff --git a/ui/textfield.9.png b/ui/textfield.9.png deleted file mode 100644 index fda1b6679a..0000000000 Binary files a/ui/textfield.9.png and /dev/null differ diff --git a/ui/tooltip-bg.9.png b/ui/tooltip-bg.9.png deleted file mode 100644 index 00ddecbbb2..0000000000 Binary files a/ui/tooltip-bg.9.png and /dev/null differ diff --git a/ui/touchpad-knob.png b/ui/touchpad-knob.png deleted file mode 100644 index 48b9c26339..0000000000 Binary files a/ui/touchpad-knob.png and /dev/null differ diff --git a/ui/tree-minus.png b/ui/tree-minus.png deleted file mode 100644 index cbfe2436a5..0000000000 Binary files a/ui/tree-minus.png and /dev/null differ diff --git a/ui/tree-over.png b/ui/tree-over.png deleted file mode 100644 index 114704cbce..0000000000 Binary files a/ui/tree-over.png and /dev/null differ diff --git a/ui/tree-plus.png b/ui/tree-plus.png deleted file mode 100644 index 9aafc6b9c7..0000000000 Binary files a/ui/tree-plus.png and /dev/null differ diff --git a/ui/tree-selection.9.png b/ui/tree-selection.9.png deleted file mode 100644 index 9721e9ed9e..0000000000 Binary files a/ui/tree-selection.9.png and /dev/null differ diff --git a/ui/white.png b/ui/white.png deleted file mode 100644 index ba9bf827c1..0000000000 Binary files a/ui/white.png and /dev/null differ diff --git a/ui/window-bg.png b/ui/window-bg.png deleted file mode 100644 index 640981b220..0000000000 Binary files a/ui/window-bg.png and /dev/null differ diff --git a/ui/window-border-bg.9.png b/ui/window-border-bg.9.png deleted file mode 100644 index aba4bf1526..0000000000 Binary files a/ui/window-border-bg.9.png and /dev/null differ diff --git a/ui/window-gray.9.png b/ui/window-gray.9.png deleted file mode 100644 index 36c4fc6ca5..0000000000 Binary files a/ui/window-gray.9.png and /dev/null differ diff --git a/ui/window-noborder.9.png b/ui/window-noborder.9.png deleted file mode 100644 index e73c7cab58..0000000000 Binary files a/ui/window-noborder.9.png and /dev/null differ diff --git a/ui/window-resizable.9.png b/ui/window-resizable.9.png deleted file mode 100644 index 59839b9515..0000000000 Binary files a/ui/window-resizable.9.png and /dev/null differ diff --git a/ui/window.9.png b/ui/window.9.png deleted file mode 100644 index 8bb4f278ae..0000000000 Binary files a/ui/window.9.png and /dev/null differ