From 1b93697fe08dcd863a10186c04e350c6e285e27f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Sat, 4 Oct 2014 18:54:17 +0200
Subject: regroup all images in 1 atlas data/assets.*

---
 android/assets/data/assets.atlas                   | 306 +++++++++++++++++++++
 android/assets/data/assets.png                     | Bin 0 -> 999913 bytes
 android/assets/data/pawns.atlas                    | 236 ----------------
 android/assets/data/pawns.png                      | Bin 970713 -> 0 bytes
 build.gradle                                       |   2 +-
 core/src/ch/asynk/tankontank/TankOnTank.java       |   4 +-
 core/src/ch/asynk/tankontank/game/GameFactory.java |   2 +-
 data/assets/01_fog.png                             | Bin 0 -> 10897 bytes
 data/assets/02_blue.png                            | Bin 0 -> 10935 bytes
 data/assets/03_green.png                           | Bin 0 -> 10895 bytes
 data/assets/04_red.png                             | Bin 0 -> 10931 bytes
 data/assets/05_move.png                            | Bin 0 -> 11005 bytes
 data/assets/06_rose.png                            | Bin 0 -> 18135 bytes
 data/assets/ace.png                                | Bin 0 -> 17386 bytes
 data/assets/act-cancel-on.png                      | Bin 0 -> 4098 bytes
 data/assets/act-cancel.png                         | Bin 0 -> 5404 bytes
 data/assets/act-move-on.png                        | Bin 0 -> 3396 bytes
 data/assets/act-move.png                           | Bin 0 -> 3432 bytes
 data/assets/act-rotate-on.png                      | Bin 0 -> 446 bytes
 data/assets/act-rotate.png                         | Bin 0 -> 929 bytes
 data/assets/act-target-on.png                      | Bin 0 -> 488 bytes
 data/assets/act-target.png                         | Bin 0 -> 876 bytes
 data/assets/ap1.png                                | Bin 0 -> 20533 bytes
 data/assets/ap2.png                                | Bin 0 -> 22626 bytes
 data/assets/ap3.png                                | Bin 0 -> 22565 bytes
 data/assets/ap4.png                                | Bin 0 -> 22101 bytes
 data/assets/ap_spent.png                           | Bin 0 -> 24185 bytes
 data/assets/back.png                               | Bin 0 -> 17872 bytes
 data/assets/disabled.png                           | Bin 0 -> 367 bytes
 data/assets/ge-at-gun.png                          | Bin 0 -> 24241 bytes
 data/assets/ge-flag.png                            | Bin 0 -> 2428 bytes
 data/assets/ge-infantry.png                        | Bin 0 -> 24975 bytes
 data/assets/ge-kingtiger.png                       | Bin 0 -> 21611 bytes
 data/assets/ge-panzer-iv-hq.png                    | Bin 0 -> 24495 bytes
 data/assets/ge-panzer-iv.png                       | Bin 0 -> 23997 bytes
 data/assets/ge-tiger.png                           | Bin 0 -> 22277 bytes
 data/assets/ge-wespe.png                           | Bin 0 -> 23084 bytes
 data/assets/head.png                               | Bin 0 -> 37904 bytes
 data/assets/turn_back.png                          | Bin 0 -> 18221 bytes
 data/assets/turn_front.png                         | Bin 0 -> 17210 bytes
 data/assets/us-at-gun.png                          | Bin 0 -> 24693 bytes
 data/assets/us-flag.png                            | Bin 0 -> 5076 bytes
 data/assets/us-infantry.png                        | Bin 0 -> 26139 bytes
 data/assets/us-pershing-hq.png                     | Bin 0 -> 24763 bytes
 data/assets/us-pershing.png                        | Bin 0 -> 29109 bytes
 data/assets/us-priest.png                          | Bin 0 -> 24587 bytes
 data/assets/us-sherman-head.png                    | Bin 0 -> 24591 bytes
 data/assets/us-sherman-hq.png                      | Bin 0 -> 25383 bytes
 data/assets/us-sherman.png                         | Bin 0 -> 4044 bytes
 data/assets/us-wolverine.png                       | Bin 0 -> 25188 bytes
 data/pawns/01_fog.png                              | Bin 10897 -> 0 bytes
 data/pawns/02_blue.png                             | Bin 10935 -> 0 bytes
 data/pawns/03_green.png                            | Bin 10895 -> 0 bytes
 data/pawns/04_red.png                              | Bin 10931 -> 0 bytes
 data/pawns/05_move.png                             | Bin 11005 -> 0 bytes
 data/pawns/06_rose.png                             | Bin 18135 -> 0 bytes
 data/pawns/ace.png                                 | Bin 17386 -> 0 bytes
 data/pawns/ap1.png                                 | Bin 20533 -> 0 bytes
 data/pawns/ap2.png                                 | Bin 22626 -> 0 bytes
 data/pawns/ap3.png                                 | Bin 22565 -> 0 bytes
 data/pawns/ap4.png                                 | Bin 22101 -> 0 bytes
 data/pawns/ap_spent.png                            | Bin 24185 -> 0 bytes
 data/pawns/back.png                                | Bin 17872 -> 0 bytes
 data/pawns/disabled.png                            | Bin 367 -> 0 bytes
 data/pawns/ge-at-gun.png                           | Bin 24241 -> 0 bytes
 data/pawns/ge-infantry.png                         | Bin 24975 -> 0 bytes
 data/pawns/ge-kingtiger.png                        | Bin 21611 -> 0 bytes
 data/pawns/ge-panzer-iv-hq.png                     | Bin 24495 -> 0 bytes
 data/pawns/ge-panzer-iv.png                        | Bin 23997 -> 0 bytes
 data/pawns/ge-tiger.png                            | Bin 22277 -> 0 bytes
 data/pawns/ge-wespe.png                            | Bin 23084 -> 0 bytes
 data/pawns/head.png                                | Bin 37904 -> 0 bytes
 data/pawns/turn_back.png                           | Bin 18221 -> 0 bytes
 data/pawns/turn_front.png                          | Bin 17210 -> 0 bytes
 data/pawns/us-at-gun.png                           | Bin 24693 -> 0 bytes
 data/pawns/us-infantry.png                         | Bin 26139 -> 0 bytes
 data/pawns/us-pershing-hq.png                      | Bin 24763 -> 0 bytes
 data/pawns/us-pershing.png                         | Bin 29109 -> 0 bytes
 data/pawns/us-priest.png                           | Bin 24587 -> 0 bytes
 data/pawns/us-sherman-head.png                     | Bin 24591 -> 0 bytes
 data/pawns/us-sherman-hq.png                       | Bin 25383 -> 0 bytes
 data/pawns/us-sherman.png                          | Bin 4044 -> 0 bytes
 data/pawns/us-wolverine.png                        | Bin 25188 -> 0 bytes
 83 files changed, 310 insertions(+), 240 deletions(-)
 create mode 100644 android/assets/data/assets.atlas
 create mode 100644 android/assets/data/assets.png
 delete mode 100644 android/assets/data/pawns.atlas
 delete mode 100644 android/assets/data/pawns.png
 create mode 100644 data/assets/01_fog.png
 create mode 100644 data/assets/02_blue.png
 create mode 100644 data/assets/03_green.png
 create mode 100644 data/assets/04_red.png
 create mode 100644 data/assets/05_move.png
 create mode 100644 data/assets/06_rose.png
 create mode 100644 data/assets/ace.png
 create mode 100644 data/assets/act-cancel-on.png
 create mode 100644 data/assets/act-cancel.png
 create mode 100644 data/assets/act-move-on.png
 create mode 100644 data/assets/act-move.png
 create mode 100644 data/assets/act-rotate-on.png
 create mode 100644 data/assets/act-rotate.png
 create mode 100644 data/assets/act-target-on.png
 create mode 100644 data/assets/act-target.png
 create mode 100644 data/assets/ap1.png
 create mode 100644 data/assets/ap2.png
 create mode 100644 data/assets/ap3.png
 create mode 100644 data/assets/ap4.png
 create mode 100644 data/assets/ap_spent.png
 create mode 100644 data/assets/back.png
 create mode 100644 data/assets/disabled.png
 create mode 100644 data/assets/ge-at-gun.png
 create mode 100644 data/assets/ge-flag.png
 create mode 100644 data/assets/ge-infantry.png
 create mode 100644 data/assets/ge-kingtiger.png
 create mode 100644 data/assets/ge-panzer-iv-hq.png
 create mode 100644 data/assets/ge-panzer-iv.png
 create mode 100644 data/assets/ge-tiger.png
 create mode 100644 data/assets/ge-wespe.png
 create mode 100644 data/assets/head.png
 create mode 100644 data/assets/turn_back.png
 create mode 100644 data/assets/turn_front.png
 create mode 100644 data/assets/us-at-gun.png
 create mode 100644 data/assets/us-flag.png
 create mode 100644 data/assets/us-infantry.png
 create mode 100644 data/assets/us-pershing-hq.png
 create mode 100644 data/assets/us-pershing.png
 create mode 100644 data/assets/us-priest.png
 create mode 100644 data/assets/us-sherman-head.png
 create mode 100644 data/assets/us-sherman-hq.png
 create mode 100644 data/assets/us-sherman.png
 create mode 100644 data/assets/us-wolverine.png
 delete mode 100644 data/pawns/01_fog.png
 delete mode 100644 data/pawns/02_blue.png
 delete mode 100644 data/pawns/03_green.png
 delete mode 100644 data/pawns/04_red.png
 delete mode 100644 data/pawns/05_move.png
 delete mode 100644 data/pawns/06_rose.png
 delete mode 100644 data/pawns/ace.png
 delete mode 100644 data/pawns/ap1.png
 delete mode 100644 data/pawns/ap2.png
 delete mode 100644 data/pawns/ap3.png
 delete mode 100644 data/pawns/ap4.png
 delete mode 100644 data/pawns/ap_spent.png
 delete mode 100644 data/pawns/back.png
 delete mode 100644 data/pawns/disabled.png
 delete mode 100644 data/pawns/ge-at-gun.png
 delete mode 100644 data/pawns/ge-infantry.png
 delete mode 100644 data/pawns/ge-kingtiger.png
 delete mode 100644 data/pawns/ge-panzer-iv-hq.png
 delete mode 100644 data/pawns/ge-panzer-iv.png
 delete mode 100644 data/pawns/ge-tiger.png
 delete mode 100644 data/pawns/ge-wespe.png
 delete mode 100644 data/pawns/head.png
 delete mode 100644 data/pawns/turn_back.png
 delete mode 100644 data/pawns/turn_front.png
 delete mode 100644 data/pawns/us-at-gun.png
 delete mode 100644 data/pawns/us-infantry.png
 delete mode 100644 data/pawns/us-pershing-hq.png
 delete mode 100644 data/pawns/us-pershing.png
 delete mode 100644 data/pawns/us-priest.png
 delete mode 100644 data/pawns/us-sherman-head.png
 delete mode 100644 data/pawns/us-sherman-hq.png
 delete mode 100644 data/pawns/us-sherman.png
 delete mode 100644 data/pawns/us-wolverine.png

