summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-12-14 11:07:16 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-12-14 11:07:16 +0100
commita4c8b74a2bbcd5cd90d7a104b5876606837b91b9 (patch)
tree4e7b531897e7ae74e34e8143f8c134732b5808f6
parent431f1d09b78fbfdfa0416cd89ca89e4d727da2bf (diff)
downloadRustAndDust-a4c8b74a2bbcd5cd90d7a104b5876606837b91b9.zip
RustAndDust-a4c8b74a2bbcd5cd90d7a104b5876606837b91b9.tar.gz
add hud ok.png and cancel.png
-rw-r--r--android/assets/data/hud.atlas14
-rw-r--r--android/assets/data/hud.pngbin83632 -> 98229 bytes
-rw-r--r--assets/hud/cancel.pngbin0 -> 6121 bytes
-rw-r--r--assets/hud/ok.pngbin0 -> 6173 bytes
-rw-r--r--core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java4
5 files changed, 16 insertions, 2 deletions
diff --git a/android/assets/data/hud.atlas b/android/assets/data/hud.atlas
index 06f6b0d..2ee788a 100644
--- a/android/assets/data/hud.atlas
+++ b/android/assets/data/hud.atlas
@@ -18,6 +18,13 @@ attack
orig: 24, 24
offset: 0, 0
index: -1
+cancel
+ rotate: false
+ xy: 180, 157
+ size: 48, 47
+ orig: 48, 47
+ offset: 0, 0
+ index: -1
defense
rotate: false
xy: 94, 2
@@ -32,6 +39,13 @@ ge-flag
orig: 80, 48
offset: 0, 0
index: -1
+ok
+ rotate: false
+ xy: 138, 107
+ size: 48, 47
+ orig: 48, 47
+ offset: 0, 0
+ index: -1
promote
rotate: false
xy: 88, 78
diff --git a/android/assets/data/hud.png b/android/assets/data/hud.png
index d34c1d7..3bfb0b4 100644
--- a/android/assets/data/hud.png
+++ b/android/assets/data/hud.png
Binary files differ
diff --git a/assets/hud/cancel.png b/assets/hud/cancel.png
new file mode 100644
index 0000000..e2c5894
--- /dev/null
+++ b/assets/hud/cancel.png
Binary files differ
diff --git a/assets/hud/ok.png b/assets/hud/ok.png
new file mode 100644
index 0000000..9e7a47b
--- /dev/null
+++ b/assets/hud/ok.png
Binary files differ
diff --git a/core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java b/core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java
index 323767f..05753b8 100644
--- a/core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java
+++ b/core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java
@@ -49,8 +49,8 @@ public class ActionButtons extends Widget
this.buttons = new Bg[Buttons.LAST.i];
- this.buttons[Buttons.DONE.i] = new Bg(uiAtlas.findRegion("ok"));
- this.buttons[Buttons.ABORT.i] = new Bg(uiAtlas.findRegion("cancel"));
+ this.buttons[Buttons.DONE.i] = new Bg(hudAtlas.findRegion("ok"));
+ this.buttons[Buttons.ABORT.i] = new Bg(hudAtlas.findRegion("cancel"));
this.buttons[Buttons.PROMOTE.i] = new Bg(hudAtlas.findRegion("promote"));
this.states = new StateType[Buttons.LAST.i];