From dd4883bd3896b3d23bd7d489868c54ac7c2f7013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Tue, 15 Jan 2019 17:42:30 +0100 Subject: Assets : update, add engineer with png and ogg, ttf --- assets/data/american-typewriter.ttf | Bin 0 -> 85420 bytes assets/data/engineer.png | Bin 0 -> 32766 bytes assets/data/gun_fire.ogg | Bin 0 -> 33532 bytes assets/data/gun_fire.png | Bin 0 -> 1449 bytes assets/data/infantry_move.ogg | Bin 0 -> 52006 bytes assets/data/modern-typewriter.ttf | Bin 0 -> 117636 bytes test/src/ch/asynk/gdx/boardgame/test/Assets.java | 16 ++++++++++++++-- 7 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 assets/data/american-typewriter.ttf create mode 100644 assets/data/engineer.png create mode 100644 assets/data/gun_fire.ogg create mode 100644 assets/data/gun_fire.png create mode 100644 assets/data/infantry_move.ogg create mode 100644 assets/data/modern-typewriter.ttf diff --git a/assets/data/american-typewriter.ttf b/assets/data/american-typewriter.ttf new file mode 100644 index 0000000..8195a2e Binary files /dev/null and b/assets/data/american-typewriter.ttf differ diff --git a/assets/data/engineer.png b/assets/data/engineer.png new file mode 100644 index 0000000..35d4665 Binary files /dev/null and b/assets/data/engineer.png differ diff --git a/assets/data/gun_fire.ogg b/assets/data/gun_fire.ogg new file mode 100644 index 0000000..554cae8 Binary files /dev/null and b/assets/data/gun_fire.ogg differ diff --git a/assets/data/gun_fire.png b/assets/data/gun_fire.png new file mode 100644 index 0000000..a0a026d Binary files /dev/null and b/assets/data/gun_fire.png differ diff --git a/assets/data/infantry_move.ogg b/assets/data/infantry_move.ogg new file mode 100644 index 0000000..6210312 Binary files /dev/null and b/assets/data/infantry_move.ogg differ diff --git a/assets/data/modern-typewriter.ttf b/assets/data/modern-typewriter.ttf new file mode 100644 index 0000000..28d7bb3 Binary files /dev/null and b/assets/data/modern-typewriter.ttf differ diff --git a/test/src/ch/asynk/gdx/boardgame/test/Assets.java b/test/src/ch/asynk/gdx/boardgame/test/Assets.java index 74958a3..2bdad29 100644 --- a/test/src/ch/asynk/gdx/boardgame/test/Assets.java +++ b/test/src/ch/asynk/gdx/boardgame/test/Assets.java @@ -19,19 +19,23 @@ public class Assets extends ch.asynk.gdx.boardgame.Assets public static final String MAP_00 = "map_00.png"; public static final String CHESS = "chess.jpg"; public static final String TRI = "triangle.png"; - public static final String FONT = "veteran-typewriter.ttf"; + public static final String FONT = "american-typewriter.ttf"; public static final String FONT_20 = "size20.ttf"; public static final String FONT_25 = "size25.ttf"; public static final String PATCH = "ui-patch.png"; public static final String PANZER = "panzer.png"; + public static final String ENGINEER = "engineer.png"; public static final String HEX_OVERLAYS = "hex-overlays.atlas"; - public static final String TANK_MOVE_SND = "tank_move.ogg"; + public static final String GUN_FIRE = "gun_fire.png"; + public static final String GUN_FIRE_SND = "gun_fire.ogg"; public static final String SHELL_FIRE = "shell_fire.png"; public static final String SHELL_FIRE_SND = "shell_fire.ogg"; public static final String EXPLOSIONS = "explosions.png"; public static final String EXPLOSION_SND = "explosion.ogg"; public static final String DICE = "dice.png"; public static final String DICE_SND = "dice.ogg"; + public static final String INFANTRY_MOVE_SND = "infantry_move.ogg"; + public static final String TANK_MOVE_SND = "tank_move.ogg"; private final FreeTypeFontLoaderParameter params20; private final FreeTypeFontLoaderParameter params25; @@ -75,15 +79,19 @@ public class Assets extends ch.asynk.gdx.boardgame.Assets load(CORNER, Texture.class); load(PATCH, Texture.class); load(PANZER, Texture.class); + load(ENGINEER, Texture.class); load(FONT_20, BitmapFont.class, params20); load(FONT_25, BitmapFont.class, params25); load(HEX_OVERLAYS, TextureAtlas.class); + load(GUN_FIRE, Texture.class); + load(GUN_FIRE_SND, Sound.class); load(SHELL_FIRE, Texture.class); load(SHELL_FIRE_SND, Sound.class); load(EXPLOSIONS, Texture.class); load(EXPLOSION_SND, Sound.class); load(DICE, Texture.class); load(DICE_SND, Sound.class); + load(INFANTRY_MOVE_SND, Sound.class); load(TANK_MOVE_SND, Sound.class); } @@ -95,15 +103,19 @@ public class Assets extends ch.asynk.gdx.boardgame.Assets unload(CORNER); unload(PATCH); unload(PANZER); + unload(ENGINEER); unload(FONT_20); unload(FONT_25); unload(HEX_OVERLAYS); + unload(GUN_FIRE); + unload(GUN_FIRE_SND); unload(SHELL_FIRE); unload(SHELL_FIRE_SND); unload(EXPLOSIONS); unload(EXPLOSION_SND); unload(DICE); unload(DICE_SND); + unload(INFANTRY_MOVE_SND); unload(TANK_MOVE_SND); } } -- cgit v1.1-2-g2b99