diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-10-03 23:54:03 +0200 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-10-03 23:54:03 +0200 |
commit | 1662f014d288f66772e303470ee44db23291b9e2 (patch) | |
tree | 221a8a2cbf990ac502f2b941e3ce338ab0489ef6 | |
parent | 331143ef593ce24a76f6caadcd5f9dcce8783fb5 (diff) | |
download | RustAndDust-1662f014d288f66772e303470ee44db23291b9e2.zip RustAndDust-1662f014d288f66772e303470ee44db23291b9e2.tar.gz |
images update
-rw-r--r-- | android/assets/images/counters.atlas | 27 | ||||
-rw-r--r-- | android/assets/images/counters.pack | 60 | ||||
-rw-r--r-- | android/assets/images/counters.png | bin | 288231 -> 298559 bytes | |||
-rw-r--r-- | core/src/ch/asynk/tankontank/TankOnTank.java | 4 | ||||
-rw-r--r-- | data/counters/ap1.png (renamed from data/counters/ap_1.png) | bin | 20533 -> 20533 bytes | |||
-rw-r--r-- | data/counters/ap2.png (renamed from data/counters/ap_2.png) | bin | 22626 -> 22626 bytes | |||
-rw-r--r-- | data/counters/ap3.png (renamed from data/counters/ap_3.png) | bin | 22565 -> 22565 bytes | |||
-rw-r--r-- | data/counters/ap4.png (renamed from data/counters/ap_4.png) | bin | 22101 -> 22101 bytes | |||
-rw-r--r-- | data/counters/move.png | bin | 0 -> 8670 bytes |
9 files changed, 19 insertions, 72 deletions
diff --git a/android/assets/images/counters.atlas b/android/assets/images/counters.atlas index 9f0de4a..f022234 100644 --- a/android/assets/images/counters.atlas +++ b/android/assets/images/counters.atlas @@ -10,34 +10,34 @@ ace orig: 124, 124 offset: 0, 0 index: -1 -ap +ap1 rotate: false xy: 2, 2 size: 124, 124 orig: 124, 124 offset: 0, 0 - index: 1 -ap + index: -1 +ap2 rotate: false xy: 128, 128 size: 124, 124 orig: 124, 124 offset: 0, 0 - index: 2 -ap + index: -1 +ap3 rotate: false xy: 128, 2 size: 124, 124 orig: 124, 124 offset: 0, 0 - index: 3 -ap + index: -1 +ap4 rotate: false xy: 254, 128 size: 124, 124 orig: 124, 124 offset: 0, 0 - index: 4 + index: -1 ap_spent rotate: false xy: 254, 2 @@ -52,17 +52,24 @@ back orig: 124, 124 offset: 0, 0 index: -1 -turn_back +move rotate: false xy: 380, 2 size: 124, 124 orig: 124, 124 offset: 0, 0 index: -1 -turn_front +turn_back rotate: false xy: 506, 128 size: 124, 124 orig: 124, 124 offset: 0, 0 index: -1 +turn_front + rotate: false + xy: 506, 2 + size: 124, 124 + orig: 124, 124 + offset: 0, 0 + index: -1 diff --git a/android/assets/images/counters.pack b/android/assets/images/counters.pack deleted file mode 100644 index 176d079..0000000 --- a/android/assets/images/counters.pack +++ /dev/null @@ -1,60 +0,0 @@ -counters.png -format: RGBA8888 -filter: Nearest,Nearest -repeat: none -ace - rotate: false - xy: 1, 1 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: 1 -back - rotate: false - xy: 125, 1 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: 1 -ap-spent - rotate: false - xy: 249, 1 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: 1 -turn - rotate: false - xy: 373, 1 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: 1 -ap2 - rotate: false - xy: 1, 125 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: 1 -ap3 - rotate: false - xy: 125, 125 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: 1 -ap4 - rotate: false - xy: 249, 125 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: 1 -turn-more - rotate: false - xy: 373, 125 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: 1 diff --git a/android/assets/images/counters.png b/android/assets/images/counters.png Binary files differindex 1b493f9..88feeb9 100644 --- a/android/assets/images/counters.png +++ b/android/assets/images/counters.png diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/tankontank/TankOnTank.java index 49cd23b..2590c30 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("images/map_a.png", Texture.class); manager.load("images/map_b.png", Texture.class); - manager.load("images/counters.pack", TextureAtlas.class); + manager.load("images/counters.atlas", TextureAtlas.class); manager.load("images/ge.atlas", TextureAtlas.class); manager.load("images/us.atlas", TextureAtlas.class); manager.load("images/hex.atlas", TextureAtlas.class); @@ -45,7 +45,7 @@ public class TankOnTank extends Game Gdx.app.debug("TankOnTank", "diagnostics:\n" + manager.getDiagnostics() ); manager.unload("images/map_a.png"); manager.unload("images/map_b.png"); - manager.unload("images/counters.pack"); + manager.unload("images/counters.atlas"); manager.unload("images/ge.atlas"); manager.unload("images/us.atlas"); manager.unload("images/hex.atlas"); diff --git a/data/counters/ap_1.png b/data/counters/ap1.png Binary files differindex c47d15e..c47d15e 100644 --- a/data/counters/ap_1.png +++ b/data/counters/ap1.png diff --git a/data/counters/ap_2.png b/data/counters/ap2.png Binary files differindex e89956a..e89956a 100644 --- a/data/counters/ap_2.png +++ b/data/counters/ap2.png diff --git a/data/counters/ap_3.png b/data/counters/ap3.png Binary files differindex 7d1b11f..7d1b11f 100644 --- a/data/counters/ap_3.png +++ b/data/counters/ap3.png diff --git a/data/counters/ap_4.png b/data/counters/ap4.png Binary files differindex e897628..e897628 100644 --- a/data/counters/ap_4.png +++ b/data/counters/ap4.png diff --git a/data/counters/move.png b/data/counters/move.png Binary files differnew file mode 100644 index 0000000..aaa0f98 --- /dev/null +++ b/data/counters/move.png |