From 0ff04286d54598c5f9af851d26a2a9302844948b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Sun, 5 Oct 2014 10:31:22 +0200 Subject: rename act-target*.png -> act-attack*.png --- android/assets/data/assets.atlas | 16 ++++++++-------- android/assets/data/assets.png | Bin 999913 -> 1000394 bytes data/assets/act-attack-on.png | Bin 0 -> 488 bytes data/assets/act-attack.png | Bin 0 -> 876 bytes data/assets/act-target-on.png | Bin 488 -> 0 bytes data/assets/act-target.png | Bin 876 -> 0 bytes 6 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 data/assets/act-attack-on.png create mode 100644 data/assets/act-attack.png delete mode 100644 data/assets/act-target-on.png delete mode 100644 data/assets/act-target.png diff --git a/android/assets/data/assets.atlas b/android/assets/data/assets.atlas index 5da3b9c..7bd96e0 100644 --- a/android/assets/data/assets.atlas +++ b/android/assets/data/assets.atlas @@ -52,56 +52,56 @@ ace orig: 124, 124 offset: 0, 0 index: -1 -act-cancel +act-attack rotate: false xy: 962, 699 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -act-cancel-on +act-attack-on rotate: false xy: 962, 761 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -act-move +act-cancel rotate: false xy: 698, 657 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -act-move-on +act-cancel-on rotate: false xy: 962, 637 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -act-rotate +act-move rotate: false xy: 698, 595 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -act-rotate-on +act-move-on rotate: false xy: 104, 39 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -act-target +act-rotate rotate: false xy: 698, 471 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -act-target-on +act-rotate-on rotate: false xy: 698, 533 size: 60, 60 diff --git a/android/assets/data/assets.png b/android/assets/data/assets.png index aef8022..5d962f4 100644 Binary files a/android/assets/data/assets.png and b/android/assets/data/assets.png differ diff --git a/data/assets/act-attack-on.png b/data/assets/act-attack-on.png new file mode 100644 index 0000000..e7432cd Binary files /dev/null and b/data/assets/act-attack-on.png differ diff --git a/data/assets/act-attack.png b/data/assets/act-attack.png new file mode 100644 index 0000000..1e2bf26 Binary files /dev/null and b/data/assets/act-attack.png differ diff --git a/data/assets/act-target-on.png b/data/assets/act-target-on.png deleted file mode 100644 index e7432cd..0000000 Binary files a/data/assets/act-target-on.png and /dev/null differ diff --git a/data/assets/act-target.png b/data/assets/act-target.png deleted file mode 100644 index 1e2bf26..0000000 Binary files a/data/assets/act-target.png and /dev/null differ -- cgit v1.1-2-g2b99