diff --git a/android/assets/data/assets.atlas b/android/assets/data/assets.atlas
new file mode 100644
index 0000000..5da3b9c
--- /dev/null
+++ b/android/assets/data/assets.atlas
@@ -0,0 +1,306 @@
+
+assets.png
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none
+01_fog
+  rotate: false
+  xy: 2, 539
+  size: 190, 217
+  orig: 190, 217
+  offset: 0, 0
+  index: -1
+02_blue
+  rotate: false
+  xy: 234, 781
+  size: 190, 217
+  orig: 190, 217
+  offset: 0, 0
+  index: -1
+03_green
+  rotate: false
+  xy: 2, 320
+  size: 190, 217
+  orig: 190, 217
+  offset: 0, 0
+  index: -1
+04_red
+  rotate: false
+  xy: 426, 781
+  size: 190, 217
+  orig: 190, 217
+  offset: 0, 0
+  index: -1
+05_move
+  rotate: false
+  xy: 2, 101
+  size: 190, 217
+  orig: 190, 217
+  offset: 0, 0
+  index: -1
+06_rose
+  rotate: false
+  xy: 2, 758
+  size: 230, 240
+  orig: 230, 240
+  offset: 0, 0
+  index: -1
+ace
+  rotate: false
+  xy: 194, 632
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+act-cancel
+  rotate: false
+  xy: 962, 699
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+act-cancel-on
+  rotate: false
+  xy: 962, 761
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+act-move
+  rotate: false
+  xy: 698, 657
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+act-move-on
+  rotate: false
+  xy: 962, 637
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+act-rotate
+  rotate: false
+  xy: 698, 595
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+act-rotate-on
+  rotate: false
+  xy: 104, 39
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+act-target
+  rotate: false
+  xy: 698, 471
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+act-target-on
+  rotate: false
+  xy: 698, 533
+  size: 60, 60
+  orig: 60, 60
+  offset: 0, 0
+  index: -1
+ap1
+  rotate: false
+  xy: 194, 506
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ap2
+  rotate: false
+  xy: 194, 380
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ap3
+  rotate: false
+  xy: 194, 254
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ap4
+  rotate: false
+  xy: 194, 128
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ap_spent
+  rotate: false
+  xy: 320, 655
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+back
+  rotate: false
+  xy: 320, 529
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+disabled
+  rotate: false
+  xy: 446, 655
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ge-at-gun
+  rotate: false
+  xy: 320, 403
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ge-flag
+  rotate: false
+  xy: 2, 39
+  size: 100, 60
+  orig: 100, 60
+  offset: 0, 0
+  index: -1
+ge-infantry
+  rotate: false
+  xy: 446, 529
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ge-kingtiger
+  rotate: false
+  xy: 572, 655
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ge-panzer-iv
+  rotate: false
+  xy: 446, 403
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ge-panzer-iv-hq
+  rotate: false
+  xy: 320, 277
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ge-tiger
+  rotate: false
+  xy: 572, 529
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+ge-wespe
+  rotate: false
+  xy: 320, 151
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+head
+  rotate: false
+  xy: 810, 823
+  size: 175, 175
+  orig: 175, 175
+  offset: 0, 0
+  index: -1
+turn_back
+  rotate: false
+  xy: 446, 277
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+turn_front
+  rotate: false
+  xy: 572, 403
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+us-at-gun
+  rotate: false
+  xy: 446, 151
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+us-flag
+  rotate: false
+  xy: 698, 719
+  size: 100, 60
+  orig: 100, 60
+  offset: 0, 0
+  index: -1
+us-infantry
+  rotate: false
+  xy: 572, 277
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+us-pershing
+  rotate: false
+  xy: 194, 2
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+us-pershing-hq
+  rotate: false
+  xy: 572, 151
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+us-priest
+  rotate: false
+  xy: 320, 25
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+us-sherman
+  rotate: false
+  xy: 618, 781
+  size: 190, 217
+  orig: 190, 217
+  offset: 0, 0
+  index: -1
+us-sherman-head
+  rotate: false
+  xy: 810, 671
+  size: 150, 150
+  orig: 150, 150
+  offset: 0, 0
+  index: -1
+us-sherman-hq
+  rotate: false
+  xy: 446, 25
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
+us-wolverine
+  rotate: false
+  xy: 572, 25
+  size: 124, 124
+  orig: 124, 124
+  offset: 0, 0
+  index: -1
diff --git a/android/assets/data/assets.png b/android/assets/data/assets.png
new file mode 100644
index 0000000..aef8022
Binary files /dev/null and b/android/assets/data/assets.png differ
diff --git a/android/assets/data/pawns.atlas b/android/assets/data/pawns.atlas
deleted file mode 100644
index 465dc19..0000000
--- a/android/assets/data/pawns.atlas
+++ /dev/null
@@ -1,236 +0,0 @@
-
-pawns.png
-format: RGBA8888
-filter: Nearest,Nearest
-repeat: none
-01_fog
-  rotate: false
-  xy: 2, 539
-  size: 190, 217
-  orig: 190, 217
-  offset: 0, 0
-  index: -1
-02_blue
-  rotate: false
-  xy: 234, 781
-  size: 190, 217
-  orig: 190, 217
-  offset: 0, 0
-  index: -1
-03_green
-  rotate: false
-  xy: 2, 320
-  size: 190, 217
-  orig: 190, 217
-  offset: 0, 0
-  index: -1
-04_red
-  rotate: false
-  xy: 426, 781
-  size: 190, 217
-  orig: 190, 217
-  offset: 0, 0
-  index: -1
-05_move
-  rotate: false
-  xy: 2, 101
-  size: 190, 217
-  orig: 190, 217
-  offset: 0, 0
-  index: -1
-06_rose
-  rotate: false
-  xy: 2, 758
-  size: 230, 240
-  orig: 230, 240
-  offset: 0, 0
-  index: -1
-ace
-  rotate: false
-  xy: 194, 632
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-ap1
-  rotate: false
-  xy: 194, 506
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-ap2
-  rotate: false
-  xy: 194, 380
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-ap3
-  rotate: false
-  xy: 194, 254
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-ap4
-  rotate: false
-  xy: 194, 128
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-ap_spent
-  rotate: false
-  xy: 320, 655
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-back
-  rotate: false
-  xy: 320, 529
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-disabled
-  rotate: false
-  xy: 446, 655
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-ge-at-gun
-  rotate: false
-  xy: 320, 403
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-ge-infantry
-  rotate: false
-  xy: 446, 529
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-ge-kingtiger
-  rotate: false
-  xy: 572, 655
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-ge-panzer-iv
-  rotate: false
-  xy: 446, 403
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-ge-panzer-iv-hq
-  rotate: false
-  xy: 320, 277
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-ge-tiger
-  rotate: false
-  xy: 572, 529
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-ge-wespe
-  rotate: false
-  xy: 320, 151
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-head
-  rotate: false
-  xy: 810, 823
-  size: 175, 175
-  orig: 175, 175
-  offset: 0, 0
-  index: -1
-turn_back
-  rotate: false
-  xy: 446, 277
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-turn_front
-  rotate: false
-  xy: 572, 403
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-us-at-gun
-  rotate: false
-  xy: 446, 151
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-us-infantry
-  rotate: false
-  xy: 572, 277
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-us-pershing
-  rotate: false
-  xy: 194, 2
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-us-pershing-hq
-  rotate: false
-  xy: 572, 151
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-us-priest
-  rotate: false
-  xy: 320, 25
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-us-sherman
-  rotate: false
-  xy: 618, 781
-  size: 190, 217
-  orig: 190, 217
-  offset: 0, 0
-  index: -1
-us-sherman-head
-  rotate: false
-  xy: 810, 671
-  size: 150, 150
-  orig: 150, 150
-  offset: 0, 0
-  index: -1
-us-sherman-hq
-  rotate: false
-  xy: 446, 25
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
-us-wolverine
-  rotate: false
-  xy: 572, 25
-  size: 124, 124
-  orig: 124, 124
-  offset: 0, 0
-  index: -1
diff --git a/android/assets/data/pawns.png b/android/assets/data/pawns.png
deleted file mode 100644
index 5accec8..0000000
Binary files a/android/assets/data/pawns.png and /dev/null differ
diff --git a/build.gradle b/build.gradle
index d59cbc7..80edebd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,7 +38,7 @@ allprojects {
         resourcesInputPath 'data'
         atlasesOutputPath 'android/assets/data/'
         atlases {
-            add 'pawns'
+            add 'assets'
         }
     }
 }
diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/tankontank/TankOnTank.java
index a9933bb..3ab9c74 100644
--- a/core/src/ch/asynk/tankontank/TankOnTank.java
+++ b/core/src/ch/asynk/tankontank/TankOnTank.java
@@ -32,7 +32,7 @@ public class TankOnTank extends Game
         Gdx.app.debug("TankOnTank", "  load assets : " + (Gdx.app.getJavaHeap()/1024.0f) + "KB");
         manager.load("data/map_a.png", Texture.class);
         manager.load("data/map_b.png", Texture.class);
-        manager.load("data/pawns.atlas", TextureAtlas.class);
+        manager.load("data/assets.atlas", TextureAtlas.class);
     }
 
     public void unloadAssets()
@@ -41,7 +41,7 @@ public class TankOnTank extends Game
         Gdx.app.debug("TankOnTank", "diagnostics:\n" + manager.getDiagnostics() );
         manager.unload("data/map_a.png");
         manager.unload("data/map_b.png");
-        manager.unload("data/pawns.atlas");
+        manager.unload("data/assets.atlas");
         Gdx.app.debug("TankOnTank", "diagnostics:\n" + manager.getDiagnostics() );
     }
 
diff --git a/core/src/ch/asynk/tankontank/game/GameFactory.java b/core/src/ch/asynk/tankontank/game/GameFactory.java
index fbc81be..110cbda 100644
--- a/core/src/ch/asynk/tankontank/game/GameFactory.java
+++ b/core/src/ch/asynk/tankontank/game/GameFactory.java
@@ -17,7 +17,7 @@ public class GameFactory implements Board.TileBuilder, Disposable
 
     public GameFactory(AssetManager manager)
     {
-        pawnAtlas = manager.get("data/pawns.atlas", TextureAtlas.class);
+        pawnAtlas = manager.get("data/assets.atlas", TextureAtlas.class);
     }
 
     @Override
