From d5f62f16d56ba549376c7ed06665e308bf8074ff Mon Sep 17 00:00:00 2001
From: Jérémy Zurcher <jeremy@asynk.ch>
Date: Wed, 10 Dec 2014 11:29:42 +0100
Subject: data -> assets: use TexturePacker instead of packer plugin

---
 android/assets/data/hex-overlays.atlas  |   1 +
 android/assets/data/hex-overlays.png    | Bin 128366 -> 127676 bytes
 android/assets/data/hud.atlas           |  40 ++++++++++++++++++++------------
 android/assets/data/hud.png             | Bin 92625 -> 106716 bytes
 android/assets/data/icon.png            | Bin 0 -> 2319 bytes
 android/assets/data/unit-overlays.atlas |   1 +
 android/assets/data/unit-overlays.png   | Bin 68294 -> 66448 bytes
 android/assets/data/units.atlas         |   9 +++----
 android/assets/data/units.png           | Bin 510845 -> 510834 bytes
 android/assets/icon.png                 | Bin 2319 -> 0 bytes
 10 files changed, 32 insertions(+), 19 deletions(-)
 create mode 100644 android/assets/data/icon.png
 delete mode 100644 android/assets/icon.png

(limited to 'android')

diff --git a/android/assets/data/hex-overlays.atlas b/android/assets/data/hex-overlays.atlas
index 72fae150..0db67284 100644
--- a/android/assets/data/hex-overlays.atlas
+++ b/android/assets/data/hex-overlays.atlas
@@ -1,5 +1,6 @@
 
 hex-overlays.png
+size: 1024,512
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
diff --git a/android/assets/data/hex-overlays.png b/android/assets/data/hex-overlays.png
index 4a3a8ce5..07fcec4b 100644
Binary files a/android/assets/data/hex-overlays.png and b/android/assets/data/hex-overlays.png differ
diff --git a/android/assets/data/hud.atlas b/android/assets/data/hud.atlas
index 8acee993..46a30ec8 100644
--- a/android/assets/data/hud.atlas
+++ b/android/assets/data/hud.atlas
@@ -1,109 +1,119 @@
 
 hud.png
+size: 512,512
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
 aps
   rotate: false
-  xy: 370, 462
+  xy: 2, 2
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 attack
   rotate: false
-  xy: 324, 358
+  xy: 486, 435
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
+button
+  rotate: false
+  xy: 2, 52
+  size: 65, 64
+  split: 29, 29, 28, 27
+  pad: 19, 17, 15, 18
+  orig: 65, 64
+  offset: 0, 0
+  index: -1
 cancel
   rotate: false
-  xy: 2, 19
+  xy: 69, 68
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 defense
   rotate: false
-  xy: 134, 93
+  xy: 324, 357
   size: 24, 24
   orig: 24, 24
   offset: 0, 0
   index: -1
 disabled
   rotate: false
-  xy: 84, 69
+  xy: 242, 283
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 ge-flag
   rotate: false
-  xy: 2, 69
+  xy: 242, 333
   size: 80, 48
   orig: 80, 48
   offset: 0, 0
   index: -1
 ok
   rotate: false
-  xy: 52, 19
+  xy: 370, 411
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 promote
   rotate: false
-  xy: 242, 284
+  xy: 452, 461
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 reinforcement
   rotate: false
-  xy: 370, 412
+  xy: 119, 68
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 reinforcement-selected
   rotate: false
-  xy: 242, 384
+  xy: 242, 383
   size: 126, 126
   orig: 126, 126
   offset: 0, 0
   index: -1
 stars
   rotate: false
-  xy: 2, 2
+  xy: 420, 444
   size: 64, 15
   orig: 64, 15
   offset: 0, 0
   index: -1
 turns
   rotate: false
-  xy: 420, 462
+  xy: 242, 233
   size: 48, 48
   orig: 48, 48
   offset: 0, 0
   index: -1
 us-flag
   rotate: false
-  xy: 242, 334
+  xy: 370, 461
   size: 80, 48
   orig: 80, 48
   offset: 0, 0
   index: -1
 veteran-black
   rotate: false
-  xy: 2, 119
+  xy: 2, 118
   size: 118, 391
   orig: 118, 391
   offset: 0, 0
   index: -1
 veteran-white
   rotate: false
-  xy: 122, 119
+  xy: 122, 118
   size: 118, 391
   orig: 118, 391
   offset: 0, 0
diff --git a/android/assets/data/hud.png b/android/assets/data/hud.png
index a63077df..2adc5a02 100644
Binary files a/android/assets/data/hud.png and b/android/assets/data/hud.png differ
diff --git a/android/assets/data/icon.png b/android/assets/data/icon.png
new file mode 100644
index 00000000..eab1073f
Binary files /dev/null and b/android/assets/data/icon.png differ
diff --git a/android/assets/data/unit-overlays.atlas b/android/assets/data/unit-overlays.atlas
index 62b96740..580baa7d 100644
--- a/android/assets/data/unit-overlays.atlas
+++ b/android/assets/data/unit-overlays.atlas
@@ -1,5 +1,6 @@
 
 unit-overlays.png
+size: 512,256
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
diff --git a/android/assets/data/unit-overlays.png b/android/assets/data/unit-overlays.png
index ece1ebff..5949dd1e 100644
Binary files a/android/assets/data/unit-overlays.png and b/android/assets/data/unit-overlays.png differ
diff --git a/android/assets/data/units.atlas b/android/assets/data/units.atlas
index 041ba6e1..c544c65e 100644
--- a/android/assets/data/units.atlas
+++ b/android/assets/data/units.atlas
@@ -1,5 +1,6 @@
 
 units.png
+size: 1024,512
 format: RGBA8888
 filter: Nearest,Nearest
 repeat: none
@@ -33,14 +34,14 @@ ge-kingtiger
   index: -1
 ge-panzer-iv
   rotate: false
-  xy: 128, 69
+  xy: 2, 2
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 ge-panzer-iv-hq
   rotate: false
-  xy: 2, 2
+  xy: 128, 69
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
@@ -82,14 +83,14 @@ us-infantry
   index: -1
 us-pershing
   rotate: false
-  xy: 407, 221
+  xy: 281, 221
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
   index: -1
 us-pershing-hq
   rotate: false
-  xy: 281, 221
+  xy: 407, 221
   size: 124, 124
   orig: 124, 124
   offset: 0, 0
diff --git a/android/assets/data/units.png b/android/assets/data/units.png
index 1d78faca..af1e625f 100644
Binary files a/android/assets/data/units.png and b/android/assets/data/units.png differ
diff --git a/android/assets/icon.png b/android/assets/icon.png
deleted file mode 100644
index eab1073f..00000000
Binary files a/android/assets/icon.png and /dev/null differ
-- 
cgit v1.2.3