From 1e792286a831b99451195ed21d9537716c18cbd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Sun, 30 Nov 2014 18:58:15 +0100 Subject: resize dice.png, remove attack.mp3, update assets loading --- android/assets/data/dice.png | Bin 164849 -> 179735 bytes android/assets/sounds/attack.mp3 | Bin 51826 -> 0 bytes core/src/ch/asynk/tankontank/TankOnTank.java | 6 ++++-- data/misc/attack.mp3 | Bin 0 -> 51826 bytes 4 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 android/assets/sounds/attack.mp3 create mode 100644 data/misc/attack.mp3 diff --git a/android/assets/data/dice.png b/android/assets/data/dice.png index abbc0bd..6ca96ec 100644 Binary files a/android/assets/data/dice.png and b/android/assets/data/dice.png differ diff --git a/android/assets/sounds/attack.mp3 b/android/assets/sounds/attack.mp3 deleted file mode 100644 index 0a43bbd..0000000 Binary files a/android/assets/sounds/attack.mp3 and /dev/null differ diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/tankontank/TankOnTank.java index f6036d8..407e051 100644 --- a/core/src/ch/asynk/tankontank/TankOnTank.java +++ b/core/src/ch/asynk/tankontank/TankOnTank.java @@ -54,10 +54,11 @@ public class TankOnTank extends Game manager.load("data/units.atlas", TextureAtlas.class); manager.load("data/unit-overlays.atlas", TextureAtlas.class); manager.load("data/hex-overlays.atlas", TextureAtlas.class); + manager.load("data/dice.png", Texture.class); manager.load("data/shots.png", Texture.class); manager.load("data/explosions.png", Texture.class); + manager.load("sounds/dice.mp3", Sound.class); manager.load("sounds/move.mp3", Sound.class); - manager.load("sounds/attack.mp3", Sound.class); manager.load("sounds/shot.mp3", Sound.class); manager.load("sounds/short_shot.mp3", Sound.class); manager.load("sounds/explosion.mp3", Sound.class); @@ -75,10 +76,11 @@ public class TankOnTank extends Game manager.unload("data/units.atlas"); manager.unload("data/unit-overlays.atlas"); manager.unload("data/hex-overlays.atlas"); + manager.unload("data/dice.png"); manager.unload("data/shots.png"); manager.unload("data/explosions.png"); + manager.unload("sounds/dice.mp3"); manager.unload("sounds/move.mp3"); - manager.unload("sounds/attack.mp3"); manager.unload("sounds/shot.mp3"); manager.unload("sounds/short_shot.mp3"); manager.unload("sounds/explosion.mp3"); diff --git a/data/misc/attack.mp3 b/data/misc/attack.mp3 new file mode 100644 index 0000000..0a43bbd Binary files /dev/null and b/data/misc/attack.mp3 differ -- cgit v1.1-2-g2b99