From 1c8a54ea827c6746ed53e897d874ba9ac2a88f3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Tue, 29 Dec 2015 13:12:56 +0100 Subject: update assets --- android/assets/data/units1.atlas | 165 +++++++++++++++++++----------- android/assets/data/units1.png | Bin 290209 -> 323878 bytes assets/raw/tank_turret.mp3 | Bin 0 -> 78993 bytes assets/units-gimp/00-units.xcf | Bin 61725 -> 80259 bytes assets/units1/ge-at-gun-body.png | Bin 0 -> 703 bytes assets/units1/ge-at-gun-head.png | Bin 703 -> 0 bytes assets/units1/ge-infantry-body.png | Bin 0 -> 703 bytes assets/units1/ge-infantry-head.png | Bin 703 -> 0 bytes assets/units1/ge-kingtiger-body.png | Bin 0 -> 18402 bytes assets/units1/ge-kingtiger-head.png | Bin 703 -> 0 bytes assets/units1/ge-kingtiger-turret.png | Bin 0 -> 8344 bytes assets/units1/ge-kingtiger.png | Bin 24560 -> 7264 bytes assets/units1/ge-panzer-iv-body.png | Bin 0 -> 10082 bytes assets/units1/ge-panzer-iv-head.png | Bin 703 -> 0 bytes assets/units1/ge-panzer-iv-turret.png | Bin 0 -> 4394 bytes assets/units1/ge-panzer-iv.png | Bin 27406 -> 6817 bytes assets/units1/ge-tiger-body.png | Bin 0 -> 15319 bytes assets/units1/ge-tiger-head.png | Bin 703 -> 0 bytes assets/units1/ge-tiger-turret.png | Bin 0 -> 5242 bytes assets/units1/ge-tiger.png | Bin 23095 -> 6070 bytes assets/units1/ge-wespe-body.png | Bin 0 -> 5669 bytes assets/units1/ge-wespe-head.png | Bin 703 -> 0 bytes assets/units1/ge-wespe-turret.png | Bin 0 -> 4674 bytes assets/units1/ge-wespe.png | Bin 27552 -> 6516 bytes assets/units1/us-at-gun-body.png | Bin 0 -> 818 bytes assets/units1/us-at-gun-head.png | Bin 818 -> 0 bytes assets/units1/us-infantry-body.png | Bin 0 -> 818 bytes assets/units1/us-infantry-head.png | Bin 818 -> 0 bytes assets/units1/us-m10-wolverine-body.png | Bin 0 -> 12125 bytes assets/units1/us-m10-wolverine-head.png | Bin 15391 -> 0 bytes assets/units1/us-m10-wolverine-turret.png | Bin 0 -> 7205 bytes assets/units1/us-m26-pershing-body.png | Bin 0 -> 14053 bytes assets/units1/us-m26-pershing-head.png | Bin 18916 -> 0 bytes assets/units1/us-m26-pershing-turret.png | Bin 0 -> 7191 bytes assets/units1/us-m4-sherman-body.png | Bin 0 -> 9128 bytes assets/units1/us-m4-sherman-head.png | Bin 11422 -> 0 bytes assets/units1/us-m4-sherman-turret.png | Bin 0 -> 4861 bytes assets/units1/us-m7-priest-body.png | Bin 0 -> 11075 bytes assets/units1/us-m7-priest-head.png | Bin 11519 -> 0 bytes 39 files changed, 107 insertions(+), 58 deletions(-) create mode 100644 assets/raw/tank_turret.mp3 create mode 100644 assets/units1/ge-at-gun-body.png delete mode 100644 assets/units1/ge-at-gun-head.png create mode 100644 assets/units1/ge-infantry-body.png delete mode 100644 assets/units1/ge-infantry-head.png create mode 100644 assets/units1/ge-kingtiger-body.png delete mode 100644 assets/units1/ge-kingtiger-head.png create mode 100644 assets/units1/ge-kingtiger-turret.png create mode 100644 assets/units1/ge-panzer-iv-body.png delete mode 100644 assets/units1/ge-panzer-iv-head.png create mode 100644 assets/units1/ge-panzer-iv-turret.png create mode 100644 assets/units1/ge-tiger-body.png delete mode 100644 assets/units1/ge-tiger-head.png create mode 100644 assets/units1/ge-tiger-turret.png create mode 100644 assets/units1/ge-wespe-body.png delete mode 100644 assets/units1/ge-wespe-head.png create mode 100644 assets/units1/ge-wespe-turret.png create mode 100644 assets/units1/us-at-gun-body.png delete mode 100644 assets/units1/us-at-gun-head.png create mode 100644 assets/units1/us-infantry-body.png delete mode 100644 assets/units1/us-infantry-head.png create mode 100644 assets/units1/us-m10-wolverine-body.png delete mode 100644 assets/units1/us-m10-wolverine-head.png create mode 100644 assets/units1/us-m10-wolverine-turret.png create mode 100644 assets/units1/us-m26-pershing-body.png delete mode 100644 assets/units1/us-m26-pershing-head.png create mode 100644 assets/units1/us-m26-pershing-turret.png create mode 100644 assets/units1/us-m4-sherman-body.png delete mode 100644 assets/units1/us-m4-sherman-head.png create mode 100644 assets/units1/us-m4-sherman-turret.png create mode 100644 assets/units1/us-m7-priest-body.png delete mode 100644 assets/units1/us-m7-priest-head.png 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 Binary files a/android/assets/data/units1.png and b/android/assets/data/units1.png differ diff --git a/assets/raw/tank_turret.mp3 b/assets/raw/tank_turret.mp3 new file mode 100644 index 0000000..9df2ba6 Binary files /dev/null and b/assets/raw/tank_turret.mp3 differ diff --git a/assets/units-gimp/00-units.xcf b/assets/units-gimp/00-units.xcf index c5ef85d..90089ab 100644 Binary files a/assets/units-gimp/00-units.xcf and b/assets/units-gimp/00-units.xcf differ diff --git a/assets/units1/ge-at-gun-body.png b/assets/units1/ge-at-gun-body.png new file mode 100644 index 0000000..bb9aa84 Binary files /dev/null and b/assets/units1/ge-at-gun-body.png differ diff --git a/assets/units1/ge-at-gun-head.png b/assets/units1/ge-at-gun-head.png deleted file mode 100644 index bb9aa84..0000000 Binary files a/assets/units1/ge-at-gun-head.png and /dev/null differ diff --git a/assets/units1/ge-infantry-body.png b/assets/units1/ge-infantry-body.png new file mode 100644 index 0000000..bb9aa84 Binary files /dev/null and b/assets/units1/ge-infantry-body.png differ diff --git a/assets/units1/ge-infantry-head.png b/assets/units1/ge-infantry-head.png deleted file mode 100644 index bb9aa84..0000000 Binary files a/assets/units1/ge-infantry-head.png and /dev/null differ diff --git a/assets/units1/ge-kingtiger-body.png b/assets/units1/ge-kingtiger-body.png new file mode 100644 index 0000000..5269d54 Binary files /dev/null and b/assets/units1/ge-kingtiger-body.png differ diff --git a/assets/units1/ge-kingtiger-head.png b/assets/units1/ge-kingtiger-head.png deleted file mode 100644 index bb9aa84..0000000 Binary files a/assets/units1/ge-kingtiger-head.png and /dev/null differ diff --git a/assets/units1/ge-kingtiger-turret.png b/assets/units1/ge-kingtiger-turret.png new file mode 100644 index 0000000..537aec7 Binary files /dev/null and b/assets/units1/ge-kingtiger-turret.png differ diff --git a/assets/units1/ge-kingtiger.png b/assets/units1/ge-kingtiger.png index e9b5ad1..12ccf80 100644 Binary files a/assets/units1/ge-kingtiger.png and b/assets/units1/ge-kingtiger.png 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 Binary files /dev/null and b/assets/units1/ge-panzer-iv-body.png 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 Binary files a/assets/units1/ge-panzer-iv-head.png and /dev/null 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 Binary files /dev/null and b/assets/units1/ge-panzer-iv-turret.png differ diff --git a/assets/units1/ge-panzer-iv.png b/assets/units1/ge-panzer-iv.png index 865733f..e807863 100644 Binary files a/assets/units1/ge-panzer-iv.png and b/assets/units1/ge-panzer-iv.png differ diff --git a/assets/units1/ge-tiger-body.png b/assets/units1/ge-tiger-body.png new file mode 100644 index 0000000..1b27315 Binary files /dev/null and b/assets/units1/ge-tiger-body.png differ diff --git a/assets/units1/ge-tiger-head.png b/assets/units1/ge-tiger-head.png deleted file mode 100644 index bb9aa84..0000000 Binary files a/assets/units1/ge-tiger-head.png and /dev/null differ diff --git a/assets/units1/ge-tiger-turret.png b/assets/units1/ge-tiger-turret.png new file mode 100644 index 0000000..2b15f28 Binary files /dev/null and b/assets/units1/ge-tiger-turret.png differ diff --git a/assets/units1/ge-tiger.png b/assets/units1/ge-tiger.png index 962ea48..1ac03e1 100644 Binary files a/assets/units1/ge-tiger.png and b/assets/units1/ge-tiger.png differ diff --git a/assets/units1/ge-wespe-body.png b/assets/units1/ge-wespe-body.png new file mode 100644 index 0000000..f5669e9 Binary files /dev/null and b/assets/units1/ge-wespe-body.png differ diff --git a/assets/units1/ge-wespe-head.png b/assets/units1/ge-wespe-head.png deleted file mode 100644 index bb9aa84..0000000 Binary files a/assets/units1/ge-wespe-head.png and /dev/null differ diff --git a/assets/units1/ge-wespe-turret.png b/assets/units1/ge-wespe-turret.png new file mode 100644 index 0000000..855a955 Binary files /dev/null and b/assets/units1/ge-wespe-turret.png differ diff --git a/assets/units1/ge-wespe.png b/assets/units1/ge-wespe.png index df02e51..c3b3f8d 100644 Binary files a/assets/units1/ge-wespe.png and b/assets/units1/ge-wespe.png differ diff --git a/assets/units1/us-at-gun-body.png b/assets/units1/us-at-gun-body.png new file mode 100644 index 0000000..2f1eb07 Binary files /dev/null and b/assets/units1/us-at-gun-body.png differ diff --git a/assets/units1/us-at-gun-head.png b/assets/units1/us-at-gun-head.png deleted file mode 100644 index 2f1eb07..0000000 Binary files a/assets/units1/us-at-gun-head.png and /dev/null differ diff --git a/assets/units1/us-infantry-body.png b/assets/units1/us-infantry-body.png new file mode 100644 index 0000000..2f1eb07 Binary files /dev/null and b/assets/units1/us-infantry-body.png differ diff --git a/assets/units1/us-infantry-head.png b/assets/units1/us-infantry-head.png deleted file mode 100644 index 2f1eb07..0000000 Binary files a/assets/units1/us-infantry-head.png and /dev/null 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 Binary files /dev/null and b/assets/units1/us-m10-wolverine-body.png 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 Binary files a/assets/units1/us-m10-wolverine-head.png and /dev/null 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 Binary files /dev/null and b/assets/units1/us-m10-wolverine-turret.png 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 Binary files /dev/null and b/assets/units1/us-m26-pershing-body.png 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 Binary files a/assets/units1/us-m26-pershing-head.png and /dev/null 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 Binary files /dev/null and b/assets/units1/us-m26-pershing-turret.png 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 Binary files /dev/null and b/assets/units1/us-m4-sherman-body.png 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 Binary files a/assets/units1/us-m4-sherman-head.png and /dev/null 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 Binary files /dev/null and b/assets/units1/us-m4-sherman-turret.png 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 Binary files /dev/null and b/assets/units1/us-m7-priest-body.png 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 Binary files a/assets/units1/us-m7-priest-head.png and /dev/null differ -- cgit v1.1-2-g2b99