diff --git a/data/assets/01_fog.png b/data/assets/01_fog.png
new file mode 100644
index 0000000..7d85d98
Binary files /dev/null and b/data/assets/01_fog.png differ
diff --git a/data/assets/02_blue.png b/data/assets/02_blue.png
new file mode 100644
index 0000000..12fcba8
Binary files /dev/null and b/data/assets/02_blue.png differ
diff --git a/data/assets/03_green.png b/data/assets/03_green.png
new file mode 100644
index 0000000..78b8f75
Binary files /dev/null and b/data/assets/03_green.png differ
diff --git a/data/assets/04_red.png b/data/assets/04_red.png
new file mode 100644
index 0000000..1320f4a
Binary files /dev/null and b/data/assets/04_red.png differ
diff --git a/data/assets/05_move.png b/data/assets/05_move.png
new file mode 100644
index 0000000..e0204a9
Binary files /dev/null and b/data/assets/05_move.png differ
diff --git a/data/assets/06_rose.png b/data/assets/06_rose.png
new file mode 100644
index 0000000..fd9c7b7
Binary files /dev/null and b/data/assets/06_rose.png differ
diff --git a/data/assets/ace.png b/data/assets/ace.png
new file mode 100644
index 0000000..f4f3240
Binary files /dev/null and b/data/assets/ace.png differ
diff --git a/data/assets/act-cancel-on.png b/data/assets/act-cancel-on.png
new file mode 100644
index 0000000..a8519aa
Binary files /dev/null and b/data/assets/act-cancel-on.png differ
diff --git a/data/assets/act-cancel.png b/data/assets/act-cancel.png
new file mode 100644
index 0000000..47d9762
Binary files /dev/null and b/data/assets/act-cancel.png differ
diff --git a/data/assets/act-move-on.png b/data/assets/act-move-on.png
new file mode 100644
index 0000000..98011af
Binary files /dev/null and b/data/assets/act-move-on.png differ
diff --git a/data/assets/act-move.png b/data/assets/act-move.png
new file mode 100644
index 0000000..ffc3112
Binary files /dev/null and b/data/assets/act-move.png differ
diff --git a/data/assets/act-rotate-on.png b/data/assets/act-rotate-on.png
new file mode 100644
index 0000000..0f42d25
Binary files /dev/null and b/data/assets/act-rotate-on.png differ
diff --git a/data/assets/act-rotate.png b/data/assets/act-rotate.png
new file mode 100644
index 0000000..3a3720f
Binary files /dev/null and b/data/assets/act-rotate.png differ
diff --git a/data/assets/act-target-on.png b/data/assets/act-target-on.png
new file mode 100644
index 0000000..e7432cd
Binary files /dev/null and b/data/assets/act-target-on.png differ
diff --git a/data/assets/act-target.png b/data/assets/act-target.png
new file mode 100644
index 0000000..1e2bf26
Binary files /dev/null and b/data/assets/act-target.png differ
diff --git a/data/assets/ap1.png b/data/assets/ap1.png
new file mode 100644
index 0000000..c47d15e
Binary files /dev/null and b/data/assets/ap1.png differ
diff --git a/data/assets/ap2.png b/data/assets/ap2.png
new file mode 100644
index 0000000..e89956a
Binary files /dev/null and b/data/assets/ap2.png differ
diff --git a/data/assets/ap3.png b/data/assets/ap3.png
new file mode 100644
index 0000000..7d1b11f
Binary files /dev/null and b/data/assets/ap3.png differ
diff --git a/data/assets/ap4.png b/data/assets/ap4.png
new file mode 100644
index 0000000..e897628
Binary files /dev/null and b/data/assets/ap4.png differ
diff --git a/data/assets/ap_spent.png b/data/assets/ap_spent.png
new file mode 100644
index 0000000..cb399d8
Binary files /dev/null and b/data/assets/ap_spent.png differ
diff --git a/data/assets/back.png b/data/assets/back.png
new file mode 100644
index 0000000..e7eb5ef
Binary files /dev/null and b/data/assets/back.png differ
diff --git a/data/assets/disabled.png b/data/assets/disabled.png
new file mode 100644
index 0000000..a5ad3d3
Binary files /dev/null and b/data/assets/disabled.png differ
diff --git a/data/assets/ge-at-gun.png b/data/assets/ge-at-gun.png
new file mode 100644
index 0000000..f81a4b1
Binary files /dev/null and b/data/assets/ge-at-gun.png differ
diff --git a/data/assets/ge-flag.png b/data/assets/ge-flag.png
new file mode 100644
index 0000000..53ab5aa
Binary files /dev/null and b/data/assets/ge-flag.png differ
diff --git a/data/assets/ge-infantry.png b/data/assets/ge-infantry.png
new file mode 100644
index 0000000..ef4cee9
Binary files /dev/null and b/data/assets/ge-infantry.png differ
diff --git a/data/assets/ge-kingtiger.png b/data/assets/ge-kingtiger.png
new file mode 100644
index 0000000..e45171b
Binary files /dev/null and b/data/assets/ge-kingtiger.png differ
diff --git a/data/assets/ge-panzer-iv-hq.png b/data/assets/ge-panzer-iv-hq.png
new file mode 100644
index 0000000..2785941
Binary files /dev/null and b/data/assets/ge-panzer-iv-hq.png differ
diff --git a/data/assets/ge-panzer-iv.png b/data/assets/ge-panzer-iv.png
new file mode 100644
index 0000000..35ab9c3
Binary files /dev/null and b/data/assets/ge-panzer-iv.png differ
diff --git a/data/assets/ge-tiger.png b/data/assets/ge-tiger.png
new file mode 100644
index 0000000..72e7b6c
Binary files /dev/null and b/data/assets/ge-tiger.png differ
diff --git a/data/assets/ge-wespe.png b/data/assets/ge-wespe.png
new file mode 100644
index 0000000..566e5b3
Binary files /dev/null and b/data/assets/ge-wespe.png differ
diff --git a/data/assets/head.png b/data/assets/head.png
new file mode 100644
index 0000000..a79a840
Binary files /dev/null and b/data/assets/head.png differ
diff --git a/data/assets/turn_back.png b/data/assets/turn_back.png
new file mode 100644
index 0000000..3f681d8
Binary files /dev/null and b/data/assets/turn_back.png differ
diff --git a/data/assets/turn_front.png b/data/assets/turn_front.png
new file mode 100644
index 0000000..b08806b
Binary files /dev/null and b/data/assets/turn_front.png differ
diff --git a/data/assets/us-at-gun.png b/data/assets/us-at-gun.png
new file mode 100644
index 0000000..9991ecf
Binary files /dev/null and b/data/assets/us-at-gun.png differ
diff --git a/data/assets/us-flag.png b/data/assets/us-flag.png
new file mode 100644
index 0000000..5dc6c76
Binary files /dev/null and b/data/assets/us-flag.png differ
diff --git a/data/assets/us-infantry.png b/data/assets/us-infantry.png
new file mode 100644
index 0000000..9cea3c2
Binary files /dev/null and b/data/assets/us-infantry.png differ
diff --git a/data/assets/us-pershing-hq.png b/data/assets/us-pershing-hq.png
new file mode 100644
index 0000000..10b9364
Binary files /dev/null and b/data/assets/us-pershing-hq.png differ
diff --git a/data/assets/us-pershing.png b/data/assets/us-pershing.png
new file mode 100644
index 0000000..605563f
Binary files /dev/null and b/data/assets/us-pershing.png differ
diff --git a/data/assets/us-priest.png b/data/assets/us-priest.png
new file mode 100644
index 0000000..0dd6623
Binary files /dev/null and b/data/assets/us-priest.png differ
diff --git a/data/assets/us-sherman-head.png b/data/assets/us-sherman-head.png
new file mode 100644
index 0000000..62a390e
Binary files /dev/null and b/data/assets/us-sherman-head.png differ
diff --git a/data/assets/us-sherman-hq.png b/data/assets/us-sherman-hq.png
new file mode 100644
index 0000000..bf54ea6
Binary files /dev/null and b/data/assets/us-sherman-hq.png differ
diff --git a/data/assets/us-sherman.png b/data/assets/us-sherman.png
new file mode 100644
index 0000000..cd5cc8f
Binary files /dev/null and b/data/assets/us-sherman.png differ
diff --git a/data/assets/us-wolverine.png b/data/assets/us-wolverine.png
new file mode 100644
index 0000000..9ce6dc3
Binary files /dev/null and b/data/assets/us-wolverine.png differ
diff --git a/data/pawns/01_fog.png b/data/pawns/01_fog.png
deleted file mode 100644
index 7d85d98..0000000
Binary files a/data/pawns/01_fog.png and /dev/null differ
diff --git a/data/pawns/02_blue.png b/data/pawns/02_blue.png
deleted file mode 100644
index 12fcba8..0000000
Binary files a/data/pawns/02_blue.png and /dev/null differ
diff --git a/data/pawns/03_green.png b/data/pawns/03_green.png
deleted file mode 100644
index 78b8f75..0000000
Binary files a/data/pawns/03_green.png and /dev/null differ
diff --git a/data/pawns/04_red.png b/data/pawns/04_red.png
deleted file mode 100644
index 1320f4a..0000000
Binary files a/data/pawns/04_red.png and /dev/null differ
diff --git a/data/pawns/05_move.png b/data/pawns/05_move.png
deleted file mode 100644
index e0204a9..0000000
Binary files a/data/pawns/05_move.png and /dev/null differ
diff --git a/data/pawns/06_rose.png b/data/pawns/06_rose.png
deleted file mode 100644
index fd9c7b7..0000000
Binary files a/data/pawns/06_rose.png and /dev/null differ
diff --git a/data/pawns/ace.png b/data/pawns/ace.png
deleted file mode 100644
index f4f3240..0000000
Binary files a/data/pawns/ace.png and /dev/null differ
diff --git a/data/pawns/ap1.png b/data/pawns/ap1.png
deleted file mode 100644
index c47d15e..0000000
Binary files a/data/pawns/ap1.png and /dev/null differ
diff --git a/data/pawns/ap2.png b/data/pawns/ap2.png
deleted file mode 100644
index e89956a..0000000
Binary files a/data/pawns/ap2.png and /dev/null differ
diff --git a/data/pawns/ap3.png b/data/pawns/ap3.png
deleted file mode 100644
index 7d1b11f..0000000
Binary files a/data/pawns/ap3.png and /dev/null differ
diff --git a/data/pawns/ap4.png b/data/pawns/ap4.png
deleted file mode 100644
index e897628..0000000
Binary files a/data/pawns/ap4.png and /dev/null differ
diff --git a/data/pawns/ap_spent.png b/data/pawns/ap_spent.png
deleted file mode 100644
index cb399d8..0000000
Binary files a/data/pawns/ap_spent.png and /dev/null differ
diff --git a/data/pawns/back.png b/data/pawns/back.png
deleted file mode 100644
index e7eb5ef..0000000
Binary files a/data/pawns/back.png and /dev/null differ
diff --git a/data/pawns/disabled.png b/data/pawns/disabled.png
deleted file mode 100644
index a5ad3d3..0000000
Binary files a/data/pawns/disabled.png and /dev/null differ
diff --git a/data/pawns/ge-at-gun.png b/data/pawns/ge-at-gun.png
deleted file mode 100644
index f81a4b1..0000000
Binary files a/data/pawns/ge-at-gun.png and /dev/null differ
diff --git a/data/pawns/ge-infantry.png b/data/pawns/ge-infantry.png
deleted file mode 100644
index ef4cee9..0000000
Binary files a/data/pawns/ge-infantry.png and /dev/null differ
diff --git a/data/pawns/ge-kingtiger.png b/data/pawns/ge-kingtiger.png
deleted file mode 100644
index e45171b..0000000
Binary files a/data/pawns/ge-kingtiger.png and /dev/null differ
diff --git a/data/pawns/ge-panzer-iv-hq.png b/data/pawns/ge-panzer-iv-hq.png
deleted file mode 100644
index 2785941..0000000
Binary files a/data/pawns/ge-panzer-iv-hq.png and /dev/null differ
diff --git a/data/pawns/ge-panzer-iv.png b/data/pawns/ge-panzer-iv.png
deleted file mode 100644
index 35ab9c3..0000000
Binary files a/data/pawns/ge-panzer-iv.png and /dev/null differ
diff --git a/data/pawns/ge-tiger.png b/data/pawns/ge-tiger.png
deleted file mode 100644
index 72e7b6c..0000000
Binary files a/data/pawns/ge-tiger.png and /dev/null differ
diff --git a/data/pawns/ge-wespe.png b/data/pawns/ge-wespe.png
deleted file mode 100644
index 566e5b3..0000000
Binary files a/data/pawns/ge-wespe.png and /dev/null differ
diff --git a/data/pawns/head.png b/data/pawns/head.png
deleted file mode 100644
index a79a840..0000000
Binary files a/data/pawns/head.png and /dev/null differ
diff --git a/data/pawns/turn_back.png b/data/pawns/turn_back.png
deleted file mode 100644
index 3f681d8..0000000
Binary files a/data/pawns/turn_back.png and /dev/null differ
diff --git a/data/pawns/turn_front.png b/data/pawns/turn_front.png
deleted file mode 100644
index b08806b..0000000
Binary files a/data/pawns/turn_front.png and /dev/null differ
diff --git a/data/pawns/us-at-gun.png b/data/pawns/us-at-gun.png
deleted file mode 100644
index 9991ecf..0000000
Binary files a/data/pawns/us-at-gun.png and /dev/null differ
diff --git a/data/pawns/us-infantry.png b/data/pawns/us-infantry.png
deleted file mode 100644
index 9cea3c2..0000000
Binary files a/data/pawns/us-infantry.png and /dev/null differ
diff --git a/data/pawns/us-pershing-hq.png b/data/pawns/us-pershing-hq.png
deleted file mode 100644
index 10b9364..0000000
Binary files a/data/pawns/us-pershing-hq.png and /dev/null differ
diff --git a/data/pawns/us-pershing.png b/data/pawns/us-pershing.png
deleted file mode 100644
index 605563f..0000000
Binary files a/data/pawns/us-pershing.png and /dev/null differ
diff --git a/data/pawns/us-priest.png b/data/pawns/us-priest.png
deleted file mode 100644
index 0dd6623..0000000
Binary files a/data/pawns/us-priest.png and /dev/null differ
diff --git a/data/pawns/us-sherman-head.png b/data/pawns/us-sherman-head.png
deleted file mode 100644
index 62a390e..0000000
Binary files a/data/pawns/us-sherman-head.png and /dev/null differ
diff --git a/data/pawns/us-sherman-hq.png b/data/pawns/us-sherman-hq.png
deleted file mode 100644
index bf54ea6..0000000
Binary files a/data/pawns/us-sherman-hq.png and /dev/null differ
diff --git a/data/pawns/us-sherman.png b/data/pawns/us-sherman.png
deleted file mode 100644
index cd5cc8f..0000000
Binary files a/data/pawns/us-sherman.png and /dev/null differ
diff --git a/data/pawns/us-wolverine.png b/data/pawns/us-wolverine.png
deleted file mode 100644
index 9ce6dc3..0000000
Binary files a/data/pawns/us-wolverine.png and /dev/null differ
-- 
cgit v1.1-2-g2b99