diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2015-12-18 11:10:21 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2015-12-18 11:10:21 +0100 |
| commit | cb81f0a8a194ceebaea880f9027635e6a27df69e (patch) | |
| tree | a64e55aaa5f45d8329737af6633a6d3fe9f3a3ff /assets | |
| parent | 75ff89304eaf9052ab889bb7ec81c96de4fa7908 (diff) | |
| download | RustAndDust-cb81f0a8a194ceebaea880f9027635e6a27df69e.zip RustAndDust-cb81f0a8a194ceebaea880f9027635e6a27df69e.tar.gz | |
UI: merge menu and ui assets, AtlasRegion are known and provided by RustAndDust
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/build.gradle | 6 | ||||
| -rw-r--r-- | assets/ui/from.png (renamed from assets/menu/from.png) | bin | 24482 -> 24482 bytes | |||
| -rw-r--r-- | assets/ui/ge-flag.png (renamed from assets/menu/ge-flag.png) | bin | 5861 -> 5861 bytes | |||
| -rw-r--r-- | assets/ui/move.png (renamed from assets/menu/move.png) | bin | 6551 -> 6551 bytes | |||
| -rw-r--r-- | assets/ui/to.png (renamed from assets/menu/to.png) | bin | 23747 -> 23747 bytes | |||
| -rw-r--r-- | assets/ui/unit.png (renamed from assets/menu/unit.png) | bin | 24810 -> 24810 bytes | |||
| -rw-r--r-- | assets/ui/us-flag.png (renamed from assets/menu/us-flag.png) | bin | 12159 -> 12159 bytes |
7 files changed, 0 insertions, 6 deletions
diff --git a/assets/build.gradle b/assets/build.gradle index a2defc5..d44de99 100644 --- a/assets/build.gradle +++ b/assets/build.gradle @@ -36,12 +36,6 @@ task packUi(type: JavaExec) { args = ['../assets/ui', '../android/assets/data', 'ui'] } -task packMenu(type: JavaExec) { - main = 'com.badlogic.gdx.tools.texturepacker.TexturePacker' - classpath = configurations.texturePacker - args = ['../assets/menu', '../android/assets/data', 'menu'] -} - task packHud(type: JavaExec) { main = 'com.badlogic.gdx.tools.texturepacker.TexturePacker' classpath = configurations.texturePacker diff --git a/assets/menu/from.png b/assets/ui/from.png Binary files differindex 11e5178..11e5178 100644 --- a/assets/menu/from.png +++ b/assets/ui/from.png diff --git a/assets/menu/ge-flag.png b/assets/ui/ge-flag.png Binary files differindex 076be81..076be81 100644 --- a/assets/menu/ge-flag.png +++ b/assets/ui/ge-flag.png diff --git a/assets/menu/move.png b/assets/ui/move.png Binary files differindex ec975d6..ec975d6 100644 --- a/assets/menu/move.png +++ b/assets/ui/move.png diff --git a/assets/menu/to.png b/assets/ui/to.png Binary files differindex e076771..e076771 100644 --- a/assets/menu/to.png +++ b/assets/ui/to.png diff --git a/assets/menu/unit.png b/assets/ui/unit.png Binary files differindex b8eedd0..b8eedd0 100644 --- a/assets/menu/unit.png +++ b/assets/ui/unit.png diff --git a/assets/menu/us-flag.png b/assets/ui/us-flag.png Binary files differindex 1f4b754..1f4b754 100644 --- a/assets/menu/us-flag.png +++ b/assets/ui/us-flag.png |
