summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-11-21 13:24:34 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-11-21 13:24:34 +0100
commit8c559a3e4719c1c822a237cbd23d4022b5338eec (patch)
treea95804276035dc0d8b8e90997aea4542ce49c0ac
parent5862cc19a745921e9002b084d053768c591dde39 (diff)
downloadRustAndDust-8c559a3e4719c1c822a237cbd23d4022b5338eec.zip
RustAndDust-8c559a3e4719c1c822a237cbd23d4022b5338eec.tar.gz
assets: cleanup
-rw-r--r--android/assets/data/ui.atlas16
-rw-r--r--android/assets/data/ui.pngbin43402 -> 21343 bytes
-rw-r--r--android/assets/data/unit-overlays1.atlas62
-rw-r--r--android/assets/data/unit-overlays1.pngbin71361 -> 0 bytes
-rw-r--r--android/assets/data/units1.atlas125
-rw-r--r--android/assets/data/units1.pngbin537971 -> 0 bytes
-rw-r--r--assets/images/explosion.pngbin235866 -> 0 bytes
-rw-r--r--assets/raw/explosion.png (renamed from android/assets/data/explosion.png)bin235866 -> 235866 bytes
-rw-r--r--assets/raw/veteran-black.png (renamed from assets/ui/veteran-black.png)bin8980 -> 8980 bytes
-rw-r--r--assets/raw/veteran-white.png (renamed from assets/ui/veteran-white.png)bin9306 -> 9306 bytes
10 files changed, 1 insertions, 202 deletions
diff --git a/android/assets/data/ui.atlas b/android/assets/data/ui.atlas
index 1ccf5aa..04e8940 100644
--- a/android/assets/data/ui.atlas
+++ b/android/assets/data/ui.atlas
@@ -1,6 +1,6 @@
ui.png
-size: 256,512
+size: 256,128
format: RGBA8888
filter: Nearest,Nearest
repeat: none
@@ -34,17 +34,3 @@ typewriter
orig: 48, 48
offset: 0, 0
index: -1
-veteran-black
- rotate: false
- xy: 2, 117
- size: 118, 391
- orig: 118, 391
- offset: 0, 0
- index: -1
-veteran-white
- rotate: false
- xy: 122, 117
- size: 118, 391
- orig: 118, 391
- offset: 0, 0
- index: -1
diff --git a/android/assets/data/ui.png b/android/assets/data/ui.png
index dfe6fd6..9f06845 100644
--- a/android/assets/data/ui.png
+++ b/android/assets/data/ui.png
Binary files differ
diff --git a/android/assets/data/unit-overlays1.atlas b/android/assets/data/unit-overlays1.atlas
deleted file mode 100644
index b74fa43..0000000
--- a/android/assets/data/unit-overlays1.atlas
+++ /dev/null
@@ -1,62 +0,0 @@
-
-unit-overlays1.png
-size: 1024,256
-format: RGBA8888
-filter: Nearest,Nearest
-repeat: none
-00_move
- rotate: false
- xy: 2, 2
- size: 190, 217
- orig: 190, 217
- offset: 0, 0
- index: -1
-01_target
- rotate: false
- xy: 749, 129
- size: 90, 90
- orig: 90, 90
- offset: 0, 0
- index: -1
-02_fire
- rotate: false
- xy: 194, 69
- size: 100, 150
- orig: 100, 150
- offset: 0, 0
- index: -1
-03_may_fire
- rotate: false
- xy: 296, 69
- size: 100, 150
- orig: 100, 150
- offset: 0, 0
- index: -1
-04_ace
- rotate: false
- xy: 712, 15
- size: 35, 204
- orig: 35, 204
- offset: 0, 0
- index: -1
-05_hq
- rotate: false
- xy: 650, 47
- size: 60, 172
- orig: 60, 172
- offset: 0, 0
- index: -1
-06_fired
- rotate: false
- xy: 398, 95
- size: 124, 124
- orig: 124, 124
- offset: 0, 0
- index: -1
-07_moved
- rotate: false
- xy: 524, 95
- size: 124, 124
- orig: 124, 124
- offset: 0, 0
- index: -1
diff --git a/android/assets/data/unit-overlays1.png b/android/assets/data/unit-overlays1.png
deleted file mode 100644
index e581b78..0000000
--- a/android/assets/data/unit-overlays1.png
+++ /dev/null
Binary files differ
diff --git a/android/assets/data/units1.atlas b/android/assets/data/units1.atlas
deleted file mode 100644
index 3bb8239..0000000
--- a/android/assets/data/units1.atlas
+++ /dev/null
@@ -1,125 +0,0 @@
-
-units1.png
-size: 1024,512
-format: RGBA8888
-filter: Nearest,Nearest
-repeat: none
-ge-at-gun
- rotate: false
- xy: 2, 380
- size: 124, 124
- orig: 124, 124
- offset: 0, 0
- index: -1
-ge-head
- rotate: false
- xy: 380, 46
- size: 25, 206
- orig: 25, 206
- offset: 0, 0
- index: -1
-ge-infantry
- rotate: false
- xy: 2, 254
- size: 124, 124
- orig: 124, 124
- offset: 0, 0
- index: -1
-ge-kingtiger
- rotate: false
- xy: 128, 380
- size: 124, 124
- orig: 124, 124
- offset: 0, 0
- index: -1
-ge-panzer-iv
- rotate: false
- xy: 2, 128
- size: 124, 124
- orig: 124, 124
- offset: 0, 0
- index: -1
-ge-panzer-iv-hq
- rotate: false
- xy: 128, 254
- size: 124, 124
- orig: 124, 124
- offset: 0, 0
- index: -1
-ge-tiger
- rotate: false
- xy: 254, 380
- size: 124, 124
- orig: 124, 124
- offset: 0, 0
- index: -1
-ge-wespe
- rotate: false
- xy: 2, 2
- size: 124, 124
- orig: 124, 124
- offset: 0, 0
- index: -1
-us-at-gun
- rotate: false
- xy: 128, 128
- size: 124, 124
- orig: 124, 124
- offset: 0, 0
- index: -1
-us-head
- rotate: false
- xy: 407, 46
- size: 25, 206
- orig: 25, 206
- offset: 0, 0
- index: -1
-us-infantry
- rotate: false
- xy: 254, 254
- size: 124, 124
- orig: 124, 124
- offset: 0, 0
- index: -1
-us-pershing
- rotate: false
- xy: 380, 380
- size: 124, 124
- orig: 124, 124
- offset: 0, 0
- index: -1
-us-pershing-hq
- rotate: false
- xy: 128, 2
- size: 124, 124
- orig: 124, 124
- offset: 0, 0
- index: -1
-us-priest
- rotate: false
- xy: 254, 128
- size: 124, 124
- orig: 124, 124
- offset: 0, 0
- index: -1
-us-sherman
- rotate: false
- xy: 380, 254
- size: 124, 124
- orig: 124, 124
- offset: 0, 0
- index: -1
-us-sherman-hq
- rotate: false
- xy: 506, 380
- size: 124, 124
- orig: 124, 124
- offset: 0, 0
- index: -1
-us-wolverine
- rotate: false
- xy: 254, 2
- size: 124, 124
- orig: 124, 124
- offset: 0, 0
- index: -1
diff --git a/android/assets/data/units1.png b/android/assets/data/units1.png
deleted file mode 100644
index 3210322..0000000
--- a/android/assets/data/units1.png
+++ /dev/null
Binary files differ
diff --git a/assets/images/explosion.png b/assets/images/explosion.png
deleted file mode 100644
index 82c56cb..0000000
--- a/assets/images/explosion.png
+++ /dev/null
Binary files differ
diff --git a/android/assets/data/explosion.png b/assets/raw/explosion.png
index 82c56cb..82c56cb 100644
--- a/android/assets/data/explosion.png
+++ b/assets/raw/explosion.png
Binary files differ
diff --git a/assets/ui/veteran-black.png b/assets/raw/veteran-black.png
index ea5fcbe..ea5fcbe 100644
--- a/assets/ui/veteran-black.png
+++ b/assets/raw/veteran-black.png
Binary files differ
diff --git a/assets/ui/veteran-white.png b/assets/raw/veteran-white.png
index daa70d9..daa70d9 100644
--- a/assets/ui/veteran-white.png
+++ b/assets/raw/veteran-white.png
Binary files differ