diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-14 12:31:57 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-14 12:31:57 +0100 |
| commit | 734c79b736a177b4f4418ad360d57a0e004a7f7e (patch) | |
| tree | 059bcc2af0177aff719d69484248022b15b3705c | |
| parent | d2ee66dcf9adbaaf0ce96cc8005a9e1d53e681d9 (diff) | |
| download | RustAndDust-734c79b736a177b4f4418ad360d57a0e004a7f7e.zip RustAndDust-734c79b736a177b4f4418ad360d57a0e004a7f7e.tar.gz | |
btn-attack -> btn-engage
| -rw-r--r-- | android/assets/data/hud.atlas | 18 | ||||
| -rw-r--r-- | android/assets/data/hud.png | bin | 343848 -> 344470 bytes | |||
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/hud/ActionButtons.java | 2 | ||||
| -rw-r--r-- | data/assets/hud/btn-engage-down.png (renamed from data/assets/hud/btn-attack-down.png) | bin | 2134 -> 2134 bytes | |||
| -rw-r--r-- | data/assets/hud/btn-engage-on.png (renamed from data/assets/hud/btn-attack-on.png) | bin | 5370 -> 5370 bytes | |||
| -rw-r--r-- | data/assets/hud/btn-engage-up.png (renamed from data/assets/hud/btn-attack-up.png) | bin | 8509 -> 8509 bytes |
6 files changed, 10 insertions, 10 deletions
diff --git a/android/assets/data/hud.atlas b/android/assets/data/hud.atlas index f137d02..73099b6 100644 --- a/android/assets/data/hud.atlas +++ b/android/assets/data/hud.atlas @@ -31,63 +31,63 @@ back orig: 124, 124 offset: 0, 0 index: -1 -btn-attack-down +btn-cancel-down rotate: false xy: 716, 194 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -btn-attack-on +btn-cancel-on rotate: false xy: 778, 194 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -btn-attack-up +btn-cancel-up rotate: false xy: 840, 194 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -btn-cancel-down +btn-check-down rotate: false xy: 902, 194 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -btn-cancel-on +btn-check-on rotate: false xy: 254, 68 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -btn-cancel-up +btn-check-up rotate: false xy: 254, 6 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -btn-check-down +btn-engage-down rotate: false xy: 316, 68 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -btn-check-on +btn-engage-on rotate: false xy: 316, 6 size: 60, 60 orig: 60, 60 offset: 0, 0 index: -1 -btn-check-up +btn-engage-up rotate: false xy: 378, 68 size: 60, 60 diff --git a/android/assets/data/hud.png b/android/assets/data/hud.png Binary files differindex 35f27e7..3e755af 100644 --- a/android/assets/data/hud.png +++ b/android/assets/data/hud.png diff --git a/core/src/ch/asynk/tankontank/game/hud/ActionButtons.java b/core/src/ch/asynk/tankontank/game/hud/ActionButtons.java index d936996..b3a9afe 100644 --- a/core/src/ch/asynk/tankontank/game/hud/ActionButtons.java +++ b/core/src/ch/asynk/tankontank/game/hud/ActionButtons.java @@ -51,7 +51,7 @@ public class ActionButtons extends Bg this.buttons[Buttons.MOVE.i] = new Button(atlas, "btn-move"); this.buttons[Buttons.ROTATE.i] = new Button(atlas, "btn-rotate"); this.buttons[Buttons.PROMOTE.i] = new Button(atlas, "btn-promote"); - this.buttons[Buttons.ENGAGE.i] = new Button(atlas, "btn-attack"); + this.buttons[Buttons.ENGAGE.i] = new Button(atlas, "btn-engage"); this.buttons[Buttons.DONE.i] = new Button(atlas, "btn-check"); this.buttons[Buttons.ABORT.i] = new Button(atlas, "btn-cancel"); diff --git a/data/assets/hud/btn-attack-down.png b/data/assets/hud/btn-engage-down.png Binary files differindex 2298474..2298474 100644 --- a/data/assets/hud/btn-attack-down.png +++ b/data/assets/hud/btn-engage-down.png diff --git a/data/assets/hud/btn-attack-on.png b/data/assets/hud/btn-engage-on.png Binary files differindex 55d2d16..55d2d16 100644 --- a/data/assets/hud/btn-attack-on.png +++ b/data/assets/hud/btn-engage-on.png diff --git a/data/assets/hud/btn-attack-up.png b/data/assets/hud/btn-engage-up.png Binary files differindex 5a29edc..5a29edc 100644 --- a/data/assets/hud/btn-attack-up.png +++ b/data/assets/hud/btn-engage-up.png |
