From fe623df2220f926b1caaee2e3451f5fff9282fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Sat, 29 Nov 2014 02:10:01 +0100 Subject: add promote.png and promote.mp3 --- android/assets/data/hud.atlas | 27 +++++++++++++++++---------- android/assets/data/hud.png | Bin 62389 -> 65949 bytes android/assets/sounds/promote.mp3 | Bin 0 -> 10448 bytes core/src/ch/asynk/tankontank/TankOnTank.java | 2 ++ data/assets/hud/promote.png | Bin 5328 -> 5346 bytes data/assets/hud/stars.png | Bin 0 -> 2170 bytes 6 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 android/assets/sounds/promote.mp3 create mode 100644 data/assets/hud/stars.png diff --git a/android/assets/data/hud.atlas b/android/assets/data/hud.atlas index eb3885c..cec4298 100644 --- a/android/assets/data/hud.atlas +++ b/android/assets/data/hud.atlas @@ -5,70 +5,77 @@ filter: Nearest,Nearest repeat: none aps rotate: false - xy: 2, 2 + xy: 2, 19 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 cancel rotate: false - xy: 130, 130 + xy: 130, 147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 disabled rotate: false - xy: 84, 52 + xy: 84, 69 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 ge-flag rotate: false - xy: 2, 52 + xy: 2, 69 size: 80, 48 orig: 80, 48 offset: 0, 0 index: -1 ok rotate: false - xy: 52, 2 + xy: 52, 19 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 promote rotate: false - xy: 180, 130 + xy: 180, 147 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 reinforcement rotate: false - xy: 102, 2 + xy: 102, 19 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 reinforcement-selected rotate: false - xy: 2, 102 + xy: 2, 119 size: 126, 126 orig: 126, 126 offset: 0, 0 index: -1 +stars + rotate: false + xy: 2, 2 + size: 64, 15 + orig: 64, 15 + offset: 0, 0 + index: -1 turns rotate: false - xy: 134, 80 + xy: 134, 97 size: 48, 48 orig: 48, 48 offset: 0, 0 index: -1 us-flag rotate: false - xy: 130, 180 + xy: 130, 197 size: 80, 48 orig: 80, 48 offset: 0, 0 diff --git a/android/assets/data/hud.png b/android/assets/data/hud.png index f3dfe1d..4d10b46 100644 Binary files a/android/assets/data/hud.png and b/android/assets/data/hud.png differ diff --git a/android/assets/sounds/promote.mp3 b/android/assets/sounds/promote.mp3 new file mode 100644 index 0000000..1fccecb Binary files /dev/null and b/android/assets/sounds/promote.mp3 differ diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/tankontank/TankOnTank.java index ad0fc27..f6036d8 100644 --- a/core/src/ch/asynk/tankontank/TankOnTank.java +++ b/core/src/ch/asynk/tankontank/TankOnTank.java @@ -62,6 +62,7 @@ public class TankOnTank extends Game manager.load("sounds/short_shot.mp3", Sound.class); manager.load("sounds/explosion.mp3", Sound.class); manager.load("sounds/explosion_short.mp3", Sound.class); + manager.load("sounds/promote.mp3", Sound.class); } public void unloadAssets() @@ -82,6 +83,7 @@ public class TankOnTank extends Game manager.unload("sounds/short_shot.mp3"); manager.unload("sounds/explosion.mp3"); manager.unload("sounds/explosion_short.mp3"); + manager.unload("sounds/promote.mp3"); debug("TankOnTank", "diagnostics:\n" + manager.getDiagnostics() ); } diff --git a/data/assets/hud/promote.png b/data/assets/hud/promote.png index dea7867..d030756 100644 Binary files a/data/assets/hud/promote.png and b/data/assets/hud/promote.png differ diff --git a/data/assets/hud/stars.png b/data/assets/hud/stars.png new file mode 100644 index 0000000..c0acafe Binary files /dev/null and b/data/assets/hud/stars.png differ -- cgit v1.1-2-g2b99