From cb81f0a8a194ceebaea880f9027635e6a27df69e Mon Sep 17 00:00:00 2001
From: Jérémy Zurcher <jeremy@asynk.ch>
Date: Fri, 18 Dec 2015 11:10:21 +0100
Subject: UI: merge menu and ui assets, AtlasRegion are known and provided by
 RustAndDust

---
 assets/build.gradle     |   6 ------
 assets/menu/from.png    | Bin 24482 -> 0 bytes
 assets/menu/ge-flag.png | Bin 5861 -> 0 bytes
 assets/menu/move.png    | Bin 6551 -> 0 bytes
 assets/menu/to.png      | Bin 23747 -> 0 bytes
 assets/menu/unit.png    | Bin 24810 -> 0 bytes
 assets/menu/us-flag.png | Bin 12159 -> 0 bytes
 assets/ui/from.png      | Bin 0 -> 24482 bytes
 assets/ui/ge-flag.png   | Bin 0 -> 5861 bytes
 assets/ui/move.png      | Bin 0 -> 6551 bytes
 assets/ui/to.png        | Bin 0 -> 23747 bytes
 assets/ui/unit.png      | Bin 0 -> 24810 bytes
 assets/ui/us-flag.png   | Bin 0 -> 12159 bytes
 13 files changed, 6 deletions(-)
 delete mode 100644 assets/menu/from.png
 delete mode 100644 assets/menu/ge-flag.png
 delete mode 100644 assets/menu/move.png
 delete mode 100644 assets/menu/to.png
 delete mode 100644 assets/menu/unit.png
 delete mode 100644 assets/menu/us-flag.png
 create mode 100644 assets/ui/from.png
 create mode 100644 assets/ui/ge-flag.png
 create mode 100644 assets/ui/move.png
 create mode 100644 assets/ui/to.png
 create mode 100644 assets/ui/unit.png
 create mode 100644 assets/ui/us-flag.png

(limited to 'assets')

diff --git a/assets/build.gradle b/assets/build.gradle
index a2defc5f..d44de996 100644
--- a/assets/build.gradle
+++ b/assets/build.gradle
@@ -36,12 +36,6 @@ task packUi(type: JavaExec) {
     args = ['../assets/ui', '../android/assets/data', 'ui']
 }
 
-task packMenu(type: JavaExec) {
-    main = 'com.badlogic.gdx.tools.texturepacker.TexturePacker'
-    classpath = configurations.texturePacker
-    args = ['../assets/menu', '../android/assets/data', 'menu']
-}
-
 task packHud(type: JavaExec) {
     main = 'com.badlogic.gdx.tools.texturepacker.TexturePacker'
     classpath = configurations.texturePacker
diff --git a/assets/menu/from.png b/assets/menu/from.png
deleted file mode 100644
index 11e51783..00000000
Binary files a/assets/menu/from.png and /dev/null differ
diff --git a/assets/menu/ge-flag.png b/assets/menu/ge-flag.png
deleted file mode 100644
index 076be812..00000000
Binary files a/assets/menu/ge-flag.png and /dev/null differ
diff --git a/assets/menu/move.png b/assets/menu/move.png
deleted file mode 100644
index ec975d60..00000000
Binary files a/assets/menu/move.png and /dev/null differ
diff --git a/assets/menu/to.png b/assets/menu/to.png
deleted file mode 100644
index e0767712..00000000
Binary files a/assets/menu/to.png and /dev/null differ
diff --git a/assets/menu/unit.png b/assets/menu/unit.png
deleted file mode 100644
index b8eedd0c..00000000
Binary files a/assets/menu/unit.png and /dev/null differ
diff --git a/assets/menu/us-flag.png b/assets/menu/us-flag.png
deleted file mode 100644
index 1f4b7546..00000000
Binary files a/assets/menu/us-flag.png and /dev/null differ
diff --git a/assets/ui/from.png b/assets/ui/from.png
new file mode 100644
index 00000000..11e51783
Binary files /dev/null and b/assets/ui/from.png differ
diff --git a/assets/ui/ge-flag.png b/assets/ui/ge-flag.png
new file mode 100644
index 00000000..076be812
Binary files /dev/null and b/assets/ui/ge-flag.png differ
diff --git a/assets/ui/move.png b/assets/ui/move.png
new file mode 100644
index 00000000..ec975d60
Binary files /dev/null and b/assets/ui/move.png differ
diff --git a/assets/ui/to.png b/assets/ui/to.png
new file mode 100644
index 00000000..e0767712
Binary files /dev/null and b/assets/ui/to.png differ
diff --git a/assets/ui/unit.png b/assets/ui/unit.png
new file mode 100644
index 00000000..b8eedd0c
Binary files /dev/null and b/assets/ui/unit.png differ
diff --git a/assets/ui/us-flag.png b/assets/ui/us-flag.png
new file mode 100644
index 00000000..1f4b7546
Binary files /dev/null and b/assets/ui/us-flag.png differ
-- 
cgit v1.2.3