From 2f0c0f8e0b35adffbe0029d061fd8b243c9ced3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Sun, 2 Nov 2014 12:24:25 +0100 Subject: update hud graphics --- android/assets/data/hud.atlas | 81 +++++++++++++---------------------- android/assets/data/hud.png | Bin 332210 -> 305972 bytes data/assets/hud/ap1.png | Bin 20533 -> 0 bytes data/assets/hud/ap2.png | Bin 22626 -> 0 bytes data/assets/hud/ap3.png | Bin 22565 -> 0 bytes data/assets/hud/ap4.png | Bin 22101 -> 0 bytes data/assets/hud/aps.png | Bin 0 -> 4154 bytes data/assets/hud/btn-attack-down.png | Bin 417 -> 2134 bytes data/assets/hud/btn-attack-off.png | Bin 2733 -> 8509 bytes data/assets/hud/btn-attack-on.png | Bin 488 -> 5370 bytes data/assets/hud/btn-cancel-down.png | Bin 4171 -> 4486 bytes data/assets/hud/btn-cancel-off.png | Bin 4165 -> 8958 bytes data/assets/hud/btn-cancel-on.png | Bin 4098 -> 6978 bytes data/assets/hud/btn-check-down.png | Bin 1160 -> 1456 bytes data/assets/hud/btn-check-off.png | Bin 456 -> 5272 bytes data/assets/hud/btn-check-on.png | Bin 991 -> 3131 bytes data/assets/hud/btn-move-down.png | Bin 3487 -> 4142 bytes data/assets/hud/btn-move-off.png | Bin 3440 -> 7042 bytes data/assets/hud/btn-move-on.png | Bin 3396 -> 5868 bytes data/assets/hud/btn-promote-down.png | Bin 2096 -> 5224 bytes data/assets/hud/btn-promote-off.png | Bin 1192 -> 5381 bytes data/assets/hud/btn-promote-on.png | Bin 2425 -> 5599 bytes data/assets/hud/btn-rotate-down.png | Bin 429 -> 1922 bytes data/assets/hud/btn-rotate-off.png | Bin 453 -> 7234 bytes data/assets/hud/btn-rotate-on.png | Bin 446 -> 4370 bytes 25 files changed, 30 insertions(+), 51 deletions(-) delete mode 100644 data/assets/hud/ap1.png delete mode 100644 data/assets/hud/ap2.png delete mode 100644 data/assets/hud/ap3.png delete mode 100644 data/assets/hud/ap4.png create mode 100644 data/assets/hud/aps.png diff --git a/android/assets/data/hud.atlas b/android/assets/data/hud.atlas index cc0ec6d..fea2294 100644 --- a/android/assets/data/hud.atlas +++ b/android/assets/data/hud.atlas @@ -10,212 +10,191 @@ ace orig: 124, 124 offset: 0, 0 index: -1 -ap1 +ap_spent rotate: false xy: 2, 2 size: 124, 124 orig: 124, 124 offset: 0, 0 index: -1 -ap2 - rotate: false - xy: 128, 128 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -ap3 +aps rotate: false - xy: 128, 2 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -ap4 - rotate: false - xy: 254, 128 - size: 124, 124 - orig: 124, 124 - offset: 0, 0 - index: -1 -ap_spent - rotate: false - xy: 254, 2 - size: 124, 124 - orig: 124, 124 + xy: 958, 142 + size: 48, 48 + orig: 48, 48 offset: 0, 0 index: -1 back rotate: false - xy: 380, 128 + xy: 128, 128 size: 124, 124 orig: 124, 124 offset: 0, 0 index: -1 btn-attack-down rotate: false - xy: 714, 192 + xy: 462, 192 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 btn-attack-off rotate: false - xy: 632, 92 + xy: 380, 92 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 btn-attack-on rotate: false - xy: 776, 192 + xy: 524, 192 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 btn-cancel-down rotate: false - xy: 632, 30 + xy: 380, 30 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 btn-cancel-off rotate: false - xy: 838, 192 + xy: 586, 192 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 btn-cancel-on rotate: false - xy: 900, 192 + xy: 648, 192 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 btn-check-down rotate: false - xy: 962, 192 + xy: 710, 192 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 btn-check-off rotate: false - xy: 714, 130 + xy: 772, 192 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 btn-check-on rotate: false - xy: 776, 130 + xy: 834, 192 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 btn-move-down rotate: false - xy: 838, 130 + xy: 896, 192 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 btn-move-off rotate: false - xy: 900, 130 + xy: 958, 192 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 btn-move-on rotate: false - xy: 962, 130 + xy: 462, 130 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 btn-promote-down rotate: false - xy: 694, 68 + xy: 524, 130 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 btn-promote-off rotate: false - xy: 756, 68 + xy: 586, 130 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 btn-promote-on rotate: false - xy: 818, 68 + xy: 648, 130 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 btn-rotate-down rotate: false - xy: 880, 68 + xy: 710, 130 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 btn-rotate-off rotate: false - xy: 942, 68 + xy: 772, 130 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 btn-rotate-on rotate: false - xy: 694, 6 + xy: 834, 130 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 disabled rotate: false - xy: 380, 2 + xy: 128, 2 size: 124, 124 orig: 124, 124 offset: 0, 0 index: -1 ge-flag rotate: false - xy: 632, 204 + xy: 380, 204 size: 80, 48 orig: 80, 48 offset: 0, 0 index: -1 reinforcement rotate: false - xy: 756, 6 + xy: 896, 130 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 turn_back rotate: false - xy: 506, 128 + xy: 254, 128 size: 124, 124 orig: 124, 124 offset: 0, 0 index: -1 turn_front rotate: false - xy: 506, 2 + xy: 254, 2 size: 124, 124 orig: 124, 124 offset: 0, 0 index: -1 us-flag rotate: false - xy: 632, 154 + xy: 380, 154 size: 80, 48 orig: 80, 48 offset: 0, 0 diff --git a/android/assets/data/hud.png b/android/assets/data/hud.png index 09dbc16..33817af 100644 Binary files a/android/assets/data/hud.png and b/android/assets/data/hud.png differ diff --git a/data/assets/hud/ap1.png b/data/assets/hud/ap1.png deleted file mode 100644 index c47d15e..0000000 Binary files a/data/assets/hud/ap1.png and /dev/null differ diff --git a/data/assets/hud/ap2.png b/data/assets/hud/ap2.png deleted file mode 100644 index e89956a..0000000 Binary files a/data/assets/hud/ap2.png and /dev/null differ diff --git a/data/assets/hud/ap3.png b/data/assets/hud/ap3.png deleted file mode 100644 index 7d1b11f..0000000 Binary files a/data/assets/hud/ap3.png and /dev/null differ diff --git a/data/assets/hud/ap4.png b/data/assets/hud/ap4.png deleted file mode 100644 index e897628..0000000 Binary files a/data/assets/hud/ap4.png and /dev/null differ diff --git a/data/assets/hud/aps.png b/data/assets/hud/aps.png new file mode 100644 index 0000000..cff4123 Binary files /dev/null and b/data/assets/hud/aps.png differ diff --git a/data/assets/hud/btn-attack-down.png b/data/assets/hud/btn-attack-down.png index 20e35c7..2298474 100644 Binary files a/data/assets/hud/btn-attack-down.png and b/data/assets/hud/btn-attack-down.png differ diff --git a/data/assets/hud/btn-attack-off.png b/data/assets/hud/btn-attack-off.png index e026248..5a29edc 100644 Binary files a/data/assets/hud/btn-attack-off.png and b/data/assets/hud/btn-attack-off.png differ diff --git a/data/assets/hud/btn-attack-on.png b/data/assets/hud/btn-attack-on.png index e7432cd..55d2d16 100644 Binary files a/data/assets/hud/btn-attack-on.png and b/data/assets/hud/btn-attack-on.png differ diff --git a/data/assets/hud/btn-cancel-down.png b/data/assets/hud/btn-cancel-down.png index 5140a8a..a658da9 100644 Binary files a/data/assets/hud/btn-cancel-down.png and b/data/assets/hud/btn-cancel-down.png differ diff --git a/data/assets/hud/btn-cancel-off.png b/data/assets/hud/btn-cancel-off.png index d4f8e18..800c983 100644 Binary files a/data/assets/hud/btn-cancel-off.png and b/data/assets/hud/btn-cancel-off.png differ diff --git a/data/assets/hud/btn-cancel-on.png b/data/assets/hud/btn-cancel-on.png index a8519aa..05655f7 100644 Binary files a/data/assets/hud/btn-cancel-on.png and b/data/assets/hud/btn-cancel-on.png differ diff --git a/data/assets/hud/btn-check-down.png b/data/assets/hud/btn-check-down.png index 78f9f85..adbe3ee 100644 Binary files a/data/assets/hud/btn-check-down.png and b/data/assets/hud/btn-check-down.png differ diff --git a/data/assets/hud/btn-check-off.png b/data/assets/hud/btn-check-off.png index 1cb435a..4fb965b 100644 Binary files a/data/assets/hud/btn-check-off.png and b/data/assets/hud/btn-check-off.png differ diff --git a/data/assets/hud/btn-check-on.png b/data/assets/hud/btn-check-on.png index 2f893c9..221a7ed 100644 Binary files a/data/assets/hud/btn-check-on.png and b/data/assets/hud/btn-check-on.png differ diff --git a/data/assets/hud/btn-move-down.png b/data/assets/hud/btn-move-down.png index 80ec79c..d663c10 100644 Binary files a/data/assets/hud/btn-move-down.png and b/data/assets/hud/btn-move-down.png differ diff --git a/data/assets/hud/btn-move-off.png b/data/assets/hud/btn-move-off.png index b481acf..f637991 100644 Binary files a/data/assets/hud/btn-move-off.png and b/data/assets/hud/btn-move-off.png differ diff --git a/data/assets/hud/btn-move-on.png b/data/assets/hud/btn-move-on.png index 98011af..f5cc01a 100644 Binary files a/data/assets/hud/btn-move-on.png and b/data/assets/hud/btn-move-on.png differ diff --git a/data/assets/hud/btn-promote-down.png b/data/assets/hud/btn-promote-down.png index cd59907..24d82c0 100644 Binary files a/data/assets/hud/btn-promote-down.png and b/data/assets/hud/btn-promote-down.png differ diff --git a/data/assets/hud/btn-promote-off.png b/data/assets/hud/btn-promote-off.png index 44be4c4..67d7cca 100644 Binary files a/data/assets/hud/btn-promote-off.png and b/data/assets/hud/btn-promote-off.png differ diff --git a/data/assets/hud/btn-promote-on.png b/data/assets/hud/btn-promote-on.png index b05c3e1..36c3240 100644 Binary files a/data/assets/hud/btn-promote-on.png and b/data/assets/hud/btn-promote-on.png differ diff --git a/data/assets/hud/btn-rotate-down.png b/data/assets/hud/btn-rotate-down.png index 7a71fcb..e642e3e 100644 Binary files a/data/assets/hud/btn-rotate-down.png and b/data/assets/hud/btn-rotate-down.png differ diff --git a/data/assets/hud/btn-rotate-off.png b/data/assets/hud/btn-rotate-off.png index 27ecedd..f5467b2 100644 Binary files a/data/assets/hud/btn-rotate-off.png and b/data/assets/hud/btn-rotate-off.png differ diff --git a/data/assets/hud/btn-rotate-on.png b/data/assets/hud/btn-rotate-on.png index 0f42d25..f9b1c7a 100644 Binary files a/data/assets/hud/btn-rotate-on.png and b/data/assets/hud/btn-rotate-on.png differ -- cgit v1.1-2-g2b99