summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-11-26 16:41:24 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-11-26 16:41:24 +0100
commit7ae5d3a7de9eada5f73104c32da7c2f67d8b8a27 (patch)
tree739d74c10c832c783a85d2c96ad962fa2e7a3cb0
parent0d8528f83d914ffaa467da4d056b13ba7a785105 (diff)
downloadRustAndDust-7ae5d3a7de9eada5f73104c32da7c2f67d8b8a27.zip
RustAndDust-7ae5d3a7de9eada5f73104c32da7c2f67d8b8a27.tar.gz
add shot.mp3 and shots.png
-rw-r--r--android/assets/data/shots.pngbin0 -> 77414 bytes
-rw-r--r--android/assets/sounds/shot.mp3bin0 -> 68962 bytes
-rw-r--r--core/src/ch/asynk/tankontank/TankOnTank.java4
3 files changed, 4 insertions, 0 deletions
diff --git a/android/assets/data/shots.png b/android/assets/data/shots.png
new file mode 100644
index 0000000..3d3c826
--- /dev/null
+++ b/android/assets/data/shots.png
Binary files differ
diff --git a/android/assets/sounds/shot.mp3 b/android/assets/sounds/shot.mp3
new file mode 100644
index 0000000..ce3257f
--- /dev/null
+++ b/android/assets/sounds/shot.mp3
Binary files differ
diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/tankontank/TankOnTank.java
index a80325d..c2a5d38 100644
--- a/core/src/ch/asynk/tankontank/TankOnTank.java
+++ b/core/src/ch/asynk/tankontank/TankOnTank.java
@@ -55,9 +55,11 @@ public class TankOnTank extends Game
manager.load("data/unit-overlays.atlas", TextureAtlas.class);
manager.load("data/hex-overlays.atlas", TextureAtlas.class);
manager.load("data/explosion.png", Texture.class);
+ manager.load("data/shots.png", Texture.class);
manager.load("data/explosions.png", Texture.class);
manager.load("sounds/move.mp3", Sound.class);
manager.load("sounds/attack.mp3", Sound.class);
+ manager.load("sounds/shot.mp3", Sound.class);
}
public void unloadAssets()
@@ -71,9 +73,11 @@ public class TankOnTank extends Game
manager.unload("data/unit-overlays.atlas");
manager.unload("data/hex-overlays.atlas");
manager.unload("data/explosion.png");
+ manager.unload("data/shots.png");
manager.unload("data/explosions.png");
manager.unload("sounds/move.mp3");
manager.unload("sounds/attack.mp3");
+ manager.unload("sounds/shot.mp3");
debug("TankOnTank", "diagnostics:\n" + manager.getDiagnostics() );
}