summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-12-29 13:12:56 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-12-29 13:12:56 +0100
commit1c8a54ea827c6746ed53e897d874ba9ac2a88f3b (patch)
treeb5280a03e02c555e4fb9dbf73e584458d061e8fa
parent89b7db7ccef38c37b96bb1b0693bda80f5ebfff0 (diff)
downloadRustAndDust-1c8a54ea827c6746ed53e897d874ba9ac2a88f3b.zip
RustAndDust-1c8a54ea827c6746ed53e897d874ba9ac2a88f3b.tar.gz
update assets
-rw-r--r--android/assets/data/units1.atlas165
-rw-r--r--android/assets/data/units1.pngbin290209 -> 323878 bytes
-rw-r--r--assets/raw/tank_turret.mp3bin0 -> 78993 bytes
-rw-r--r--assets/units-gimp/00-units.xcfbin61725 -> 80259 bytes
-rw-r--r--assets/units1/ge-at-gun-body.png (renamed from assets/units1/ge-at-gun-head.png)bin703 -> 703 bytes
-rw-r--r--assets/units1/ge-infantry-body.png (renamed from assets/units1/ge-infantry-head.png)bin703 -> 703 bytes
-rw-r--r--assets/units1/ge-kingtiger-body.pngbin0 -> 18402 bytes
-rw-r--r--assets/units1/ge-kingtiger-head.pngbin703 -> 0 bytes
-rw-r--r--assets/units1/ge-kingtiger-turret.pngbin0 -> 8344 bytes
-rw-r--r--assets/units1/ge-kingtiger.pngbin24560 -> 7264 bytes
-rw-r--r--assets/units1/ge-panzer-iv-body.pngbin0 -> 10082 bytes
-rw-r--r--assets/units1/ge-panzer-iv-head.pngbin703 -> 0 bytes
-rw-r--r--assets/units1/ge-panzer-iv-turret.pngbin0 -> 4394 bytes
-rw-r--r--assets/units1/ge-panzer-iv.pngbin27406 -> 6817 bytes
-rw-r--r--assets/units1/ge-tiger-body.pngbin0 -> 15319 bytes
-rw-r--r--assets/units1/ge-tiger-head.pngbin703 -> 0 bytes
-rw-r--r--assets/units1/ge-tiger-turret.pngbin0 -> 5242 bytes
-rw-r--r--assets/units1/ge-tiger.pngbin23095 -> 6070 bytes
-rw-r--r--assets/units1/ge-wespe-body.pngbin0 -> 5669 bytes
-rw-r--r--assets/units1/ge-wespe-head.pngbin703 -> 0 bytes
-rw-r--r--assets/units1/ge-wespe-turret.pngbin0 -> 4674 bytes
-rw-r--r--assets/units1/ge-wespe.pngbin27552 -> 6516 bytes
-rw-r--r--assets/units1/us-at-gun-body.png (renamed from assets/units1/us-at-gun-head.png)bin818 -> 818 bytes
-rw-r--r--assets/units1/us-infantry-body.png (renamed from assets/units1/us-infantry-head.png)bin818 -> 818 bytes
-rw-r--r--assets/units1/us-m10-wolverine-body.pngbin0 -> 12125 bytes
-rw-r--r--assets/units1/us-m10-wolverine-head.pngbin15391 -> 0 bytes
-rw-r--r--assets/units1/us-m10-wolverine-turret.pngbin0 -> 7205 bytes
-rw-r--r--assets/units1/us-m26-pershing-body.pngbin0 -> 14053 bytes
-rw-r--r--assets/units1/us-m26-pershing-head.pngbin18916 -> 0 bytes
-rw-r--r--assets/units1/us-m26-pershing-turret.pngbin0 -> 7191 bytes
-rw-r--r--assets/units1/us-m4-sherman-body.pngbin0 -> 9128 bytes
-rw-r--r--assets/units1/us-m4-sherman-head.pngbin11422 -> 0 bytes
-rw-r--r--assets/units1/us-m4-sherman-turret.pngbin0 -> 4861 bytes
-rw-r--r--assets/units1/us-m7-priest-body.pngbin0 -> 11075 bytes
-rw-r--r--assets/units1/us-m7-priest-head.pngbin11519 -> 0 bytes
35 files changed, 107 insertions, 58 deletions
diff --git a/android/assets/data/units1.atlas b/android/assets/data/units1.atlas
index f1bc1e8..99e6350 100644
--- a/android/assets/data/units1.atlas
+++ b/android/assets/data/units1.atlas
@@ -1,173 +1,222 @@
units1.png
-size: 1024,512
+size: 1024,1024
format: RGBA8888
filter: Nearest,Nearest
repeat: none
ge-at-gun
rotate: false
- xy: 364, 322
+ xy: 183, 214
size: 128, 128
orig: 128, 128
offset: 0, 0
index: -1
-ge-at-gun-head
+ge-at-gun-body
rotate: false
- xy: 883, 255
+ xy: 524, 597
size: 25, 195
orig: 25, 195
offset: 0, 0
index: -1
-ge-wespe-head
+ge-infantry-body
rotate: false
- xy: 883, 255
+ xy: 524, 597
size: 25, 195
orig: 25, 195
offset: 0, 0
index: -1
-ge-infantry-head
+ge-infantry
rotate: false
- xy: 883, 255
- size: 25, 195
- orig: 25, 195
+ xy: 378, 397
+ size: 128, 128
+ orig: 128, 128
offset: 0, 0
index: -1
-ge-tiger-head
+ge-kingtiger
rotate: false
- xy: 883, 255
- size: 25, 195
- orig: 25, 195
+ xy: 2, 794
+ size: 193, 223
+ orig: 193, 223
offset: 0, 0
index: -1
-ge-panzer-iv-head
+ge-kingtiger-body
rotate: false
- xy: 883, 255
- size: 25, 195
- orig: 25, 195
+ xy: 378, 527
+ size: 71, 265
+ orig: 71, 265
offset: 0, 0
index: -1
-ge-kingtiger-head
+ge-kingtiger-turret
rotate: false
- xy: 883, 255
- size: 25, 195
- orig: 25, 195
+ xy: 451, 527
+ size: 71, 265
+ orig: 71, 265
offset: 0, 0
index: -1
-ge-infantry
+ge-panzer-iv
rotate: false
- xy: 364, 192
- size: 128, 128
- orig: 128, 128
+ xy: 2, 569
+ size: 193, 223
+ orig: 193, 223
offset: 0, 0
index: -1
-ge-kingtiger
+ge-panzer-iv-body
rotate: false
- xy: 494, 322
- size: 128, 128
- orig: 128, 128
+ xy: 106, 12
+ size: 54, 105
+ orig: 54, 105
offset: 0, 0
index: -1
-ge-panzer-iv
+ge-panzer-iv-turret
rotate: false
- xy: 364, 62
- size: 128, 128
- orig: 128, 128
+ xy: 183, 107
+ size: 54, 105
+ orig: 54, 105
offset: 0, 0
index: -1
ge-tiger
rotate: false
- xy: 494, 192
- size: 128, 128
- orig: 128, 128
+ xy: 197, 794
+ size: 193, 223
+ orig: 193, 223
+ offset: 0, 0
+ index: -1
+ge-tiger-body
+ rotate: false
+ xy: 573, 787
+ size: 68, 230
+ orig: 68, 230
+ offset: 0, 0
+ index: -1
+ge-tiger-turret
+ rotate: false
+ xy: 643, 787
+ size: 68, 230
+ orig: 68, 230
offset: 0, 0
index: -1
ge-wespe
rotate: false
- xy: 624, 322
- size: 128, 128
- orig: 128, 128
+ xy: 2, 344
+ size: 193, 223
+ orig: 193, 223
+ offset: 0, 0
+ index: -1
+ge-wespe-body
+ rotate: false
+ xy: 973, 889
+ size: 43, 128
+ orig: 43, 128
+ offset: 0, 0
+ index: -1
+ge-wespe-turret
+ rotate: false
+ xy: 239, 84
+ size: 43, 128
+ orig: 43, 128
offset: 0, 0
index: -1
us-at-gun
rotate: false
- xy: 494, 62
+ xy: 713, 889
size: 128, 128
orig: 128, 128
offset: 0, 0
index: -1
-us-at-gun-head
+us-at-gun-body
rotate: false
- xy: 910, 255
+ xy: 689, 590
size: 25, 195
orig: 25, 195
offset: 0, 0
index: -1
-us-infantry-head
+us-infantry-body
rotate: false
- xy: 910, 255
+ xy: 689, 590
size: 25, 195
orig: 25, 195
offset: 0, 0
index: -1
us-infantry
rotate: false
- xy: 624, 192
+ xy: 843, 889
size: 128, 128
orig: 128, 128
offset: 0, 0
index: -1
us-m10-wolverine
rotate: false
- xy: 2, 227
+ xy: 197, 569
size: 179, 223
orig: 179, 223
offset: 0, 0
index: -1
-us-m10-wolverine-head
+us-m10-wolverine-body
rotate: false
- xy: 823, 287
+ xy: 313, 179
+ size: 58, 163
+ orig: 58, 163
+ offset: 0, 0
+ index: -1
+us-m10-wolverine-turret
+ rotate: false
+ xy: 373, 179
size: 58, 163
orig: 58, 163
offset: 0, 0
index: -1
us-m26-pershing
rotate: false
- xy: 2, 2
+ xy: 392, 794
size: 179, 223
orig: 179, 223
offset: 0, 0
index: -1
-us-m26-pershing-head
+us-m26-pershing-body
+ rotate: false
+ xy: 551, 603
+ size: 67, 182
+ orig: 67, 182
+ offset: 0, 0
+ index: -1
+us-m26-pershing-turret
rotate: false
- xy: 754, 268
+ xy: 620, 603
size: 67, 182
orig: 67, 182
offset: 0, 0
index: -1
us-m4-sherman
rotate: false
- xy: 183, 227
+ xy: 2, 119
size: 179, 223
orig: 179, 223
offset: 0, 0
index: -1
-us-m4-sherman-head
+us-m4-sherman-body
+ rotate: false
+ xy: 2, 2
+ size: 50, 115
+ orig: 50, 115
+ offset: 0, 0
+ index: -1
+us-m4-sherman-turret
rotate: false
- xy: 624, 75
+ xy: 54, 2
size: 50, 115
orig: 50, 115
offset: 0, 0
index: -1
us-m7-priest
rotate: false
- xy: 183, 2
+ xy: 197, 344
size: 179, 223
orig: 179, 223
offset: 0, 0
index: -1
-us-m7-priest-head
+us-m7-priest-body
rotate: false
- xy: 937, 359
+ xy: 713, 796
size: 54, 91
orig: 54, 91
offset: 0, 0
diff --git a/android/assets/data/units1.png b/android/assets/data/units1.png
index 82ab39d..6876bc6 100644
--- a/android/assets/data/units1.png
+++ b/android/assets/data/units1.png
Binary files differ
diff --git a/assets/raw/tank_turret.mp3 b/assets/raw/tank_turret.mp3
new file mode 100644
index 0000000..9df2ba6
--- /dev/null
+++ b/assets/raw/tank_turret.mp3
Binary files differ
diff --git a/assets/units-gimp/00-units.xcf b/assets/units-gimp/00-units.xcf
index c5ef85d..90089ab 100644
--- a/assets/units-gimp/00-units.xcf
+++ b/assets/units-gimp/00-units.xcf
Binary files differ
diff --git a/assets/units1/ge-at-gun-head.png b/assets/units1/ge-at-gun-body.png
index bb9aa84..bb9aa84 100644
--- a/assets/units1/ge-at-gun-head.png
+++ b/assets/units1/ge-at-gun-body.png
Binary files differ
diff --git a/assets/units1/ge-infantry-head.png b/assets/units1/ge-infantry-body.png
index bb9aa84..bb9aa84 100644
--- a/assets/units1/ge-infantry-head.png
+++ b/assets/units1/ge-infantry-body.png
Binary files differ
diff --git a/assets/units1/ge-kingtiger-body.png b/assets/units1/ge-kingtiger-body.png
new file mode 100644
index 0000000..5269d54
--- /dev/null
+++ b/assets/units1/ge-kingtiger-body.png
Binary files differ
diff --git a/assets/units1/ge-kingtiger-head.png b/assets/units1/ge-kingtiger-head.png
deleted file mode 100644
index bb9aa84..0000000
--- a/assets/units1/ge-kingtiger-head.png
+++ /dev/null
Binary files differ
diff --git a/assets/units1/ge-kingtiger-turret.png b/assets/units1/ge-kingtiger-turret.png
new file mode 100644
index 0000000..537aec7
--- /dev/null
+++ b/assets/units1/ge-kingtiger-turret.png
Binary files differ
diff --git a/assets/units1/ge-kingtiger.png b/assets/units1/ge-kingtiger.png
index e9b5ad1..12ccf80 100644
--- a/assets/units1/ge-kingtiger.png
+++ b/assets/units1/ge-kingtiger.png
Binary files differ
diff --git a/assets/units1/ge-panzer-iv-body.png b/assets/units1/ge-panzer-iv-body.png
new file mode 100644
index 0000000..15f67b6
--- /dev/null
+++ b/assets/units1/ge-panzer-iv-body.png
Binary files differ
diff --git a/assets/units1/ge-panzer-iv-head.png b/assets/units1/ge-panzer-iv-head.png
deleted file mode 100644
index bb9aa84..0000000
--- a/assets/units1/ge-panzer-iv-head.png
+++ /dev/null
Binary files differ
diff --git a/assets/units1/ge-panzer-iv-turret.png b/assets/units1/ge-panzer-iv-turret.png
new file mode 100644
index 0000000..43e59d9
--- /dev/null
+++ b/assets/units1/ge-panzer-iv-turret.png
Binary files differ
diff --git a/assets/units1/ge-panzer-iv.png b/assets/units1/ge-panzer-iv.png
index 865733f..e807863 100644
--- a/assets/units1/ge-panzer-iv.png
+++ b/assets/units1/ge-panzer-iv.png
Binary files differ
diff --git a/assets/units1/ge-tiger-body.png b/assets/units1/ge-tiger-body.png
new file mode 100644
index 0000000..1b27315
--- /dev/null
+++ b/assets/units1/ge-tiger-body.png
Binary files differ
diff --git a/assets/units1/ge-tiger-head.png b/assets/units1/ge-tiger-head.png
deleted file mode 100644
index bb9aa84..0000000
--- a/assets/units1/ge-tiger-head.png
+++ /dev/null
Binary files differ
diff --git a/assets/units1/ge-tiger-turret.png b/assets/units1/ge-tiger-turret.png
new file mode 100644
index 0000000..2b15f28
--- /dev/null
+++ b/assets/units1/ge-tiger-turret.png
Binary files differ
diff --git a/assets/units1/ge-tiger.png b/assets/units1/ge-tiger.png
index 962ea48..1ac03e1 100644
--- a/assets/units1/ge-tiger.png
+++ b/assets/units1/ge-tiger.png
Binary files differ
diff --git a/assets/units1/ge-wespe-body.png b/assets/units1/ge-wespe-body.png
new file mode 100644
index 0000000..f5669e9
--- /dev/null
+++ b/assets/units1/ge-wespe-body.png
Binary files differ
diff --git a/assets/units1/ge-wespe-head.png b/assets/units1/ge-wespe-head.png
deleted file mode 100644
index bb9aa84..0000000
--- a/assets/units1/ge-wespe-head.png
+++ /dev/null
Binary files differ
diff --git a/assets/units1/ge-wespe-turret.png b/assets/units1/ge-wespe-turret.png
new file mode 100644
index 0000000..855a955
--- /dev/null
+++ b/assets/units1/ge-wespe-turret.png
Binary files differ
diff --git a/assets/units1/ge-wespe.png b/assets/units1/ge-wespe.png
index df02e51..c3b3f8d 100644
--- a/assets/units1/ge-wespe.png
+++ b/assets/units1/ge-wespe.png
Binary files differ
diff --git a/assets/units1/us-at-gun-head.png b/assets/units1/us-at-gun-body.png
index 2f1eb07..2f1eb07 100644
--- a/assets/units1/us-at-gun-head.png
+++ b/assets/units1/us-at-gun-body.png
Binary files differ
diff --git a/assets/units1/us-infantry-head.png b/assets/units1/us-infantry-body.png
index 2f1eb07..2f1eb07 100644
--- a/assets/units1/us-infantry-head.png
+++ b/assets/units1/us-infantry-body.png
Binary files differ
diff --git a/assets/units1/us-m10-wolverine-body.png b/assets/units1/us-m10-wolverine-body.png
new file mode 100644
index 0000000..6c555df
--- /dev/null
+++ b/assets/units1/us-m10-wolverine-body.png
Binary files differ
diff --git a/assets/units1/us-m10-wolverine-head.png b/assets/units1/us-m10-wolverine-head.png
deleted file mode 100644
index 3fd2fb4..0000000
--- a/assets/units1/us-m10-wolverine-head.png
+++ /dev/null
Binary files differ
diff --git a/assets/units1/us-m10-wolverine-turret.png b/assets/units1/us-m10-wolverine-turret.png
new file mode 100644
index 0000000..cfbe8ce
--- /dev/null
+++ b/assets/units1/us-m10-wolverine-turret.png
Binary files differ
diff --git a/assets/units1/us-m26-pershing-body.png b/assets/units1/us-m26-pershing-body.png
new file mode 100644
index 0000000..120e444
--- /dev/null
+++ b/assets/units1/us-m26-pershing-body.png
Binary files differ
diff --git a/assets/units1/us-m26-pershing-head.png b/assets/units1/us-m26-pershing-head.png
deleted file mode 100644
index 599eaae..0000000
--- a/assets/units1/us-m26-pershing-head.png
+++ /dev/null
Binary files differ
diff --git a/assets/units1/us-m26-pershing-turret.png b/assets/units1/us-m26-pershing-turret.png
new file mode 100644
index 0000000..1f109bd
--- /dev/null
+++ b/assets/units1/us-m26-pershing-turret.png
Binary files differ
diff --git a/assets/units1/us-m4-sherman-body.png b/assets/units1/us-m4-sherman-body.png
new file mode 100644
index 0000000..7c7ba9a
--- /dev/null
+++ b/assets/units1/us-m4-sherman-body.png
Binary files differ
diff --git a/assets/units1/us-m4-sherman-head.png b/assets/units1/us-m4-sherman-head.png
deleted file mode 100644
index dfa0821..0000000
--- a/assets/units1/us-m4-sherman-head.png
+++ /dev/null
Binary files differ
diff --git a/assets/units1/us-m4-sherman-turret.png b/assets/units1/us-m4-sherman-turret.png
new file mode 100644
index 0000000..4a29fc7
--- /dev/null
+++ b/assets/units1/us-m4-sherman-turret.png
Binary files differ
diff --git a/assets/units1/us-m7-priest-body.png b/assets/units1/us-m7-priest-body.png
new file mode 100644
index 0000000..2d9d497
--- /dev/null
+++ b/assets/units1/us-m7-priest-body.png
Binary files differ
diff --git a/assets/units1/us-m7-priest-head.png b/assets/units1/us-m7-priest-head.png
deleted file mode 100644
index 3f8ee7d..0000000
--- a/assets/units1/us-m7-priest-head.png
+++ /dev/null
Binary files differ