summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--android/assets/data/assets.atlas110
-rw-r--r--android/assets/data/assets.pngbin1000394 -> 1008368 bytes
-rw-r--r--data/assets/btn-attack-disabled.pngbin0 -> 417 bytes
-rw-r--r--data/assets/btn-attack-off.png (renamed from data/assets/act-attack.png)bin876 -> 876 bytes
-rw-r--r--data/assets/btn-attack-on.png (renamed from data/assets/act-attack-on.png)bin488 -> 488 bytes
-rw-r--r--data/assets/btn-cancel-disabled.pngbin0 -> 4171 bytes
-rw-r--r--data/assets/btn-cancel-off.png (renamed from data/assets/act-cancel.png)bin5404 -> 5404 bytes
-rw-r--r--data/assets/btn-cancel-on.png (renamed from data/assets/act-cancel-on.png)bin4098 -> 4098 bytes
-rw-r--r--data/assets/btn-move-disabled.pngbin0 -> 3487 bytes
-rw-r--r--data/assets/btn-move-off.png (renamed from data/assets/act-move.png)bin3432 -> 3432 bytes
-rw-r--r--data/assets/btn-move-on.png (renamed from data/assets/act-move-on.png)bin3396 -> 3396 bytes
-rw-r--r--data/assets/btn-rotate-disabled.pngbin0 -> 429 bytes
-rw-r--r--data/assets/btn-rotate-off.png (renamed from data/assets/act-rotate.png)bin929 -> 929 bytes
-rw-r--r--data/assets/btn-rotate-on.png (renamed from data/assets/act-rotate-on.png)bin446 -> 446 bytes
14 files changed, 69 insertions, 41 deletions
diff --git a/android/assets/data/assets.atlas b/android/assets/data/assets.atlas
index 7bd96e0..703970c 100644
--- a/android/assets/data/assets.atlas
+++ b/android/assets/data/assets.atlas
@@ -52,102 +52,130 @@ ace
orig: 124, 124
offset: 0, 0
index: -1
-act-attack
+ap1
rotate: false
- xy: 962, 699
- size: 60, 60
- orig: 60, 60
+ 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
-act-attack-on
+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
+btn-attack-disabled
rotate: false
xy: 962, 761
size: 60, 60
orig: 60, 60
offset: 0, 0
index: -1
-act-cancel
+btn-attack-off
rotate: false
- xy: 698, 657
+ xy: 962, 699
size: 60, 60
orig: 60, 60
offset: 0, 0
index: -1
-act-cancel-on
+btn-attack-on
rotate: false
xy: 962, 637
size: 60, 60
orig: 60, 60
offset: 0, 0
index: -1
-act-move
+btn-cancel-disabled
rotate: false
- xy: 698, 595
+ xy: 698, 657
size: 60, 60
orig: 60, 60
offset: 0, 0
index: -1
-act-move-on
+btn-cancel-off
rotate: false
xy: 104, 39
size: 60, 60
orig: 60, 60
offset: 0, 0
index: -1
-act-rotate
+btn-cancel-on
rotate: false
- xy: 698, 471
+ xy: 698, 595
size: 60, 60
orig: 60, 60
offset: 0, 0
index: -1
-act-rotate-on
+btn-move-disabled
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
+btn-move-off
rotate: false
- xy: 194, 380
- size: 124, 124
- orig: 124, 124
+ xy: 698, 471
+ size: 60, 60
+ orig: 60, 60
offset: 0, 0
index: -1
-ap3
+btn-move-on
rotate: false
- xy: 194, 254
- size: 124, 124
- orig: 124, 124
+ xy: 698, 409
+ size: 60, 60
+ orig: 60, 60
offset: 0, 0
index: -1
-ap4
+btn-rotate-disabled
rotate: false
- xy: 194, 128
- size: 124, 124
- orig: 124, 124
+ xy: 698, 347
+ size: 60, 60
+ orig: 60, 60
offset: 0, 0
index: -1
-ap_spent
+btn-rotate-off
rotate: false
- xy: 320, 655
- size: 124, 124
- orig: 124, 124
+ xy: 698, 285
+ size: 60, 60
+ orig: 60, 60
offset: 0, 0
index: -1
-back
+btn-rotate-on
rotate: false
- xy: 320, 529
- size: 124, 124
- orig: 124, 124
+ xy: 698, 223
+ size: 60, 60
+ orig: 60, 60
offset: 0, 0
index: -1
disabled
diff --git a/android/assets/data/assets.png b/android/assets/data/assets.png
index 5d962f4..fe4a9ef 100644
--- a/android/assets/data/assets.png
+++ b/android/assets/data/assets.png
Binary files differ
diff --git a/data/assets/btn-attack-disabled.png b/data/assets/btn-attack-disabled.png
new file mode 100644
index 0000000..20e35c7
--- /dev/null
+++ b/data/assets/btn-attack-disabled.png
Binary files differ
diff --git a/data/assets/act-attack.png b/data/assets/btn-attack-off.png
index 1e2bf26..1e2bf26 100644
--- a/data/assets/act-attack.png
+++ b/data/assets/btn-attack-off.png
Binary files differ
diff --git a/data/assets/act-attack-on.png b/data/assets/btn-attack-on.png
index e7432cd..e7432cd 100644
--- a/data/assets/act-attack-on.png
+++ b/data/assets/btn-attack-on.png
Binary files differ
diff --git a/data/assets/btn-cancel-disabled.png b/data/assets/btn-cancel-disabled.png
new file mode 100644
index 0000000..5140a8a
--- /dev/null
+++ b/data/assets/btn-cancel-disabled.png
Binary files differ
diff --git a/data/assets/act-cancel.png b/data/assets/btn-cancel-off.png
index 47d9762..47d9762 100644
--- a/data/assets/act-cancel.png
+++ b/data/assets/btn-cancel-off.png
Binary files differ
diff --git a/data/assets/act-cancel-on.png b/data/assets/btn-cancel-on.png
index a8519aa..a8519aa 100644
--- a/data/assets/act-cancel-on.png
+++ b/data/assets/btn-cancel-on.png
Binary files differ
diff --git a/data/assets/btn-move-disabled.png b/data/assets/btn-move-disabled.png
new file mode 100644
index 0000000..80ec79c
--- /dev/null
+++ b/data/assets/btn-move-disabled.png
Binary files differ
diff --git a/data/assets/act-move.png b/data/assets/btn-move-off.png
index ffc3112..ffc3112 100644
--- a/data/assets/act-move.png
+++ b/data/assets/btn-move-off.png
Binary files differ
diff --git a/data/assets/act-move-on.png b/data/assets/btn-move-on.png
index 98011af..98011af 100644
--- a/data/assets/act-move-on.png
+++ b/data/assets/btn-move-on.png
Binary files differ
diff --git a/data/assets/btn-rotate-disabled.png b/data/assets/btn-rotate-disabled.png
new file mode 100644
index 0000000..7a71fcb
--- /dev/null
+++ b/data/assets/btn-rotate-disabled.png
Binary files differ
diff --git a/data/assets/act-rotate.png b/data/assets/btn-rotate-off.png
index 3a3720f..3a3720f 100644
--- a/data/assets/act-rotate.png
+++ b/data/assets/btn-rotate-off.png
Binary files differ
diff --git a/data/assets/act-rotate-on.png b/data/assets/btn-rotate-on.png
index 0f42d25..0f42d25 100644
--- a/data/assets/act-rotate-on.png
+++ b/data/assets/btn-rotate-on.png
Binary files differ