diff --git a/.gitignore b/.gitignore index 385ee86..6d842f2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,63 +5,121 @@ *.ear hs_err_pid* +## Robovm +/ios/robovm-build/ + ## GWT -war/ -html/war/gwt_bree/ -html/gwt-unitCache/ +/html/war/ +/html/gwt-unitCache/ .apt_generated/ -html/war/WEB-INF/deploy/ -html/war/WEB-INF/classes/ .gwt/ gwt-unitCache/ www-test/ .gwt-tmp/ ## Android Studio and Intellij and Android in general -android/libs/armeabi/ -android/libs/armeabi-v7a/ -android/libs/x86/ -android/gen/ +/android/libs/armeabi/ +/android/libs/armeabi-v7a/ +/android/libs/arm64-v8a/ +/android/libs/x86/ +/android/libs/x86_64/ +/android/gen/ .idea/ *.ipr *.iws *.iml -out/ +/android/out/ com_crashlytics_export_strings.xml ## Eclipse + .classpath .project -.metadata -**/bin/ -tmp/ +.metadata/ +/android/bin/ +/core/bin/ +/desktop/bin/ +/html/bin/ +/ios/bin/ +/ios-moe/bin/ *.tmp *.bak *.swp *~.nib -local.properties .settings/ .loadpath .externalToolBuilders/ *.launch ## NetBeans -**/nbproject/private/ -build/ -nbbuild/ -dist/ -nbdist/ + +/nbproject/private/ +/android/nbproject/private/ +/core/nbproject/private/ +/desktop/nbproject/private/ +/html/nbproject/private/ +/ios/nbproject/private/ +/ios-moe/nbproject/private/ + +/build/ +/android/build/ +/core/build/ +/desktop/build/ +/html/build/ +/ios/build/ +/ios-moe/build/ + +/nbbuild/ +/android/nbbuild/ +/core/nbbuild/ +/desktop/nbbuild/ +/html/nbbuild/ +/ios/nbbuild/ +/ios-moe/nbbuild/ + +/dist/ +/android/dist/ +/core/dist/ +/desktop/dist/ +/html/dist/ +/ios/dist/ +/ios-moe/dist/ + +/nbdist/ +/android/nbdist/ +/core/nbdist/ +/desktop/nbdist/ +/html/nbdist/ +/ios/nbdist/ +/ios-moe/nbdist/ + nbactions.xml nb-configuration.xml ## Gradle -.gradle -build/ +/local.properties +.gradle/ +gradle-app.setting +/build/ +/android/build/ +/core/build/ +/desktop/build/ +/html/build/ +/ios/build/ +/ios-moe/build/ ## OS Specific .DS_Store +Thumbs.db -########################### +## iOS +/ios/xcode/*.xcodeproj/* +!/ios/xcode/*.xcodeproj/xcshareddata +!/ios/xcode/*.xcodeproj/project.pbxproj +/ios/xcode/native/ -libgdx/ +/ios-moe/xcode/*.xcodeproj/* +!/ios-moe/xcode/*.xcodeproj/xcshareddata +!/ios-moe/xcode/*.xcodeproj/project.pbxproj +/ios-moe/xcode/native/ diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 3cd1afd..bdd68d5 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,10 +1,8 @@ + package="de.samdev.colorrunner" > - + diff --git a/android/assets/data/jet.png b/android/assets/data/jet.png deleted file mode 100644 index 7b261eb..0000000 Binary files a/android/assets/data/jet.png and /dev/null differ diff --git a/android/assets/fonts/font.fnt b/android/assets/fonts/font.fnt deleted file mode 100644 index 7a873f6..0000000 --- a/android/assets/fonts/font.fnt +++ /dev/null @@ -1,1613 +0,0 @@ -info face="Calibri" size=48 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1 outline=0 -common lineHeight=48 base=37 scaleW=512 scaleH=256 pages=1 packed=0 alphaChnl=0 redChnl=4 greenChnl=4 blueChnl=4 -page id=0 file="font_0.png" -chars count=193 -char id=0 x=510 y=0 width=0 height=1 xoffset=0 yoffset=47 xadvance=0 page=0 chnl=15 -char id=13 x=511 y=0 width=0 height=1 xoffset=0 yoffset=47 xadvance=0 page=0 chnl=15 -char id=32 x=508 y=62 width=3 height=1 xoffset=-1 yoffset=47 xadvance=9 page=0 chnl=15 -char id=33 x=454 y=62 width=6 height=26 xoffset=4 yoffset=11 xadvance=13 page=0 chnl=15 -char id=34 x=85 y=168 width=11 height=10 xoffset=2 yoffset=11 xadvance=16 page=0 chnl=15 -char id=35 x=389 y=89 width=19 height=25 xoffset=0 yoffset=12 xadvance=19 page=0 chnl=15 -char id=36 x=30 y=0 width=18 height=34 xoffset=1 yoffset=8 xadvance=20 page=0 chnl=15 -char id=37 x=172 y=67 width=26 height=26 xoffset=1 yoffset=12 xadvance=28 page=0 chnl=15 -char id=38 x=251 y=66 width=25 height=26 xoffset=1 yoffset=11 xadvance=27 page=0 chnl=15 -char id=39 x=505 y=140 width=5 height=10 xoffset=2 yoffset=11 xadvance=9 page=0 chnl=15 -char id=40 x=68 y=0 width=8 height=34 xoffset=2 yoffset=10 xadvance=12 page=0 chnl=15 -char id=41 x=77 y=0 width=8 height=34 xoffset=2 yoffset=10 xadvance=12 page=0 chnl=15 -char id=42 x=51 y=170 width=15 height=14 xoffset=2 yoffset=10 xadvance=19 page=0 chnl=15 -char id=43 x=83 y=148 width=18 height=19 xoffset=1 yoffset=16 xadvance=19 page=0 chnl=15 -char id=44 x=97 y=168 width=8 height=10 xoffset=0 yoffset=33 xadvance=10 page=0 chnl=15 -char id=45 x=245 y=165 width=10 height=3 xoffset=1 yoffset=26 xadvance=12 page=0 chnl=15 -char id=46 x=196 y=165 width=6 height=4 xoffset=2 yoffset=33 xadvance=10 page=0 chnl=15 -char id=47 x=385 y=0 width=17 height=33 xoffset=-1 yoffset=9 xadvance=15 page=0 chnl=15 -char id=48 x=19 y=124 width=18 height=25 xoffset=1 yoffset=12 xadvance=20 page=0 chnl=15 -char id=49 x=378 y=115 width=15 height=25 xoffset=3 yoffset=12 xadvance=20 page=0 chnl=15 -char id=50 x=151 y=121 width=17 height=25 xoffset=1 yoffset=12 xadvance=20 page=0 chnl=15 -char id=51 x=169 y=121 width=17 height=25 xoffset=1 yoffset=12 xadvance=20 page=0 chnl=15 -char id=52 x=243 y=94 width=20 height=25 xoffset=0 yoffset=12 xadvance=20 page=0 chnl=15 -char id=53 x=187 y=120 width=17 height=25 xoffset=1 yoffset=12 xadvance=20 page=0 chnl=15 -char id=54 x=487 y=88 width=18 height=25 xoffset=1 yoffset=12 xadvance=20 page=0 chnl=15 -char id=55 x=38 y=122 width=18 height=25 xoffset=1 yoffset=12 xadvance=20 page=0 chnl=15 -char id=56 x=57 y=122 width=18 height=25 xoffset=1 yoffset=12 xadvance=20 page=0 chnl=15 -char id=57 x=76 y=122 width=18 height=25 xoffset=1 yoffset=12 xadvance=20 page=0 chnl=15 -char id=58 x=506 y=114 width=5 height=18 xoffset=3 yoffset=19 xadvance=10 page=0 chnl=15 -char id=59 x=34 y=150 width=8 height=23 xoffset=0 yoffset=20 xadvance=10 page=0 chnl=15 -char id=60 x=275 y=146 width=17 height=18 xoffset=1 yoffset=17 xadvance=19 page=0 chnl=15 -char id=61 x=67 y=168 width=17 height=11 xoffset=1 yoffset=20 xadvance=19 page=0 chnl=15 -char id=62 x=237 y=146 width=18 height=18 xoffset=1 yoffset=17 xadvance=19 page=0 chnl=15 -char id=63 x=424 y=62 width=15 height=26 xoffset=2 yoffset=11 xadvance=18 page=0 chnl=15 -char id=64 x=239 y=34 width=29 height=31 xoffset=3 yoffset=11 xadvance=35 page=0 chnl=15 -char id=65 x=85 y=96 width=23 height=25 xoffset=0 yoffset=12 xadvance=23 page=0 chnl=15 -char id=66 x=133 y=121 width=17 height=25 xoffset=3 yoffset=12 xadvance=21 page=0 chnl=15 -char id=67 x=201 y=94 width=20 height=25 xoffset=1 yoffset=12 xadvance=21 page=0 chnl=15 -char id=68 x=348 y=90 width=20 height=25 xoffset=3 yoffset=12 xadvance=24 page=0 chnl=15 -char id=69 x=362 y=116 width=15 height=25 xoffset=3 yoffset=12 xadvance=19 page=0 chnl=15 -char id=70 x=442 y=115 width=14 height=25 xoffset=3 yoffset=12 xadvance=18 page=0 chnl=15 -char id=71 x=156 y=95 width=22 height=25 xoffset=1 yoffset=12 xadvance=25 page=0 chnl=15 -char id=72 x=327 y=90 width=20 height=25 xoffset=2 yoffset=12 xadvance=24 page=0 chnl=15 -char id=73 x=481 y=115 width=4 height=25 xoffset=3 yoffset=12 xadvance=10 page=0 chnl=15 -char id=74 x=469 y=115 width=11 height=25 xoffset=-1 yoffset=12 xadvance=12 page=0 chnl=15 -char id=75 x=95 y=122 width=18 height=25 xoffset=2 yoffset=12 xadvance=20 page=0 chnl=15 -char id=76 x=426 y=115 width=15 height=25 xoffset=2 yoffset=12 xadvance=16 page=0 chnl=15 -char id=77 x=31 y=96 width=28 height=25 xoffset=3 yoffset=12 xadvance=33 page=0 chnl=15 -char id=78 x=285 y=92 width=20 height=25 xoffset=3 yoffset=12 xadvance=25 page=0 chnl=15 -char id=79 x=60 y=96 width=24 height=25 xoffset=1 yoffset=12 xadvance=26 page=0 chnl=15 -char id=80 x=328 y=116 width=16 height=25 xoffset=3 yoffset=12 xadvance=20 page=0 chnl=15 -char id=81 x=307 y=34 width=27 height=28 xoffset=1 yoffset=12 xadvance=26 page=0 chnl=15 -char id=82 x=259 y=120 width=17 height=25 xoffset=3 yoffset=12 xadvance=21 page=0 chnl=15 -char id=83 x=311 y=117 width=16 height=25 xoffset=1 yoffset=12 xadvance=18 page=0 chnl=15 -char id=84 x=369 y=89 width=19 height=25 xoffset=0 yoffset=12 xadvance=19 page=0 chnl=15 -char id=85 x=179 y=94 width=21 height=25 xoffset=2 yoffset=12 xadvance=25 page=0 chnl=15 -char id=86 x=133 y=95 width=22 height=25 xoffset=0 yoffset=12 xadvance=22 page=0 chnl=15 -char id=87 x=473 y=62 width=34 height=25 xoffset=0 yoffset=12 xadvance=35 page=0 chnl=15 -char id=88 x=306 y=91 width=20 height=25 xoffset=0 yoffset=12 xadvance=20 page=0 chnl=15 -char id=89 x=409 y=89 width=19 height=25 xoffset=0 yoffset=12 xadvance=19 page=0 chnl=15 -char id=90 x=114 y=121 width=18 height=25 xoffset=0 yoffset=12 xadvance=18 page=0 chnl=15 -char id=91 x=0 y=36 width=8 height=33 xoffset=3 yoffset=10 xadvance=12 page=0 chnl=15 -char id=92 x=367 y=0 width=17 height=33 xoffset=-1 yoffset=9 xadvance=15 page=0 chnl=15 -char id=93 x=9 y=35 width=8 height=33 xoffset=1 yoffset=10 xadvance=12 page=0 chnl=15 -char id=94 x=33 y=174 width=17 height=14 xoffset=1 yoffset=12 xadvance=19 page=0 chnl=15 -char id=95 x=210 y=165 width=21 height=3 xoffset=-1 yoffset=41 xadvance=19 page=0 chnl=15 -char id=96 x=166 y=166 width=8 height=6 xoffset=2 yoffset=10 xadvance=11 page=0 chnl=15 -char id=97 x=363 y=142 width=16 height=18 xoffset=1 yoffset=19 xadvance=19 page=0 chnl=15 -char id=98 x=338 y=63 width=17 height=26 xoffset=2 yoffset=11 xadvance=20 page=0 chnl=15 -char id=99 x=380 y=141 width=15 height=18 xoffset=1 yoffset=19 xadvance=16 page=0 chnl=15 -char id=100 x=356 y=62 width=17 height=26 xoffset=1 yoffset=11 xadvance=20 page=0 chnl=15 -char id=101 x=311 y=143 width=17 height=18 xoffset=1 yoffset=19 xadvance=19 page=0 chnl=15 -char id=102 x=440 y=62 width=13 height=26 xoffset=0 yoffset=11 xadvance=12 page=0 chnl=15 -char id=103 x=449 y=89 width=18 height=25 xoffset=0 yoffset=19 xadvance=18 page=0 chnl=15 -char id=104 x=391 y=62 width=16 height=26 xoffset=2 yoffset=11 xadvance=20 page=0 chnl=15 -char id=105 x=506 y=88 width=5 height=25 xoffset=2 yoffset=12 xadvance=9 page=0 chnl=15 -char id=106 x=229 y=34 width=9 height=32 xoffset=-2 yoffset=12 xadvance=9 page=0 chnl=15 -char id=107 x=374 y=62 width=16 height=26 xoffset=2 yoffset=11 xadvance=18 page=0 chnl=15 -char id=108 x=461 y=62 width=5 height=26 xoffset=2 yoffset=11 xadvance=9 page=0 chnl=15 -char id=109 x=189 y=146 width=27 height=18 xoffset=2 yoffset=19 xadvance=31 page=0 chnl=15 -char id=110 x=329 y=142 width=16 height=18 xoffset=2 yoffset=19 xadvance=20 page=0 chnl=15 -char id=111 x=217 y=146 width=19 height=18 xoffset=1 yoffset=19 xadvance=21 page=0 chnl=15 -char id=112 x=223 y=120 width=17 height=25 xoffset=2 yoffset=19 xadvance=20 page=0 chnl=15 -char id=113 x=205 y=120 width=17 height=25 xoffset=1 yoffset=19 xadvance=20 page=0 chnl=15 -char id=114 x=425 y=141 width=12 height=18 xoffset=2 yoffset=19 xadvance=14 page=0 chnl=15 -char id=115 x=411 y=141 width=13 height=18 xoffset=1 yoffset=19 xadvance=15 page=0 chnl=15 -char id=116 x=20 y=150 width=13 height=23 xoffset=0 yoffset=14 xadvance=13 page=0 chnl=15 -char id=117 x=346 y=142 width=16 height=18 xoffset=2 yoffset=19 xadvance=20 page=0 chnl=15 -char id=118 x=256 y=146 width=18 height=18 xoffset=0 yoffset=19 xadvance=18 page=0 chnl=15 -char id=119 x=131 y=147 width=28 height=18 xoffset=0 yoffset=19 xadvance=28 page=0 chnl=15 -char id=120 x=293 y=145 width=17 height=18 xoffset=0 yoffset=19 xadvance=17 page=0 chnl=15 -char id=121 x=468 y=89 width=18 height=25 xoffset=0 yoffset=19 xadvance=18 page=0 chnl=15 -char id=122 x=396 y=141 width=14 height=18 xoffset=1 yoffset=19 xadvance=15 page=0 chnl=15 -char id=123 x=478 y=0 width=11 height=33 xoffset=1 yoffset=10 xadvance=12 page=0 chnl=15 -char id=124 x=86 y=0 width=4 height=34 xoffset=7 yoffset=10 xadvance=18 page=0 chnl=15 -char id=125 x=466 y=0 width=11 height=33 xoffset=1 yoffset=10 xadvance=12 page=0 chnl=15 -char id=126 x=118 y=167 width=19 height=7 xoffset=0 yoffset=15 xadvance=19 page=0 chnl=15 -char id=160 x=18 y=96 width=3 height=1 xoffset=-1 yoffset=47 xadvance=9 page=0 chnl=15 -char id=161 x=467 y=62 width=5 height=26 xoffset=3 yoffset=14 xadvance=13 page=0 chnl=15 -char id=162 x=410 y=115 width=15 height=25 xoffset=3 yoffset=12 xadvance=19 page=0 chnl=15 -char id=163 x=0 y=124 width=18 height=25 xoffset=1 yoffset=12 xadvance=20 page=0 chnl=15 -char id=164 x=43 y=148 width=19 height=21 xoffset=0 yoffset=15 xadvance=19 page=0 chnl=15 -char id=165 x=222 y=94 width=20 height=25 xoffset=0 yoffset=12 xadvance=20 page=0 chnl=15 -char id=166 x=0 y=0 width=5 height=35 xoffset=7 yoffset=9 xadvance=19 page=0 chnl=15 -char id=167 x=269 y=34 width=17 height=30 xoffset=1 yoffset=11 xadvance=19 page=0 chnl=15 -char id=168 x=184 y=166 width=11 height=4 xoffset=2 yoffset=12 xadvance=15 page=0 chnl=15 -char id=169 x=352 y=34 width=27 height=27 xoffset=3 yoffset=10 xadvance=33 page=0 chnl=15 -char id=170 x=117 y=147 width=13 height=19 xoffset=1 yoffset=12 xadvance=16 page=0 chnl=15 -char id=171 x=456 y=141 width=15 height=16 xoffset=2 yoffset=19 xadvance=20 page=0 chnl=15 -char id=172 x=138 y=166 width=18 height=7 xoffset=0 yoffset=24 xadvance=19 page=0 chnl=15 -char id=173 x=256 y=165 width=10 height=3 xoffset=1 yoffset=26 xadvance=12 page=0 chnl=15 -char id=174 x=488 y=140 width=16 height=15 xoffset=2 yoffset=10 xadvance=20 page=0 chnl=15 -char id=175 x=232 y=165 width=12 height=3 xoffset=2 yoffset=12 xadvance=15 page=0 chnl=15 -char id=176 x=106 y=168 width=11 height=9 xoffset=1 yoffset=11 xadvance=13 page=0 chnl=15 -char id=177 x=0 y=150 width=19 height=23 xoffset=0 yoffset=14 xadvance=19 page=0 chnl=15 -char id=178 x=12 y=174 width=11 height=15 xoffset=1 yoffset=8 xadvance=13 page=0 chnl=15 -char id=179 x=0 y=174 width=11 height=15 xoffset=1 yoffset=8 xadvance=13 page=0 chnl=15 -char id=180 x=175 y=166 width=8 height=6 xoffset=2 yoffset=10 xadvance=11 page=0 chnl=15 -char id=181 x=264 y=93 width=20 height=25 xoffset=2 yoffset=19 xadvance=21 page=0 chnl=15 -char id=182 x=287 y=34 width=19 height=29 xoffset=1 yoffset=12 xadvance=23 page=0 chnl=15 -char id=183 x=203 y=165 width=6 height=4 xoffset=2 yoffset=24 xadvance=10 page=0 chnl=15 -char id=184 x=157 y=166 width=8 height=7 xoffset=2 yoffset=37 xadvance=12 page=0 chnl=15 -char id=185 x=24 y=174 width=8 height=15 xoffset=0 yoffset=8 xadvance=10 page=0 chnl=15 -char id=186 x=102 y=148 width=14 height=19 xoffset=1 yoffset=12 xadvance=16 page=0 chnl=15 -char id=187 x=472 y=141 width=15 height=16 xoffset=3 yoffset=19 xadvance=20 page=0 chnl=15 -char id=188 x=277 y=65 width=23 height=26 xoffset=1 yoffset=12 xadvance=25 page=0 chnl=15 -char id=189 x=225 y=67 width=25 height=26 xoffset=0 yoffset=12 xadvance=26 page=0 chnl=15 -char id=190 x=199 y=67 width=25 height=26 xoffset=1 yoffset=12 xadvance=26 page=0 chnl=15 -char id=191 x=408 y=62 width=15 height=26 xoffset=1 yoffset=14 xadvance=18 page=0 chnl=15 -char id=192 x=215 y=0 width=23 height=33 xoffset=0 yoffset=4 xadvance=23 page=0 chnl=15 -char id=193 x=239 y=0 width=23 height=33 xoffset=0 yoffset=4 xadvance=23 page=0 chnl=15 -char id=194 x=191 y=0 width=23 height=33 xoffset=0 yoffset=4 xadvance=23 page=0 chnl=15 -char id=195 x=92 y=34 width=23 height=32 xoffset=0 yoffset=5 xadvance=23 page=0 chnl=15 -char id=196 x=68 y=35 width=23 height=32 xoffset=0 yoffset=5 xadvance=23 page=0 chnl=15 -char id=197 x=6 y=0 width=23 height=34 xoffset=0 yoffset=3 xadvance=23 page=0 chnl=15 -char id=198 x=0 y=98 width=30 height=25 xoffset=-2 yoffset=12 xadvance=30 page=0 chnl=15 -char id=199 x=159 y=34 width=20 height=32 xoffset=1 yoffset=12 xadvance=21 page=0 chnl=15 -char id=200 x=435 y=0 width=15 height=33 xoffset=3 yoffset=4 xadvance=19 page=0 chnl=15 -char id=201 x=419 y=0 width=15 height=33 xoffset=3 yoffset=4 xadvance=19 page=0 chnl=15 -char id=202 x=403 y=0 width=15 height=33 xoffset=3 yoffset=4 xadvance=19 page=0 chnl=15 -char id=203 x=199 y=34 width=15 height=32 xoffset=3 yoffset=5 xadvance=19 page=0 chnl=15 -char id=204 x=490 y=0 width=9 height=33 xoffset=-2 yoffset=4 xadvance=10 page=0 chnl=15 -char id=205 x=500 y=0 width=9 height=33 xoffset=3 yoffset=4 xadvance=10 page=0 chnl=15 -char id=206 x=451 y=0 width=14 height=33 xoffset=-2 yoffset=4 xadvance=10 page=0 chnl=15 -char id=207 x=215 y=34 width=13 height=32 xoffset=-1 yoffset=5 xadvance=10 page=0 chnl=15 -char id=208 x=109 y=95 width=23 height=25 xoffset=0 yoffset=12 xadvance=24 page=0 chnl=15 -char id=209 x=138 y=34 width=20 height=32 xoffset=3 yoffset=5 xadvance=25 page=0 chnl=15 -char id=210 x=141 y=0 width=24 height=33 xoffset=1 yoffset=4 xadvance=26 page=0 chnl=15 -char id=211 x=91 y=0 width=24 height=33 xoffset=1 yoffset=4 xadvance=26 page=0 chnl=15 -char id=212 x=166 y=0 width=24 height=33 xoffset=1 yoffset=4 xadvance=26 page=0 chnl=15 -char id=213 x=18 y=35 width=24 height=32 xoffset=1 yoffset=5 xadvance=26 page=0 chnl=15 -char id=214 x=43 y=35 width=24 height=32 xoffset=1 yoffset=5 xadvance=26 page=0 chnl=15 -char id=215 x=438 y=141 width=17 height=16 xoffset=1 yoffset=18 xadvance=19 page=0 chnl=15 -char id=216 x=116 y=0 width=24 height=33 xoffset=1 yoffset=8 xadvance=26 page=0 chnl=15 -char id=217 x=285 y=0 width=21 height=33 xoffset=2 yoffset=4 xadvance=25 page=0 chnl=15 -char id=218 x=263 y=0 width=21 height=33 xoffset=2 yoffset=4 xadvance=25 page=0 chnl=15 -char id=219 x=307 y=0 width=21 height=33 xoffset=2 yoffset=4 xadvance=25 page=0 chnl=15 -char id=220 x=116 y=34 width=21 height=32 xoffset=2 yoffset=5 xadvance=25 page=0 chnl=15 -char id=221 x=329 y=0 width=19 height=33 xoffset=0 yoffset=4 xadvance=19 page=0 chnl=15 -char id=222 x=345 y=116 width=16 height=25 xoffset=3 yoffset=12 xadvance=20 page=0 chnl=15 -char id=223 x=301 y=64 width=18 height=26 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=224 x=18 y=68 width=16 height=27 xoffset=1 yoffset=10 xadvance=19 page=0 chnl=15 -char id=225 x=69 y=68 width=16 height=27 xoffset=1 yoffset=10 xadvance=19 page=0 chnl=15 -char id=226 x=35 y=68 width=16 height=27 xoffset=1 yoffset=10 xadvance=19 page=0 chnl=15 -char id=227 x=52 y=68 width=16 height=27 xoffset=1 yoffset=10 xadvance=19 page=0 chnl=15 -char id=228 x=294 y=118 width=16 height=25 xoffset=1 yoffset=12 xadvance=19 page=0 chnl=15 -char id=229 x=335 y=34 width=16 height=28 xoffset=1 yoffset=9 xadvance=19 page=0 chnl=15 -char id=230 x=160 y=147 width=28 height=18 xoffset=1 yoffset=19 xadvance=30 page=0 chnl=15 -char id=231 x=394 y=115 width=15 height=25 xoffset=1 yoffset=19 xadvance=16 page=0 chnl=15 -char id=232 x=478 y=34 width=17 height=27 xoffset=1 yoffset=10 xadvance=19 page=0 chnl=15 -char id=233 x=0 y=70 width=17 height=27 xoffset=1 yoffset=10 xadvance=19 page=0 chnl=15 -char id=234 x=460 y=34 width=17 height=27 xoffset=1 yoffset=10 xadvance=19 page=0 chnl=15 -char id=235 x=241 y=120 width=17 height=25 xoffset=1 yoffset=12 xadvance=19 page=0 chnl=15 -char id=236 x=163 y=67 width=8 height=27 xoffset=-1 yoffset=10 xadvance=9 page=0 chnl=15 -char id=237 x=154 y=67 width=8 height=27 xoffset=2 yoffset=10 xadvance=9 page=0 chnl=15 -char id=238 x=496 y=34 width=12 height=27 xoffset=-1 yoffset=10 xadvance=9 page=0 chnl=15 -char id=239 x=457 y=115 width=11 height=25 xoffset=-1 yoffset=12 xadvance=9 page=0 chnl=15 -char id=240 x=320 y=63 width=17 height=26 xoffset=1 yoffset=11 xadvance=20 page=0 chnl=15 -char id=241 x=137 y=67 width=16 height=27 xoffset=2 yoffset=10 xadvance=20 page=0 chnl=15 -char id=242 x=380 y=34 width=19 height=27 xoffset=1 yoffset=10 xadvance=21 page=0 chnl=15 -char id=243 x=400 y=34 width=19 height=27 xoffset=1 yoffset=10 xadvance=21 page=0 chnl=15 -char id=244 x=420 y=34 width=19 height=27 xoffset=1 yoffset=10 xadvance=21 page=0 chnl=15 -char id=245 x=440 y=34 width=19 height=27 xoffset=1 yoffset=10 xadvance=21 page=0 chnl=15 -char id=246 x=429 y=89 width=19 height=25 xoffset=1 yoffset=12 xadvance=21 page=0 chnl=15 -char id=247 x=63 y=148 width=19 height=19 xoffset=0 yoffset=16 xadvance=19 page=0 chnl=15 -char id=248 x=486 y=115 width=19 height=24 xoffset=1 yoffset=16 xadvance=21 page=0 chnl=15 -char id=249 x=86 y=68 width=16 height=27 xoffset=2 yoffset=10 xadvance=20 page=0 chnl=15 -char id=250 x=103 y=67 width=16 height=27 xoffset=2 yoffset=10 xadvance=20 page=0 chnl=15 -char id=251 x=120 y=67 width=16 height=27 xoffset=2 yoffset=10 xadvance=20 page=0 chnl=15 -char id=252 x=277 y=119 width=16 height=25 xoffset=2 yoffset=12 xadvance=20 page=0 chnl=15 -char id=253 x=49 y=0 width=18 height=34 xoffset=0 yoffset=10 xadvance=18 page=0 chnl=15 -char id=254 x=349 y=0 width=17 height=33 xoffset=2 yoffset=11 xadvance=20 page=0 chnl=15 -char id=255 x=180 y=34 width=18 height=32 xoffset=0 yoffset=12 xadvance=18 page=0 chnl=15 -kernings count=1415 -kerning first=179 second=47 amount=-6 -kerning first=178 second=47 amount=-6 -kerning first=185 second=47 amount=-5 -kerning first=40 second=106 amount=1 -kerning first=47 second=179 amount=-5 -kerning first=47 second=178 amount=-5 -kerning first=47 second=185 amount=-4 -kerning first=47 second=115 amount=-1 -kerning first=47 second=248 amount=-1 -kerning first=47 second=246 amount=-1 -kerning first=47 second=245 amount=-1 -kerning first=47 second=244 amount=-1 -kerning first=47 second=243 amount=-1 -kerning first=47 second=242 amount=-1 -kerning first=47 second=111 amount=-1 -kerning first=47 second=103 amount=-1 -kerning first=47 second=235 amount=-1 -kerning first=47 second=234 amount=-1 -kerning first=47 second=233 amount=-1 -kerning first=47 second=232 amount=-1 -kerning first=47 second=101 amount=-1 -kerning first=47 second=231 amount=-1 -kerning first=47 second=99 amount=-1 -kerning first=47 second=230 amount=-1 -kerning first=65 second=84 amount=-3 -kerning first=47 second=229 amount=-1 -kerning first=47 second=228 amount=-1 -kerning first=65 second=85 amount=-1 -kerning first=65 second=217 amount=-1 -kerning first=65 second=218 amount=-1 -kerning first=65 second=219 amount=-1 -kerning first=47 second=227 amount=-1 -kerning first=65 second=220 amount=-1 -kerning first=47 second=226 amount=-1 -kerning first=47 second=225 amount=-1 -kerning first=47 second=224 amount=-1 -kerning first=47 second=97 amount=-1 -kerning first=47 second=74 amount=-1 -kerning first=65 second=86 amount=-2 -kerning first=65 second=87 amount=-2 -kerning first=47 second=198 amount=-1 -kerning first=47 second=197 amount=-1 -kerning first=47 second=196 amount=-1 -kerning first=47 second=195 amount=-1 -kerning first=65 second=89 amount=-3 -kerning first=47 second=194 amount=-1 -kerning first=65 second=221 amount=-3 -kerning first=47 second=193 amount=-1 -kerning first=47 second=192 amount=-1 -kerning first=65 second=116 amount=-1 -kerning first=47 second=65 amount=-1 -kerning first=46 second=255 amount=-1 -kerning first=65 second=118 amount=-1 -kerning first=65 second=121 amount=-1 -kerning first=46 second=253 amount=-1 -kerning first=65 second=253 amount=-1 -kerning first=46 second=121 amount=-1 -kerning first=65 second=255 amount=-1 -kerning first=65 second=63 amount=-1 -kerning first=46 second=119 amount=-1 -kerning first=46 second=118 amount=-1 -kerning first=46 second=116 amount=-1 -kerning first=46 second=102 amount=-1 -kerning first=46 second=221 amount=-4 -kerning first=46 second=89 amount=-4 -kerning first=46 second=87 amount=-3 -kerning first=46 second=86 amount=-3 -kerning first=46 second=84 amount=-3 -kerning first=46 second=71 amount=-1 -kerning first=46 second=199 amount=-1 -kerning first=46 second=67 amount=-1 -kerning first=44 second=116 amount=-1 -kerning first=44 second=221 amount=-3 -kerning first=44 second=89 amount=-3 -kerning first=44 second=87 amount=-3 -kerning first=44 second=86 amount=-3 -kerning first=44 second=84 amount=-3 -kerning first=191 second=255 amount=-1 -kerning first=191 second=253 amount=-1 -kerning first=191 second=121 amount=-1 -kerning first=191 second=119 amount=-1 -kerning first=191 second=118 amount=-1 -kerning first=191 second=102 amount=-1 -kerning first=191 second=221 amount=-2 -kerning first=191 second=89 amount=-2 -kerning first=191 second=86 amount=-2 -kerning first=191 second=84 amount=-2 -kerning first=122 second=113 amount=-1 -kerning first=122 second=248 amount=-1 -kerning first=122 second=246 amount=-1 -kerning first=122 second=245 amount=-1 -kerning first=122 second=244 amount=-1 -kerning first=122 second=243 amount=-1 -kerning first=122 second=242 amount=-1 -kerning first=122 second=111 amount=-1 -kerning first=122 second=235 amount=-1 -kerning first=122 second=234 amount=-1 -kerning first=122 second=233 amount=-1 -kerning first=122 second=232 amount=-1 -kerning first=122 second=101 amount=-1 -kerning first=122 second=100 amount=-1 -kerning first=122 second=231 amount=-1 -kerning first=122 second=99 amount=-1 -kerning first=122 second=230 amount=-1 -kerning first=122 second=229 amount=-1 -kerning first=122 second=228 amount=-1 -kerning first=122 second=227 amount=-1 -kerning first=122 second=226 amount=-1 -kerning first=122 second=225 amount=-1 -kerning first=122 second=224 amount=-1 -kerning first=122 second=97 amount=-1 -kerning first=255 second=46 amount=-3 -kerning first=255 second=44 amount=-3 -kerning first=255 second=230 amount=-1 -kerning first=255 second=229 amount=-1 -kerning first=255 second=228 amount=-1 -kerning first=255 second=227 amount=-1 -kerning first=192 second=84 amount=-3 -kerning first=255 second=226 amount=-1 -kerning first=255 second=225 amount=-1 -kerning first=192 second=85 amount=-1 -kerning first=192 second=217 amount=-1 -kerning first=192 second=218 amount=-1 -kerning first=192 second=219 amount=-1 -kerning first=255 second=224 amount=-1 -kerning first=192 second=220 amount=-1 -kerning first=255 second=97 amount=-1 -kerning first=253 second=46 amount=-3 -kerning first=253 second=44 amount=-3 -kerning first=253 second=230 amount=-1 -kerning first=253 second=229 amount=-1 -kerning first=192 second=86 amount=-2 -kerning first=192 second=87 amount=-2 -kerning first=253 second=228 amount=-1 -kerning first=253 second=227 amount=-1 -kerning first=253 second=226 amount=-1 -kerning first=253 second=225 amount=-1 -kerning first=192 second=89 amount=-3 -kerning first=253 second=224 amount=-1 -kerning first=192 second=221 amount=-3 -kerning first=253 second=97 amount=-1 -kerning first=121 second=46 amount=-3 -kerning first=192 second=116 amount=-1 -kerning first=121 second=44 amount=-3 -kerning first=121 second=230 amount=-1 -kerning first=192 second=118 amount=-1 -kerning first=192 second=121 amount=-1 -kerning first=121 second=229 amount=-1 -kerning first=192 second=253 amount=-1 -kerning first=121 second=228 amount=-1 -kerning first=192 second=255 amount=-1 -kerning first=192 second=63 amount=-1 -kerning first=121 second=227 amount=-1 -kerning first=121 second=226 amount=-1 -kerning first=121 second=225 amount=-1 -kerning first=121 second=224 amount=-1 -kerning first=121 second=97 amount=-1 -kerning first=120 second=113 amount=-1 -kerning first=120 second=248 amount=-1 -kerning first=120 second=246 amount=-1 -kerning first=120 second=245 amount=-1 -kerning first=120 second=244 amount=-1 -kerning first=120 second=243 amount=-1 -kerning first=120 second=242 amount=-1 -kerning first=120 second=111 amount=-1 -kerning first=120 second=235 amount=-1 -kerning first=120 second=234 amount=-1 -kerning first=120 second=233 amount=-1 -kerning first=120 second=232 amount=-1 -kerning first=120 second=101 amount=-1 -kerning first=120 second=100 amount=-1 -kerning first=120 second=231 amount=-1 -kerning first=120 second=99 amount=-1 -kerning first=120 second=230 amount=-1 -kerning first=120 second=229 amount=-1 -kerning first=120 second=228 amount=-1 -kerning first=120 second=227 amount=-1 -kerning first=120 second=226 amount=-1 -kerning first=120 second=225 amount=-1 -kerning first=120 second=224 amount=-1 -kerning first=120 second=97 amount=-1 -kerning first=119 second=46 amount=-3 -kerning first=119 second=44 amount=-3 -kerning first=118 second=46 amount=-3 -kerning first=118 second=44 amount=-3 -kerning first=118 second=103 amount=-1 -kerning first=118 second=230 amount=-1 -kerning first=118 second=229 amount=-1 -kerning first=118 second=228 amount=-1 -kerning first=118 second=227 amount=-1 -kerning first=118 second=226 amount=-1 -kerning first=118 second=225 amount=-1 -kerning first=118 second=224 amount=-1 -kerning first=118 second=97 amount=-1 -kerning first=116 second=116 amount=-1 -kerning first=223 second=255 amount=-1 -kerning first=223 second=253 amount=-1 -kerning first=223 second=121 amount=-1 -kerning first=223 second=120 amount=-1 -kerning first=223 second=119 amount=-1 -kerning first=223 second=118 amount=-1 -kerning first=223 second=116 amount=-1 -kerning first=223 second=102 amount=-1 -kerning first=115 second=255 amount=-1 -kerning first=115 second=253 amount=-1 -kerning first=115 second=121 amount=-1 -kerning first=115 second=118 amount=-1 -kerning first=114 second=46 amount=-4 -kerning first=114 second=44 amount=-3 -kerning first=114 second=115 amount=-1 -kerning first=193 second=84 amount=-3 -kerning first=114 second=113 amount=-1 -kerning first=114 second=248 amount=-1 -kerning first=193 second=85 amount=-1 -kerning first=193 second=217 amount=-1 -kerning first=193 second=218 amount=-1 -kerning first=193 second=219 amount=-1 -kerning first=114 second=246 amount=-1 -kerning first=193 second=220 amount=-1 -kerning first=114 second=245 amount=-1 -kerning first=114 second=244 amount=-1 -kerning first=114 second=243 amount=-1 -kerning first=114 second=242 amount=-1 -kerning first=114 second=111 amount=-1 -kerning first=193 second=86 amount=-2 -kerning first=193 second=87 amount=-2 -kerning first=114 second=103 amount=-1 -kerning first=114 second=235 amount=-1 -kerning first=114 second=234 amount=-1 -kerning first=114 second=233 amount=-1 -kerning first=193 second=89 amount=-3 -kerning first=114 second=232 amount=-1 -kerning first=193 second=221 amount=-3 -kerning first=114 second=101 amount=-1 -kerning first=114 second=100 amount=-1 -kerning first=193 second=116 amount=-1 -kerning first=114 second=231 amount=-1 -kerning first=114 second=99 amount=-1 -kerning first=193 second=118 amount=-1 -kerning first=193 second=121 amount=-1 -kerning first=114 second=230 amount=-1 -kerning first=193 second=253 amount=-1 -kerning first=114 second=229 amount=-1 -kerning first=193 second=255 amount=-1 -kerning first=193 second=63 amount=-1 -kerning first=114 second=228 amount=-1 -kerning first=114 second=227 amount=-1 -kerning first=114 second=226 amount=-1 -kerning first=114 second=225 amount=-1 -kerning first=114 second=224 amount=-1 -kerning first=114 second=97 amount=-1 -kerning first=254 second=122 amount=-1 -kerning first=254 second=120 amount=-1 -kerning first=112 second=122 amount=-1 -kerning first=112 second=120 amount=-1 -kerning first=248 second=44 amount=-1 -kerning first=248 second=122 amount=-1 -kerning first=248 second=120 amount=-1 -kerning first=246 second=44 amount=-1 -kerning first=246 second=122 amount=-1 -kerning first=246 second=120 amount=-1 -kerning first=245 second=44 amount=-1 -kerning first=245 second=122 amount=-1 -kerning first=245 second=120 amount=-1 -kerning first=244 second=44 amount=-1 -kerning first=244 second=122 amount=-1 -kerning first=244 second=120 amount=-1 -kerning first=243 second=44 amount=-1 -kerning first=243 second=122 amount=-1 -kerning first=243 second=120 amount=-1 -kerning first=242 second=44 amount=-1 -kerning first=242 second=122 amount=-1 -kerning first=242 second=120 amount=-1 -kerning first=111 second=44 amount=-1 -kerning first=111 second=122 amount=-1 -kerning first=111 second=120 amount=-1 -kerning first=241 second=255 amount=-1 -kerning first=241 second=253 amount=-1 -kerning first=241 second=121 amount=-1 -kerning first=241 second=118 amount=-1 -kerning first=110 second=255 amount=-1 -kerning first=110 second=253 amount=-1 -kerning first=110 second=121 amount=-1 -kerning first=110 second=118 amount=-1 -kerning first=109 second=255 amount=-1 -kerning first=109 second=253 amount=-1 -kerning first=109 second=121 amount=-1 -kerning first=109 second=118 amount=-1 -kerning first=107 second=113 amount=-1 -kerning first=107 second=248 amount=-1 -kerning first=107 second=246 amount=-1 -kerning first=107 second=245 amount=-1 -kerning first=107 second=244 amount=-1 -kerning first=107 second=243 amount=-1 -kerning first=107 second=242 amount=-1 -kerning first=107 second=111 amount=-1 -kerning first=107 second=235 amount=-1 -kerning first=107 second=234 amount=-1 -kerning first=107 second=233 amount=-1 -kerning first=107 second=232 amount=-1 -kerning first=107 second=101 amount=-1 -kerning first=107 second=100 amount=-1 -kerning first=107 second=231 amount=-1 -kerning first=194 second=84 amount=-3 -kerning first=107 second=99 amount=-1 -kerning first=107 second=230 amount=-1 -kerning first=194 second=85 amount=-1 -kerning first=194 second=217 amount=-1 -kerning first=194 second=218 amount=-1 -kerning first=194 second=219 amount=-1 -kerning first=107 second=229 amount=-1 -kerning first=194 second=220 amount=-1 -kerning first=107 second=228 amount=-1 -kerning first=107 second=227 amount=-1 -kerning first=107 second=226 amount=-1 -kerning first=107 second=225 amount=-1 -kerning first=107 second=224 amount=-1 -kerning first=194 second=86 amount=-2 -kerning first=194 second=87 amount=-2 -kerning first=107 second=97 amount=-1 -kerning first=104 second=255 amount=-1 -kerning first=104 second=253 amount=-1 -kerning first=104 second=121 amount=-1 -kerning first=194 second=89 amount=-3 -kerning first=104 second=118 amount=-1 -kerning first=194 second=221 amount=-3 -kerning first=103 second=47 amount=1 -kerning first=103 second=116 amount=-1 -kerning first=194 second=116 amount=-1 -kerning first=103 second=230 amount=-1 -kerning first=103 second=229 amount=-1 -kerning first=194 second=118 amount=-1 -kerning first=194 second=121 amount=-1 -kerning first=103 second=228 amount=-1 -kerning first=194 second=253 amount=-1 -kerning first=103 second=227 amount=-1 -kerning first=194 second=255 amount=-1 -kerning first=194 second=63 amount=-1 -kerning first=103 second=226 amount=-1 -kerning first=103 second=225 amount=-1 -kerning first=103 second=224 amount=-1 -kerning first=103 second=97 amount=-1 -kerning first=102 second=41 amount=1 -kerning first=102 second=46 amount=-3 -kerning first=102 second=44 amount=-2 -kerning first=102 second=115 amount=-1 -kerning first=102 second=113 amount=-1 -kerning first=102 second=248 amount=-1 -kerning first=102 second=246 amount=-1 -kerning first=102 second=245 amount=-1 -kerning first=102 second=244 amount=-1 -kerning first=102 second=243 amount=-1 -kerning first=102 second=242 amount=-1 -kerning first=102 second=111 amount=-1 -kerning first=102 second=103 amount=-1 -kerning first=102 second=235 amount=-1 -kerning first=102 second=234 amount=-1 -kerning first=102 second=233 amount=-1 -kerning first=102 second=232 amount=-1 -kerning first=102 second=101 amount=-1 -kerning first=102 second=100 amount=-1 -kerning first=102 second=231 amount=-1 -kerning first=102 second=99 amount=-1 -kerning first=102 second=230 amount=-1 -kerning first=102 second=229 amount=-1 -kerning first=102 second=228 amount=-1 -kerning first=102 second=227 amount=-1 -kerning first=102 second=226 amount=-1 -kerning first=102 second=225 amount=-1 -kerning first=102 second=224 amount=-1 -kerning first=102 second=97 amount=-1 -kerning first=235 second=120 amount=-1 -kerning first=234 second=120 amount=-1 -kerning first=233 second=120 amount=-1 -kerning first=232 second=120 amount=-1 -kerning first=101 second=120 amount=-1 -kerning first=98 second=122 amount=-1 -kerning first=98 second=120 amount=-1 -kerning first=230 second=120 amount=-1 -kerning first=229 second=255 amount=-1 -kerning first=229 second=253 amount=-1 -kerning first=229 second=121 amount=-1 -kerning first=229 second=118 amount=-1 -kerning first=228 second=255 amount=-1 -kerning first=228 second=253 amount=-1 -kerning first=228 second=121 amount=-1 -kerning first=228 second=118 amount=-1 -kerning first=227 second=255 amount=-1 -kerning first=227 second=253 amount=-1 -kerning first=227 second=121 amount=-1 -kerning first=227 second=118 amount=-1 -kerning first=226 second=255 amount=-1 -kerning first=226 second=253 amount=-1 -kerning first=226 second=121 amount=-1 -kerning first=226 second=118 amount=-1 -kerning first=225 second=255 amount=-1 -kerning first=195 second=84 amount=-3 -kerning first=225 second=253 amount=-1 -kerning first=225 second=121 amount=-1 -kerning first=195 second=85 amount=-1 -kerning first=195 second=217 amount=-1 -kerning first=195 second=218 amount=-1 -kerning first=195 second=219 amount=-1 -kerning first=225 second=118 amount=-1 -kerning first=195 second=220 amount=-1 -kerning first=224 second=255 amount=-1 -kerning first=224 second=253 amount=-1 -kerning first=224 second=121 amount=-1 -kerning first=224 second=118 amount=-1 -kerning first=97 second=255 amount=-1 -kerning first=195 second=86 amount=-2 -kerning first=195 second=87 amount=-2 -kerning first=97 second=253 amount=-1 -kerning first=97 second=121 amount=-1 -kerning first=97 second=118 amount=-1 -kerning first=90 second=255 amount=-1 -kerning first=195 second=89 amount=-3 -kerning first=90 second=253 amount=-1 -kerning first=195 second=221 amount=-3 -kerning first=90 second=121 amount=-1 -kerning first=90 second=119 amount=-1 -kerning first=195 second=116 amount=-1 -kerning first=90 second=118 amount=-1 -kerning first=90 second=248 amount=-1 -kerning first=195 second=118 amount=-1 -kerning first=195 second=121 amount=-1 -kerning first=90 second=246 amount=-1 -kerning first=195 second=253 amount=-1 -kerning first=90 second=245 amount=-1 -kerning first=195 second=255 amount=-1 -kerning first=195 second=63 amount=-1 -kerning first=90 second=244 amount=-1 -kerning first=90 second=243 amount=-1 -kerning first=90 second=242 amount=-1 -kerning first=90 second=111 amount=-1 -kerning first=90 second=239 amount=1 -kerning first=90 second=238 amount=1 -kerning first=90 second=235 amount=-1 -kerning first=90 second=234 amount=-1 -kerning first=90 second=233 amount=-1 -kerning first=90 second=232 amount=-1 -kerning first=90 second=101 amount=-1 -kerning first=221 second=47 amount=-2 -kerning first=221 second=46 amount=-5 -kerning first=221 second=58 amount=-3 -kerning first=221 second=59 amount=-3 -kerning first=221 second=44 amount=-5 -kerning first=221 second=122 amount=-2 -kerning first=221 second=255 amount=-1 -kerning first=221 second=253 amount=-1 -kerning first=221 second=121 amount=-1 -kerning first=221 second=120 amount=-1 -kerning first=221 second=119 amount=-1 -kerning first=221 second=118 amount=-1 -kerning first=221 second=252 amount=-2 -kerning first=221 second=251 amount=-2 -kerning first=221 second=250 amount=-2 -kerning first=221 second=249 amount=-2 -kerning first=221 second=117 amount=-2 -kerning first=221 second=116 amount=-1 -kerning first=221 second=223 amount=-1 -kerning first=221 second=115 amount=-2 -kerning first=221 second=114 amount=-2 -kerning first=221 second=113 amount=-3 -kerning first=221 second=112 amount=-2 -kerning first=221 second=248 amount=-3 -kerning first=221 second=246 amount=-3 -kerning first=221 second=245 amount=-3 -kerning first=221 second=244 amount=-3 -kerning first=221 second=243 amount=-3 -kerning first=221 second=242 amount=-3 -kerning first=221 second=111 amount=-3 -kerning first=221 second=241 amount=-2 -kerning first=221 second=110 amount=-2 -kerning first=221 second=109 amount=-2 -kerning first=221 second=106 amount=-1 -kerning first=221 second=239 amount=1 -kerning first=221 second=238 amount=1 -kerning first=221 second=237 amount=-1 -kerning first=221 second=236 amount=1 -kerning first=221 second=105 amount=-1 -kerning first=221 second=103 amount=-3 -kerning first=221 second=102 amount=-1 -kerning first=221 second=235 amount=-3 -kerning first=221 second=234 amount=-3 -kerning first=221 second=233 amount=-3 -kerning first=221 second=232 amount=-3 -kerning first=221 second=101 amount=-3 -kerning first=221 second=100 amount=-3 -kerning first=196 second=84 amount=-3 -kerning first=221 second=231 amount=-3 -kerning first=221 second=99 amount=-3 -kerning first=196 second=85 amount=-1 -kerning first=196 second=217 amount=-1 -kerning first=196 second=218 amount=-1 -kerning first=196 second=219 amount=-1 -kerning first=221 second=230 amount=-3 -kerning first=196 second=220 amount=-1 -kerning first=221 second=229 amount=-3 -kerning first=221 second=228 amount=-3 -kerning first=221 second=227 amount=-3 -kerning first=221 second=226 amount=-3 -kerning first=221 second=225 amount=-3 -kerning first=196 second=86 amount=-2 -kerning first=196 second=87 amount=-2 -kerning first=221 second=224 amount=-3 -kerning first=221 second=97 amount=-3 -kerning first=221 second=81 amount=-1 -kerning first=221 second=214 amount=-1 -kerning first=196 second=89 amount=-3 -kerning first=221 second=213 amount=-1 -kerning first=196 second=221 amount=-3 -kerning first=221 second=212 amount=-1 -kerning first=221 second=211 amount=-1 -kerning first=196 second=116 amount=-1 -kerning first=221 second=210 amount=-1 -kerning first=221 second=79 amount=-1 -kerning first=196 second=118 amount=-1 -kerning first=196 second=121 amount=-1 -kerning first=221 second=74 amount=-2 -kerning first=196 second=253 amount=-1 -kerning first=221 second=71 amount=-1 -kerning first=196 second=255 amount=-1 -kerning first=196 second=63 amount=-1 -kerning first=221 second=199 amount=-1 -kerning first=221 second=67 amount=-1 -kerning first=221 second=198 amount=-3 -kerning first=221 second=197 amount=-3 -kerning first=221 second=196 amount=-3 -kerning first=221 second=195 amount=-3 -kerning first=221 second=194 amount=-3 -kerning first=221 second=193 amount=-3 -kerning first=221 second=192 amount=-3 -kerning first=221 second=65 amount=-3 -kerning first=89 second=47 amount=-2 -kerning first=89 second=46 amount=-5 -kerning first=89 second=58 amount=-3 -kerning first=89 second=59 amount=-3 -kerning first=89 second=44 amount=-5 -kerning first=89 second=122 amount=-2 -kerning first=89 second=255 amount=-1 -kerning first=89 second=253 amount=-1 -kerning first=89 second=121 amount=-1 -kerning first=89 second=120 amount=-1 -kerning first=89 second=119 amount=-1 -kerning first=89 second=118 amount=-1 -kerning first=89 second=252 amount=-2 -kerning first=89 second=251 amount=-2 -kerning first=89 second=250 amount=-2 -kerning first=89 second=249 amount=-2 -kerning first=89 second=117 amount=-2 -kerning first=89 second=116 amount=-1 -kerning first=89 second=223 amount=-1 -kerning first=89 second=115 amount=-2 -kerning first=89 second=114 amount=-2 -kerning first=89 second=113 amount=-3 -kerning first=89 second=112 amount=-2 -kerning first=89 second=248 amount=-3 -kerning first=89 second=246 amount=-3 -kerning first=89 second=245 amount=-3 -kerning first=89 second=244 amount=-3 -kerning first=89 second=243 amount=-3 -kerning first=89 second=242 amount=-3 -kerning first=89 second=111 amount=-3 -kerning first=89 second=241 amount=-2 -kerning first=89 second=110 amount=-2 -kerning first=89 second=109 amount=-2 -kerning first=89 second=106 amount=-1 -kerning first=89 second=239 amount=1 -kerning first=89 second=238 amount=1 -kerning first=89 second=237 amount=-1 -kerning first=89 second=236 amount=1 -kerning first=89 second=105 amount=-1 -kerning first=89 second=103 amount=-3 -kerning first=89 second=102 amount=-1 -kerning first=89 second=235 amount=-3 -kerning first=89 second=234 amount=-3 -kerning first=89 second=233 amount=-3 -kerning first=89 second=232 amount=-3 -kerning first=89 second=101 amount=-3 -kerning first=89 second=100 amount=-3 -kerning first=89 second=231 amount=-3 -kerning first=89 second=99 amount=-3 -kerning first=89 second=230 amount=-3 -kerning first=89 second=229 amount=-3 -kerning first=89 second=228 amount=-3 -kerning first=89 second=227 amount=-3 -kerning first=89 second=226 amount=-3 -kerning first=89 second=225 amount=-3 -kerning first=89 second=224 amount=-3 -kerning first=89 second=97 amount=-3 -kerning first=89 second=81 amount=-1 -kerning first=89 second=214 amount=-1 -kerning first=89 second=213 amount=-1 -kerning first=89 second=212 amount=-1 -kerning first=89 second=211 amount=-1 -kerning first=89 second=210 amount=-1 -kerning first=89 second=79 amount=-1 -kerning first=89 second=74 amount=-2 -kerning first=89 second=71 amount=-1 -kerning first=89 second=199 amount=-1 -kerning first=89 second=67 amount=-1 -kerning first=89 second=198 amount=-3 -kerning first=89 second=197 amount=-3 -kerning first=89 second=196 amount=-3 -kerning first=89 second=195 amount=-3 -kerning first=89 second=194 amount=-3 -kerning first=89 second=193 amount=-3 -kerning first=89 second=192 amount=-3 -kerning first=89 second=65 amount=-3 -kerning first=88 second=255 amount=-1 -kerning first=88 second=253 amount=-1 -kerning first=88 second=121 amount=-1 -kerning first=88 second=119 amount=-1 -kerning first=88 second=118 amount=-1 -kerning first=88 second=117 amount=-1 -kerning first=88 second=116 amount=-1 -kerning first=88 second=113 amount=-1 -kerning first=88 second=248 amount=-1 -kerning first=88 second=246 amount=-1 -kerning first=88 second=245 amount=-1 -kerning first=88 second=244 amount=-1 -kerning first=88 second=243 amount=-1 -kerning first=88 second=242 amount=-1 -kerning first=88 second=111 amount=-1 -kerning first=88 second=235 amount=-1 -kerning first=88 second=234 amount=-1 -kerning first=88 second=233 amount=-1 -kerning first=88 second=232 amount=-1 -kerning first=88 second=101 amount=-1 -kerning first=88 second=100 amount=-1 -kerning first=88 second=81 amount=-1 -kerning first=88 second=214 amount=-1 -kerning first=88 second=213 amount=-1 -kerning first=88 second=212 amount=-1 -kerning first=88 second=211 amount=-1 -kerning first=88 second=210 amount=-1 -kerning first=88 second=79 amount=-1 -kerning first=88 second=71 amount=-1 -kerning first=88 second=199 amount=-1 -kerning first=88 second=67 amount=-1 -kerning first=87 second=46 amount=-4 -kerning first=87 second=59 amount=-3 -kerning first=87 second=44 amount=-4 -kerning first=87 second=255 amount=-1 -kerning first=87 second=253 amount=-1 -kerning first=87 second=121 amount=-1 -kerning first=87 second=118 amount=-1 -kerning first=87 second=252 amount=-1 -kerning first=87 second=251 amount=-1 -kerning first=87 second=250 amount=-1 -kerning first=87 second=249 amount=-1 -kerning first=87 second=117 amount=-1 -kerning first=87 second=115 amount=-1 -kerning first=87 second=114 amount=-1 -kerning first=87 second=113 amount=-1 -kerning first=87 second=112 amount=-1 -kerning first=87 second=248 amount=-2 -kerning first=87 second=246 amount=-2 -kerning first=87 second=245 amount=-2 -kerning first=87 second=244 amount=-2 -kerning first=87 second=243 amount=-2 -kerning first=87 second=242 amount=-2 -kerning first=87 second=111 amount=-2 -kerning first=87 second=241 amount=-1 -kerning first=87 second=110 amount=-1 -kerning first=87 second=109 amount=-1 -kerning first=87 second=239 amount=1 -kerning first=87 second=238 amount=1 -kerning first=87 second=103 amount=-1 -kerning first=87 second=235 amount=-1 -kerning first=87 second=234 amount=-1 -kerning first=87 second=233 amount=-1 -kerning first=87 second=232 amount=-1 -kerning first=87 second=101 amount=-1 -kerning first=87 second=100 amount=-1 -kerning first=87 second=231 amount=-1 -kerning first=87 second=99 amount=-1 -kerning first=87 second=230 amount=-1 -kerning first=87 second=229 amount=-1 -kerning first=87 second=228 amount=-1 -kerning first=87 second=227 amount=-1 -kerning first=87 second=226 amount=-1 -kerning first=87 second=225 amount=-1 -kerning first=87 second=224 amount=-1 -kerning first=87 second=97 amount=-1 -kerning first=87 second=74 amount=-2 -kerning first=87 second=198 amount=-2 -kerning first=87 second=197 amount=-2 -kerning first=87 second=196 amount=-2 -kerning first=87 second=195 amount=-2 -kerning first=87 second=194 amount=-2 -kerning first=87 second=193 amount=-2 -kerning first=87 second=192 amount=-2 -kerning first=87 second=65 amount=-2 -kerning first=86 second=47 amount=-2 -kerning first=86 second=46 amount=-4 -kerning first=86 second=58 amount=-1 -kerning first=86 second=59 amount=-2 -kerning first=86 second=44 amount=-3 -kerning first=86 second=122 amount=-2 -kerning first=86 second=255 amount=-1 -kerning first=86 second=253 amount=-1 -kerning first=86 second=121 amount=-1 -kerning first=86 second=252 amount=-1 -kerning first=86 second=251 amount=-1 -kerning first=86 second=250 amount=-1 -kerning first=86 second=249 amount=-1 -kerning first=86 second=117 amount=-1 -kerning first=86 second=115 amount=-2 -kerning first=86 second=114 amount=-1 -kerning first=86 second=113 amount=-2 -kerning first=86 second=112 amount=-1 -kerning first=86 second=248 amount=-2 -kerning first=86 second=246 amount=-2 -kerning first=86 second=245 amount=-2 -kerning first=86 second=244 amount=-2 -kerning first=86 second=243 amount=-2 -kerning first=86 second=242 amount=-2 -kerning first=86 second=111 amount=-2 -kerning first=86 second=241 amount=-1 -kerning first=86 second=110 amount=-1 -kerning first=86 second=109 amount=-1 -kerning first=86 second=239 amount=1 -kerning first=86 second=238 amount=1 -kerning first=86 second=236 amount=1 -kerning first=86 second=103 amount=-2 -kerning first=86 second=235 amount=-2 -kerning first=86 second=234 amount=-2 -kerning first=86 second=233 amount=-2 -kerning first=86 second=232 amount=-2 -kerning first=86 second=101 amount=-2 -kerning first=86 second=100 amount=-2 -kerning first=86 second=231 amount=-2 -kerning first=86 second=99 amount=-2 -kerning first=86 second=230 amount=-2 -kerning first=86 second=229 amount=-2 -kerning first=86 second=228 amount=-2 -kerning first=86 second=227 amount=-2 -kerning first=86 second=226 amount=-2 -kerning first=86 second=225 amount=-2 -kerning first=86 second=224 amount=-2 -kerning first=86 second=97 amount=-2 -kerning first=86 second=81 amount=-1 -kerning first=86 second=214 amount=-1 -kerning first=86 second=213 amount=-1 -kerning first=86 second=212 amount=-1 -kerning first=86 second=211 amount=-1 -kerning first=86 second=210 amount=-1 -kerning first=86 second=79 amount=-1 -kerning first=86 second=74 amount=-2 -kerning first=86 second=198 amount=-3 -kerning first=86 second=197 amount=-2 -kerning first=86 second=196 amount=-2 -kerning first=86 second=195 amount=-2 -kerning first=86 second=194 amount=-2 -kerning first=86 second=193 amount=-2 -kerning first=86 second=192 amount=-2 -kerning first=86 second=65 amount=-2 -kerning first=220 second=46 amount=-1 -kerning first=220 second=44 amount=-1 -kerning first=220 second=74 amount=-1 -kerning first=220 second=198 amount=-1 -kerning first=220 second=197 amount=-1 -kerning first=220 second=196 amount=-1 -kerning first=220 second=195 amount=-1 -kerning first=220 second=194 amount=-1 -kerning first=220 second=193 amount=-1 -kerning first=197 second=84 amount=-3 -kerning first=220 second=192 amount=-1 -kerning first=220 second=65 amount=-1 -kerning first=197 second=85 amount=-1 -kerning first=197 second=217 amount=-1 -kerning first=197 second=218 amount=-1 -kerning first=197 second=219 amount=-1 -kerning first=219 second=46 amount=-1 -kerning first=197 second=220 amount=-1 -kerning first=219 second=44 amount=-1 -kerning first=219 second=74 amount=-1 -kerning first=219 second=198 amount=-1 -kerning first=219 second=197 amount=-1 -kerning first=219 second=196 amount=-1 -kerning first=197 second=86 amount=-2 -kerning first=197 second=87 amount=-2 -kerning first=219 second=195 amount=-1 -kerning first=219 second=194 amount=-1 -kerning first=219 second=193 amount=-1 -kerning first=219 second=192 amount=-1 -kerning first=197 second=89 amount=-3 -kerning first=219 second=65 amount=-1 -kerning first=197 second=221 amount=-3 -kerning first=218 second=46 amount=-1 -kerning first=218 second=44 amount=-1 -kerning first=197 second=116 amount=-1 -kerning first=218 second=74 amount=-1 -kerning first=218 second=198 amount=-1 -kerning first=197 second=118 amount=-1 -kerning first=197 second=121 amount=-1 -kerning first=218 second=197 amount=-1 -kerning first=197 second=253 amount=-1 -kerning first=218 second=196 amount=-1 -kerning first=197 second=255 amount=-1 -kerning first=197 second=63 amount=-1 -kerning first=218 second=195 amount=-1 -kerning first=218 second=194 amount=-1 -kerning first=218 second=193 amount=-1 -kerning first=218 second=192 amount=-1 -kerning first=218 second=65 amount=-1 -kerning first=217 second=46 amount=-1 -kerning first=217 second=44 amount=-1 -kerning first=217 second=74 amount=-1 -kerning first=217 second=198 amount=-1 -kerning first=217 second=197 amount=-1 -kerning first=217 second=196 amount=-1 -kerning first=217 second=195 amount=-1 -kerning first=217 second=194 amount=-1 -kerning first=217 second=193 amount=-1 -kerning first=217 second=192 amount=-1 -kerning first=217 second=65 amount=-1 -kerning first=85 second=46 amount=-1 -kerning first=85 second=44 amount=-1 -kerning first=85 second=74 amount=-1 -kerning first=85 second=198 amount=-1 -kerning first=85 second=197 amount=-1 -kerning first=85 second=196 amount=-1 -kerning first=85 second=195 amount=-1 -kerning first=85 second=194 amount=-1 -kerning first=85 second=193 amount=-1 -kerning first=85 second=192 amount=-1 -kerning first=85 second=65 amount=-1 -kerning first=84 second=47 amount=-2 -kerning first=84 second=46 amount=-4 -kerning first=84 second=58 amount=-3 -kerning first=84 second=59 amount=-2 -kerning first=84 second=44 amount=-4 -kerning first=84 second=122 amount=-3 -kerning first=84 second=255 amount=-2 -kerning first=84 second=253 amount=-2 -kerning first=84 second=121 amount=-2 -kerning first=84 second=120 amount=-2 -kerning first=84 second=119 amount=-2 -kerning first=84 second=118 amount=-2 -kerning first=84 second=252 amount=-2 -kerning first=84 second=251 amount=-2 -kerning first=84 second=250 amount=-2 -kerning first=84 second=249 amount=-2 -kerning first=84 second=117 amount=-2 -kerning first=84 second=115 amount=-3 -kerning first=84 second=114 amount=-2 -kerning first=84 second=113 amount=-3 -kerning first=84 second=112 amount=-2 -kerning first=84 second=248 amount=-3 -kerning first=84 second=246 amount=-3 -kerning first=84 second=245 amount=-3 -kerning first=84 second=244 amount=-3 -kerning first=84 second=243 amount=-3 -kerning first=84 second=242 amount=-3 -kerning first=84 second=111 amount=-3 -kerning first=84 second=241 amount=-2 -kerning first=84 second=110 amount=-2 -kerning first=84 second=109 amount=-2 -kerning first=84 second=239 amount=2 -kerning first=84 second=238 amount=1 -kerning first=84 second=236 amount=1 -kerning first=84 second=103 amount=-3 -kerning first=84 second=235 amount=-3 -kerning first=84 second=234 amount=-3 -kerning first=84 second=233 amount=-3 -kerning first=84 second=232 amount=-3 -kerning first=84 second=101 amount=-3 -kerning first=84 second=100 amount=-3 -kerning first=84 second=231 amount=-3 -kerning first=84 second=99 amount=-3 -kerning first=84 second=230 amount=-3 -kerning first=84 second=229 amount=-3 -kerning first=84 second=228 amount=-3 -kerning first=84 second=227 amount=-3 -kerning first=84 second=226 amount=-3 -kerning first=84 second=225 amount=-3 -kerning first=84 second=224 amount=-3 -kerning first=84 second=97 amount=-3 -kerning first=84 second=84 amount=1 -kerning first=84 second=81 amount=-1 -kerning first=84 second=214 amount=-1 -kerning first=84 second=213 amount=-1 -kerning first=84 second=212 amount=-1 -kerning first=84 second=211 amount=-1 -kerning first=84 second=210 amount=-1 -kerning first=84 second=79 amount=-1 -kerning first=84 second=74 amount=-1 -kerning first=84 second=71 amount=-1 -kerning first=84 second=199 amount=-1 -kerning first=84 second=67 amount=-1 -kerning first=84 second=198 amount=-3 -kerning first=84 second=197 amount=-3 -kerning first=84 second=196 amount=-3 -kerning first=84 second=195 amount=-3 -kerning first=84 second=194 amount=-3 -kerning first=84 second=193 amount=-3 -kerning first=84 second=192 amount=-3 -kerning first=84 second=65 amount=-3 -kerning first=82 second=255 amount=-1 -kerning first=82 second=253 amount=-1 -kerning first=82 second=121 amount=-1 -kerning first=82 second=119 amount=-1 -kerning first=82 second=248 amount=-1 -kerning first=82 second=246 amount=-1 -kerning first=82 second=245 amount=-1 -kerning first=82 second=244 amount=-1 -kerning first=82 second=243 amount=-1 -kerning first=82 second=242 amount=-1 -kerning first=82 second=111 amount=-1 -kerning first=82 second=235 amount=-1 -kerning first=82 second=234 amount=-1 -kerning first=82 second=233 amount=-1 -kerning first=82 second=232 amount=-1 -kerning first=82 second=101 amount=-1 -kerning first=82 second=221 amount=-1 -kerning first=82 second=89 amount=-1 -kerning first=82 second=86 amount=-1 -kerning first=82 second=83 amount=-1 -kerning first=81 second=125 amount=1 -kerning first=81 second=93 amount=1 -kerning first=81 second=41 amount=1 -kerning first=81 second=47 amount=3 -kerning first=81 second=59 amount=1 -kerning first=81 second=44 amount=2 -kerning first=81 second=120 amount=1 -kerning first=81 second=106 amount=2 -kerning first=81 second=103 amount=1 -kerning first=81 second=221 amount=-1 -kerning first=81 second=89 amount=-1 -kerning first=81 second=84 amount=-1 -kerning first=81 second=74 amount=1 -kerning first=81 second=198 amount=1 -kerning first=80 second=47 amount=-2 -kerning first=80 second=46 amount=-5 -kerning first=80 second=44 amount=-5 -kerning first=80 second=115 amount=-1 -kerning first=80 second=113 amount=-1 -kerning first=80 second=248 amount=-1 -kerning first=80 second=246 amount=-1 -kerning first=80 second=245 amount=-1 -kerning first=80 second=244 amount=-1 -kerning first=80 second=243 amount=-1 -kerning first=80 second=242 amount=-1 -kerning first=80 second=111 amount=-1 -kerning first=80 second=235 amount=-1 -kerning first=80 second=234 amount=-1 -kerning first=80 second=233 amount=-1 -kerning first=80 second=232 amount=-1 -kerning first=80 second=101 amount=-1 -kerning first=80 second=100 amount=-1 -kerning first=80 second=231 amount=-1 -kerning first=80 second=99 amount=-1 -kerning first=80 second=230 amount=-1 -kerning first=80 second=229 amount=-1 -kerning first=80 second=228 amount=-1 -kerning first=80 second=227 amount=-1 -kerning first=80 second=226 amount=-1 -kerning first=80 second=225 amount=-1 -kerning first=80 second=224 amount=-1 -kerning first=80 second=97 amount=-1 -kerning first=80 second=90 amount=-1 -kerning first=80 second=88 amount=-1 -kerning first=80 second=74 amount=-3 -kerning first=80 second=198 amount=-3 -kerning first=80 second=197 amount=-3 -kerning first=80 second=196 amount=-3 -kerning first=80 second=195 amount=-3 -kerning first=80 second=194 amount=-3 -kerning first=80 second=193 amount=-3 -kerning first=80 second=192 amount=-3 -kerning first=80 second=65 amount=-3 -kerning first=214 second=46 amount=-1 -kerning first=214 second=44 amount=-1 -kerning first=214 second=90 amount=-1 -kerning first=214 second=221 amount=-1 -kerning first=214 second=89 amount=-1 -kerning first=214 second=88 amount=-1 -kerning first=214 second=84 amount=-1 -kerning first=214 second=74 amount=-1 -kerning first=214 second=198 amount=-1 -kerning first=213 second=46 amount=-1 -kerning first=213 second=44 amount=-1 -kerning first=213 second=90 amount=-1 -kerning first=213 second=221 amount=-1 -kerning first=213 second=89 amount=-1 -kerning first=213 second=88 amount=-1 -kerning first=213 second=84 amount=-1 -kerning first=213 second=74 amount=-1 -kerning first=213 second=198 amount=-1 -kerning first=212 second=46 amount=-1 -kerning first=212 second=44 amount=-1 -kerning first=212 second=90 amount=-1 -kerning first=212 second=221 amount=-1 -kerning first=212 second=89 amount=-1 -kerning first=212 second=88 amount=-1 -kerning first=212 second=84 amount=-1 -kerning first=212 second=74 amount=-1 -kerning first=212 second=198 amount=-1 -kerning first=211 second=46 amount=-1 -kerning first=211 second=44 amount=-1 -kerning first=211 second=90 amount=-1 -kerning first=211 second=221 amount=-1 -kerning first=211 second=89 amount=-1 -kerning first=211 second=88 amount=-1 -kerning first=211 second=84 amount=-1 -kerning first=211 second=74 amount=-1 -kerning first=211 second=198 amount=-1 -kerning first=210 second=46 amount=-1 -kerning first=210 second=44 amount=-1 -kerning first=210 second=90 amount=-1 -kerning first=210 second=221 amount=-1 -kerning first=210 second=89 amount=-1 -kerning first=210 second=88 amount=-1 -kerning first=210 second=84 amount=-1 -kerning first=210 second=74 amount=-1 -kerning first=210 second=198 amount=-1 -kerning first=79 second=46 amount=-1 -kerning first=79 second=44 amount=-1 -kerning first=79 second=90 amount=-1 -kerning first=79 second=221 amount=-1 -kerning first=79 second=89 amount=-1 -kerning first=79 second=88 amount=-1 -kerning first=79 second=84 amount=-1 -kerning first=79 second=74 amount=-1 -kerning first=79 second=198 amount=-1 -kerning first=76 second=255 amount=-2 -kerning first=76 second=253 amount=-2 -kerning first=76 second=121 amount=-2 -kerning first=76 second=119 amount=-1 -kerning first=76 second=118 amount=-1 -kerning first=76 second=116 amount=-1 -kerning first=76 second=221 amount=-3 -kerning first=76 second=89 amount=-3 -kerning first=76 second=87 amount=-2 -kerning first=76 second=86 amount=-3 -kerning first=76 second=220 amount=-1 -kerning first=76 second=219 amount=-1 -kerning first=76 second=218 amount=-1 -kerning first=76 second=217 amount=-1 -kerning first=76 second=85 amount=-1 -kerning first=76 second=84 amount=-3 -kerning first=76 second=81 amount=-1 -kerning first=198 second=79 amount=-1 -kerning first=198 second=210 amount=-1 -kerning first=198 second=211 amount=-1 -kerning first=198 second=212 amount=-1 -kerning first=198 second=213 amount=-1 -kerning first=198 second=214 amount=-1 -kerning first=76 second=214 amount=-1 -kerning first=76 second=213 amount=-1 -kerning first=76 second=212 amount=-1 -kerning first=76 second=211 amount=-1 -kerning first=198 second=81 amount=-1 -kerning first=76 second=210 amount=-1 -kerning first=76 second=79 amount=-1 -kerning first=76 second=71 amount=-1 -kerning first=76 second=198 amount=1 -kerning first=75 second=255 amount=-2 -kerning first=75 second=253 amount=-2 -kerning first=75 second=121 amount=-2 -kerning first=75 second=119 amount=-2 -kerning first=75 second=118 amount=-2 -kerning first=75 second=252 amount=-1 -kerning first=198 second=97 amount=-1 -kerning first=198 second=224 amount=-1 -kerning first=198 second=225 amount=-1 -kerning first=198 second=226 amount=-1 -kerning first=198 second=227 amount=-1 -kerning first=198 second=228 amount=-1 -kerning first=75 second=251 amount=-1 -kerning first=75 second=250 amount=-1 -kerning first=198 second=229 amount=-1 -kerning first=75 second=249 amount=-1 -kerning first=198 second=230 amount=-1 -kerning first=198 second=99 amount=-1 -kerning first=75 second=117 amount=-1 -kerning first=75 second=116 amount=-1 -kerning first=75 second=114 amount=-1 -kerning first=75 second=113 amount=-1 -kerning first=198 second=231 amount=-1 -kerning first=198 second=100 amount=-1 -kerning first=198 second=101 amount=-1 -kerning first=198 second=232 amount=-1 -kerning first=198 second=233 amount=-1 -kerning first=198 second=234 amount=-1 -kerning first=75 second=112 amount=-1 -kerning first=198 second=235 amount=-1 -kerning first=75 second=248 amount=-1 -kerning first=75 second=246 amount=-1 -kerning first=75 second=245 amount=-1 -kerning first=75 second=244 amount=-1 -kerning first=198 second=102 amount=-1 -kerning first=75 second=243 amount=-1 -kerning first=75 second=242 amount=-1 -kerning first=75 second=111 amount=-1 -kerning first=75 second=241 amount=-1 -kerning first=75 second=110 amount=-1 -kerning first=198 second=111 amount=-1 -kerning first=198 second=242 amount=-1 -kerning first=198 second=243 amount=-1 -kerning first=198 second=244 amount=-1 -kerning first=198 second=245 amount=-1 -kerning first=198 second=246 amount=-1 -kerning first=75 second=109 amount=-1 -kerning first=75 second=239 amount=1 -kerning first=75 second=238 amount=1 -kerning first=198 second=248 amount=-1 -kerning first=75 second=236 amount=1 -kerning first=75 second=235 amount=-1 -kerning first=198 second=113 amount=-1 -kerning first=75 second=234 amount=-1 -kerning first=75 second=233 amount=-1 -kerning first=75 second=232 amount=-1 -kerning first=198 second=118 amount=-1 -kerning first=198 second=119 amount=-1 -kerning first=75 second=101 amount=-1 -kerning first=75 second=100 amount=-1 -kerning first=75 second=231 amount=-1 -kerning first=75 second=99 amount=-1 -kerning first=198 second=121 amount=-1 -kerning first=75 second=230 amount=-1 -kerning first=198 second=253 amount=-1 -kerning first=75 second=229 amount=-1 -kerning first=198 second=255 amount=-1 -kerning first=75 second=228 amount=-1 -kerning first=75 second=227 amount=-1 -kerning first=75 second=226 amount=-1 -kerning first=75 second=225 amount=-1 -kerning first=75 second=224 amount=-1 -kerning first=75 second=97 amount=-1 -kerning first=75 second=87 amount=-1 -kerning first=75 second=220 amount=-1 -kerning first=75 second=219 amount=-1 -kerning first=75 second=218 amount=-1 -kerning first=75 second=217 amount=-1 -kerning first=75 second=85 amount=-1 -kerning first=75 second=81 amount=-2 -kerning first=75 second=214 amount=-2 -kerning first=75 second=213 amount=-2 -kerning first=75 second=212 amount=-2 -kerning first=75 second=211 amount=-2 -kerning first=75 second=210 amount=-2 -kerning first=75 second=79 amount=-2 -kerning first=75 second=71 amount=-2 -kerning first=75 second=199 amount=-1 -kerning first=75 second=67 amount=-1 -kerning first=74 second=44 amount=-1 -kerning first=74 second=197 amount=-1 -kerning first=74 second=196 amount=-1 -kerning first=74 second=195 amount=-1 -kerning first=74 second=194 amount=-1 -kerning first=74 second=193 amount=-1 -kerning first=74 second=192 amount=-1 -kerning first=74 second=65 amount=-1 -kerning first=71 second=255 amount=-1 -kerning first=71 second=253 amount=-1 -kerning first=71 second=121 amount=-1 -kerning first=71 second=118 amount=-1 -kerning first=71 second=221 amount=-1 -kerning first=71 second=89 amount=-1 -kerning first=70 second=47 amount=-1 -kerning first=70 second=46 amount=-4 -kerning first=70 second=44 amount=-4 -kerning first=70 second=115 amount=-1 -kerning first=70 second=248 amount=-1 -kerning first=70 second=246 amount=-1 -kerning first=70 second=245 amount=-1 -kerning first=70 second=244 amount=-1 -kerning first=70 second=243 amount=-1 -kerning first=70 second=242 amount=-1 -kerning first=70 second=111 amount=-1 -kerning first=70 second=235 amount=-1 -kerning first=70 second=234 amount=-1 -kerning first=70 second=233 amount=-1 -kerning first=70 second=232 amount=-1 -kerning first=70 second=101 amount=-1 -kerning first=70 second=231 amount=-1 -kerning first=70 second=99 amount=-1 -kerning first=70 second=230 amount=-1 -kerning first=70 second=229 amount=-1 -kerning first=70 second=228 amount=-1 -kerning first=70 second=227 amount=-1 -kerning first=70 second=226 amount=-1 -kerning first=70 second=225 amount=-1 -kerning first=70 second=224 amount=-1 -kerning first=70 second=97 amount=-1 -kerning first=70 second=83 amount=-1 -kerning first=70 second=74 amount=-2 -kerning first=70 second=198 amount=-2 -kerning first=70 second=197 amount=-2 -kerning first=70 second=196 amount=-2 -kerning first=70 second=195 amount=-2 -kerning first=70 second=194 amount=-2 -kerning first=70 second=193 amount=-2 -kerning first=70 second=192 amount=-2 -kerning first=70 second=65 amount=-2 -kerning first=203 second=255 amount=-1 -kerning first=203 second=253 amount=-1 -kerning first=203 second=121 amount=-1 -kerning first=203 second=119 amount=-1 -kerning first=203 second=118 amount=-1 -kerning first=203 second=113 amount=-1 -kerning first=203 second=248 amount=-1 -kerning first=203 second=246 amount=-1 -kerning first=203 second=245 amount=-1 -kerning first=203 second=244 amount=-1 -kerning first=203 second=243 amount=-1 -kerning first=203 second=242 amount=-1 -kerning first=203 second=111 amount=-1 -kerning first=203 second=102 amount=-1 -kerning first=203 second=235 amount=-1 -kerning first=203 second=234 amount=-1 -kerning first=203 second=233 amount=-1 -kerning first=203 second=232 amount=-1 -kerning first=203 second=101 amount=-1 -kerning first=203 second=100 amount=-1 -kerning first=203 second=231 amount=-1 -kerning first=203 second=99 amount=-1 -kerning first=203 second=230 amount=-1 -kerning first=203 second=229 amount=-1 -kerning first=203 second=228 amount=-1 -kerning first=203 second=227 amount=-1 -kerning first=203 second=226 amount=-1 -kerning first=203 second=225 amount=-1 -kerning first=203 second=224 amount=-1 -kerning first=203 second=97 amount=-1 -kerning first=203 second=81 amount=-1 -kerning first=203 second=214 amount=-1 -kerning first=203 second=213 amount=-1 -kerning first=203 second=212 amount=-1 -kerning first=203 second=211 amount=-1 -kerning first=203 second=210 amount=-1 -kerning first=203 second=79 amount=-1 -kerning first=202 second=255 amount=-1 -kerning first=202 second=253 amount=-1 -kerning first=202 second=121 amount=-1 -kerning first=202 second=119 amount=-1 -kerning first=202 second=118 amount=-1 -kerning first=202 second=113 amount=-1 -kerning first=202 second=248 amount=-1 -kerning first=202 second=246 amount=-1 -kerning first=202 second=245 amount=-1 -kerning first=202 second=244 amount=-1 -kerning first=202 second=243 amount=-1 -kerning first=202 second=242 amount=-1 -kerning first=202 second=111 amount=-1 -kerning first=202 second=102 amount=-1 -kerning first=202 second=235 amount=-1 -kerning first=202 second=234 amount=-1 -kerning first=202 second=233 amount=-1 -kerning first=202 second=232 amount=-1 -kerning first=202 second=101 amount=-1 -kerning first=202 second=100 amount=-1 -kerning first=202 second=231 amount=-1 -kerning first=202 second=99 amount=-1 -kerning first=202 second=230 amount=-1 -kerning first=202 second=229 amount=-1 -kerning first=202 second=228 amount=-1 -kerning first=202 second=227 amount=-1 -kerning first=202 second=226 amount=-1 -kerning first=202 second=225 amount=-1 -kerning first=202 second=224 amount=-1 -kerning first=202 second=97 amount=-1 -kerning first=202 second=81 amount=-1 -kerning first=202 second=214 amount=-1 -kerning first=202 second=213 amount=-1 -kerning first=202 second=212 amount=-1 -kerning first=202 second=211 amount=-1 -kerning first=202 second=210 amount=-1 -kerning first=202 second=79 amount=-1 -kerning first=201 second=255 amount=-1 -kerning first=201 second=253 amount=-1 -kerning first=201 second=121 amount=-1 -kerning first=201 second=119 amount=-1 -kerning first=201 second=118 amount=-1 -kerning first=201 second=113 amount=-1 -kerning first=201 second=248 amount=-1 -kerning first=201 second=246 amount=-1 -kerning first=201 second=245 amount=-1 -kerning first=201 second=244 amount=-1 -kerning first=201 second=243 amount=-1 -kerning first=201 second=242 amount=-1 -kerning first=201 second=111 amount=-1 -kerning first=201 second=102 amount=-1 -kerning first=201 second=235 amount=-1 -kerning first=201 second=234 amount=-1 -kerning first=201 second=233 amount=-1 -kerning first=201 second=232 amount=-1 -kerning first=201 second=101 amount=-1 -kerning first=201 second=100 amount=-1 -kerning first=201 second=231 amount=-1 -kerning first=201 second=99 amount=-1 -kerning first=201 second=230 amount=-1 -kerning first=201 second=229 amount=-1 -kerning first=201 second=228 amount=-1 -kerning first=201 second=227 amount=-1 -kerning first=201 second=226 amount=-1 -kerning first=201 second=225 amount=-1 -kerning first=201 second=224 amount=-1 -kerning first=201 second=97 amount=-1 -kerning first=201 second=81 amount=-1 -kerning first=201 second=214 amount=-1 -kerning first=201 second=213 amount=-1 -kerning first=201 second=212 amount=-1 -kerning first=201 second=211 amount=-1 -kerning first=201 second=210 amount=-1 -kerning first=201 second=79 amount=-1 -kerning first=200 second=255 amount=-1 -kerning first=200 second=253 amount=-1 -kerning first=200 second=121 amount=-1 -kerning first=200 second=119 amount=-1 -kerning first=200 second=118 amount=-1 -kerning first=200 second=113 amount=-1 -kerning first=200 second=248 amount=-1 -kerning first=200 second=246 amount=-1 -kerning first=200 second=245 amount=-1 -kerning first=200 second=244 amount=-1 -kerning first=200 second=243 amount=-1 -kerning first=200 second=242 amount=-1 -kerning first=200 second=111 amount=-1 -kerning first=200 second=102 amount=-1 -kerning first=200 second=235 amount=-1 -kerning first=200 second=234 amount=-1 -kerning first=200 second=233 amount=-1 -kerning first=200 second=232 amount=-1 -kerning first=200 second=101 amount=-1 -kerning first=200 second=100 amount=-1 -kerning first=200 second=231 amount=-1 -kerning first=200 second=99 amount=-1 -kerning first=200 second=230 amount=-1 -kerning first=200 second=229 amount=-1 -kerning first=200 second=228 amount=-1 -kerning first=200 second=227 amount=-1 -kerning first=200 second=226 amount=-1 -kerning first=200 second=225 amount=-1 -kerning first=200 second=224 amount=-1 -kerning first=200 second=97 amount=-1 -kerning first=200 second=81 amount=-1 -kerning first=200 second=214 amount=-1 -kerning first=200 second=213 amount=-1 -kerning first=200 second=212 amount=-1 -kerning first=200 second=211 amount=-1 -kerning first=200 second=210 amount=-1 -kerning first=200 second=79 amount=-1 -kerning first=69 second=255 amount=-1 -kerning first=69 second=253 amount=-1 -kerning first=69 second=121 amount=-1 -kerning first=69 second=119 amount=-1 -kerning first=69 second=118 amount=-1 -kerning first=69 second=113 amount=-1 -kerning first=69 second=248 amount=-1 -kerning first=69 second=246 amount=-1 -kerning first=69 second=245 amount=-1 -kerning first=69 second=244 amount=-1 -kerning first=69 second=243 amount=-1 -kerning first=69 second=242 amount=-1 -kerning first=69 second=111 amount=-1 -kerning first=69 second=102 amount=-1 -kerning first=69 second=235 amount=-1 -kerning first=69 second=234 amount=-1 -kerning first=69 second=233 amount=-1 -kerning first=69 second=232 amount=-1 -kerning first=69 second=101 amount=-1 -kerning first=66 second=84 amount=-1 -kerning first=69 second=100 amount=-1 -kerning first=69 second=231 amount=-1 -kerning first=69 second=99 amount=-1 -kerning first=69 second=230 amount=-1 -kerning first=69 second=229 amount=-1 -kerning first=69 second=228 amount=-1 -kerning first=69 second=227 amount=-1 -kerning first=69 second=226 amount=-1 -kerning first=66 second=88 amount=-1 -kerning first=66 second=89 amount=-1 -kerning first=69 second=225 amount=-1 -kerning first=66 second=221 amount=-1 -kerning first=69 second=224 amount=-1 -kerning first=69 second=97 amount=-1 -kerning first=69 second=81 amount=-1 -kerning first=69 second=214 amount=-1 -kerning first=69 second=213 amount=-1 -kerning first=69 second=212 amount=-1 -kerning first=69 second=211 amount=-1 -kerning first=69 second=210 amount=-1 -kerning first=69 second=79 amount=-1 -kerning first=208 second=46 amount=-1 -kerning first=208 second=44 amount=-1 -kerning first=208 second=221 amount=-1 -kerning first=208 second=89 amount=-1 -kerning first=208 second=88 amount=-1 -kerning first=208 second=198 amount=-1 -kerning first=208 second=197 amount=-1 -kerning first=208 second=196 amount=-1 -kerning first=208 second=195 amount=-1 -kerning first=208 second=194 amount=-1 -kerning first=208 second=193 amount=-1 -kerning first=208 second=192 amount=-1 -kerning first=208 second=65 amount=-1 -kerning first=66 second=44 amount=-1 -kerning first=68 second=46 amount=-1 -kerning first=68 second=44 amount=-1 -kerning first=68 second=221 amount=-1 -kerning first=68 second=89 amount=-1 -kerning first=68 second=88 amount=-1 -kerning first=68 second=198 amount=-1 -kerning first=68 second=197 amount=-1 -kerning first=68 second=196 amount=-1 -kerning first=68 second=195 amount=-1 -kerning first=68 second=194 amount=-1 -kerning first=68 second=193 amount=-1 -kerning first=68 second=192 amount=-1 -kerning first=68 second=65 amount=-1 diff --git a/android/assets/fonts/font_0.png b/android/assets/fonts/font_0.png deleted file mode 100644 index f68e2d7..0000000 Binary files a/android/assets/fonts/font_0.png and /dev/null differ diff --git a/android/assets/skins/menuSkin.json b/android/assets/skins/menuSkin.json deleted file mode 100644 index 52850c3..0000000 --- a/android/assets/skins/menuSkin.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "com.badlogic.gdx.graphics.g2d.BitmapFont": { - "font": { "file": "fonts/font.fnt" }, - }, - "com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle": { - "default": { "up": "blue_button2" , "down": "blue_button3", "font": font, "pressedOffsetY": -4 } - }, - "com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle": { - "default": { "font": font} - } -} \ No newline at end of file diff --git a/android/assets/skins/menuSkin.pack b/android/assets/skins/menuSkin.pack deleted file mode 100644 index 040678f..0000000 --- a/android/assets/skins/menuSkin.pack +++ /dev/null @@ -1,155 +0,0 @@ - -menuSkin.png -format: RGBA8888 -filter: Nearest,Nearest -repeat: none -blue_panel - rotate: false - xy: 1, 23 - size: 100, 100 - split: 39, 60, 42, 57 - orig: 100, 100 - offset: 0, 0 - index: -1 -blue_button1 - rotate: false - xy: 103, 74 - size: 49, 49 - split: 6, 6, 7, 10 - orig: 49, 49 - offset: 0, 0 - index: -1 -blue_button2 - rotate: false - xy: 103, 23 - size: 49, 49 - split: 7, 7, 5, 9 - orig: 49, 49 - offset: 0, 0 - index: -1 -blue_button4 - rotate: false - xy: 154, 74 - size: 49, 49 - split: 12, 19, 7, 10 - orig: 49, 49 - offset: 0, 0 - index: -1 -blue_button6 - rotate: false - xy: 154, 23 - size: 49, 49 - split: 9, 12, 6, 10 - orig: 49, 49 - offset: 0, 0 - index: -1 -blue_button3 - rotate: false - xy: 205, 78 - size: 49, 45 - split: 15, 15, 5, 7 - orig: 49, 45 - offset: 0, 0 - index: -1 -blue_button5 - rotate: false - xy: 205, 31 - size: 49, 45 - split: 7, 8, 7, 8 - orig: 49, 45 - offset: 0, 0 - index: -1 -blue_button7 - rotate: false - xy: 256, 78 - size: 49, 45 - split: 9, 11, 5, 5 - orig: 49, 45 - offset: 0, 0 - index: -1 -blue_boxCheckmark - rotate: false - xy: 256, 40 - size: 38, 36 - orig: 38, 36 - offset: 0, 0 - index: -1 -blue_boxCross - rotate: false - xy: 307, 87 - size: 38, 36 - orig: 38, 36 - offset: 0, 0 - index: -1 -grey_box - rotate: false - xy: 347, 87 - size: 38, 36 - orig: 38, 36 - offset: 0, 0 - index: -1 -blue_circle - rotate: false - xy: 387, 87 - size: 36, 36 - split: 17, 18, 17, 18 - orig: 36, 36 - offset: 0, 0 - index: -1 -blue_sliderLeft - rotate: false - xy: 425, 92 - size: 39, 31 - orig: 39, 31 - offset: 0, 0 - index: -1 -blue_sliderRight - rotate: false - xy: 466, 92 - size: 39, 31 - orig: 39, 31 - offset: 0, 0 - index: -1 -blue_sliderDown - rotate: false - xy: 296, 34 - size: 28, 42 - orig: 28, 42 - offset: 0, 0 - index: -1 -blue_sliderUp - rotate: false - xy: 326, 43 - size: 28, 42 - orig: 28, 42 - offset: 0, 0 - index: -1 -blue_checkmark - rotate: false - xy: 1, 1 - size: 21, 20 - orig: 21, 20 - offset: 0, 0 - index: -1 -blue_cross - rotate: false - xy: 356, 67 - size: 18, 18 - orig: 18, 18 - offset: 0, 0 - index: -1 -blue_selection - rotate: false - xy: 24, 4 - size: 17, 17 - split: 8, 8, 8, 8 - orig: 17, 17 - offset: 0, 0 - index: -1 -blue_selection - rotate: false - xy: 24, 4 - size: 17, 17 - orig: 17, 17 - offset: 0, 0 - index: -1 diff --git a/android/assets/skins/menuSkin.png b/android/assets/skins/menuSkin.png deleted file mode 100644 index e3df75b..0000000 Binary files a/android/assets/skins/menuSkin.png and /dev/null differ diff --git a/android/assets/skins/menupack.atlas b/android/assets/skins/menupack.atlas deleted file mode 100644 index 57c016e..0000000 --- a/android/assets/skins/menupack.atlas +++ /dev/null @@ -1,33 +0,0 @@ - -menupack.png -format: RGBA8888 -filter: Nearest,Nearest -repeat: none -blau - rotate: false - xy: 1, 1 - size: 128, 128 - orig: 128, 128 - offset: 0, 0 - index: -1 -gelb - rotate: false - xy: 131, 1 - size: 128, 128 - orig: 128, 128 - offset: 0, 0 - index: -1 -grün - rotate: false - xy: 261, 1 - size: 128, 128 - orig: 128, 128 - offset: 0, 0 - index: -1 -rot - rotate: false - xy: 391, 1 - size: 128, 128 - orig: 128, 128 - offset: 0, 0 - index: -1 diff --git a/android/assets/skins/menupack.json b/android/assets/skins/menupack.json deleted file mode 100644 index 82ae54a..0000000 --- a/android/assets/skins/menupack.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "com.badlogic.gdx.graphics.g2d.BitmapFont": { - "font": { "file": "fonts/font.fnt" }, - }, - "com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle": { - "default": { "up": "blau" , "down": "blau", "font": font, "pressedOffsetY": -4 } - }, - "com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle": { - "default": { "up": "grün" , "down": "grün", "font": font, "pressedOffsetY": -4 } - }, - "com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle": { - "default": { "up": "gelb" , "down": "gelb", "font": font, "pressedOffsetY": -4 } - }, - "com.badlogic.gdx.scenes.scene2d.ui.TextButton$TextButtonStyle": { - "default": { "up": "rot" , "down": "rot", "font": font, "pressedOffsetY": -4 } - }, - "com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle": { - "default": { "font": font} - } -} \ No newline at end of file diff --git a/android/assets/skins/menupack.pack b/android/assets/skins/menupack.pack deleted file mode 100644 index 57c016e..0000000 --- a/android/assets/skins/menupack.pack +++ /dev/null @@ -1,33 +0,0 @@ - -menupack.png -format: RGBA8888 -filter: Nearest,Nearest -repeat: none -blau - rotate: false - xy: 1, 1 - size: 128, 128 - orig: 128, 128 - offset: 0, 0 - index: -1 -gelb - rotate: false - xy: 131, 1 - size: 128, 128 - orig: 128, 128 - offset: 0, 0 - index: -1 -grün - rotate: false - xy: 261, 1 - size: 128, 128 - orig: 128, 128 - offset: 0, 0 - index: -1 -rot - rotate: false - xy: 391, 1 - size: 128, 128 - orig: 128, 128 - offset: 0, 0 - index: -1 diff --git a/android/assets/skins/menupack.png b/android/assets/skins/menupack.png deleted file mode 100644 index 353ec83..0000000 Binary files a/android/assets/skins/menupack.png and /dev/null differ diff --git a/android/assets/sound/menusound.mp3 b/android/assets/sound/menusound.mp3 deleted file mode 100644 index 891bedb..0000000 Binary files a/android/assets/sound/menusound.mp3 and /dev/null differ diff --git a/android/build.gradle b/android/build.gradle index d411dd2..dd5cf53 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,6 +1,6 @@ android { - buildToolsVersion '26.0.2' - compileSdkVersion 24 + buildToolsVersion "23.0.1" + compileSdkVersion 20 sourceSets { main { manifest.srcFile 'AndroidManifest.xml' @@ -14,21 +14,41 @@ android { instrumentTest.setRoot('tests') } + packagingOptions { + exclude 'META-INF/robovm/ios/robovm.xml' + } + defaultConfig { + applicationId "de.samdev.colorrunner" + minSdkVersion 9 + targetSdkVersion 20 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } } // called every time gradle gets executed, takes the native dependencies of // the natives configuration, and extracts them to the proper libs/ folders // so they get packed with the APK. -task copyAndroidNatives() { +task copyAndroidNatives() { file("libs/armeabi/").mkdirs(); file("libs/armeabi-v7a/").mkdirs(); + file("libs/arm64-v8a/").mkdirs(); + file("libs/x86_64/").mkdirs(); file("libs/x86/").mkdirs(); configurations.natives.files.each { jar -> def outputDir = null - if(jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a") + if(jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a") + if(jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a") if(jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi") + if(jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64") if(jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86") if(outputDir != null) { copy { @@ -59,16 +79,45 @@ task run(type: Exec) { } def adb = path + "/platform-tools/adb" - commandLine "$adb", 'shell', 'am', 'start', '-n', 'de.samdev.colorrunner.android/de.samdev.colorrunner.android.AndroidLauncher' + commandLine "$adb", 'shell', 'am', 'start', '-n', 'de.samdev.colorrunner/de.samdev.colorrunner.AndroidLauncher' } // sets up the Android Eclipse project, using the old Ant based build. +eclipse { + // need to specify Java source sets explicitly, SpringSource Gradle Eclipse plugin + // ignores any nodes added in classpath.file.withXml + sourceSets { + main { + java.srcDirs "src", 'gen' + } + } + + jdt { + sourceCompatibility = 1.6 + targetCompatibility = 1.6 + } + + classpath { + plusConfigurations += [ project.configurations.compile ] + containers 'com.android.ide.eclipse.adt.ANDROID_FRAMEWORK', 'com.android.ide.eclipse.adt.LIBRARIES' + } + + project { + name = appName + "-android" + natures 'com.android.ide.eclipse.adt.AndroidNature' + buildCommands.clear(); + buildCommand "com.android.ide.eclipse.adt.ResourceManagerBuilder" + buildCommand "com.android.ide.eclipse.adt.PreCompilerBuilder" + buildCommand "org.eclipse.jdt.core.javabuilder" + buildCommand "com.android.ide.eclipse.adt.ApkBuilder" + } +} // sets up the Android Idea project, using the old Ant based build. idea { module { sourceDirs += file("src"); - scopes = [ COMPILE: [plus:[project.configurations.compile]]] + scopes = [ COMPILE: [plus:[project.configurations.compile]]] iml { withXml { diff --git a/android/ic_launcher-web.png b/android/ic_launcher-web.png index a18cbb4..8f0110d 100644 Binary files a/android/ic_launcher-web.png and b/android/ic_launcher-web.png differ diff --git a/android/proguard-project.txt b/android/proguard-rules.pro similarity index 92% rename from android/proguard-project.txt rename to android/proguard-rules.pro index 88c3958..b166b1e 100644 --- a/android/proguard-project.txt +++ b/android/proguard-rules.pro @@ -26,6 +26,9 @@ -dontwarn com.badlogic.gdx.utils.GdxBuild -dontwarn com.badlogic.gdx.physics.box2d.utils.Box2DBuild -dontwarn com.badlogic.gdx.jnigen.BuildTarget* +-dontwarn com.badlogic.gdx.graphics.g2d.freetype.FreetypeBuild + +-keep class com.badlogic.gdx.controllers.android.AndroidControllers -keepclassmembers class com.badlogic.gdx.backends.android.AndroidInput* { (com.badlogic.gdx.Application, android.content.Context, java.lang.Object, com.badlogic.gdx.backends.android.AndroidApplicationConfiguration); diff --git a/android/project.properties b/android/project.properties index 4ab1256..3fefa92 100644 --- a/android/project.properties +++ b/android/project.properties @@ -1,14 +1,9 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt +# This file is used by the Eclipse ADT plugin. It is unnecessary for IDEA and Android Studio projects, which +# configure Proguard and the Android target via the build.gradle file. + +# To enable ProGuard to work with Eclipse ADT, uncomment this (available properties: sdk.dir, user.home) +# and ensure proguard.jar in the Android SDK is up to date (or alternately reduce the android target to 23 or lower): +# proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-rules.pro # Project target. target=android-19 diff --git a/android/res/drawable-hdpi/ic_launcher.png b/android/res/drawable-hdpi/ic_launcher.png index 288b665..91f696b 100644 Binary files a/android/res/drawable-hdpi/ic_launcher.png and b/android/res/drawable-hdpi/ic_launcher.png differ diff --git a/android/res/drawable-mdpi/ic_launcher.png b/android/res/drawable-mdpi/ic_launcher.png index 6ae570b..c1ab239 100644 Binary files a/android/res/drawable-mdpi/ic_launcher.png and b/android/res/drawable-mdpi/ic_launcher.png differ diff --git a/android/res/drawable-xhdpi/ic_launcher.png b/android/res/drawable-xhdpi/ic_launcher.png index d4fb7cd..2011cc0 100644 Binary files a/android/res/drawable-xhdpi/ic_launcher.png and b/android/res/drawable-xhdpi/ic_launcher.png differ diff --git a/android/res/drawable-xxhdpi/ic_launcher.png b/android/res/drawable-xxhdpi/ic_launcher.png index 85a6081..25fcef0 100644 Binary files a/android/res/drawable-xxhdpi/ic_launcher.png and b/android/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/android/res/drawable-xxxhdpi/ic_launcher.png b/android/res/drawable-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..d109946 Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_launcher.png differ diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml index e1a31ca..ba1104a 100644 --- a/android/res/values/strings.xml +++ b/android/res/values/strings.xml @@ -1,6 +1,6 @@ - ColorRunner + colorrunner diff --git a/android/src/de/samdev/colorrunner/android/AndroidLauncher.java b/android/src/de/samdev/colorrunner/AndroidLauncher.java similarity index 85% rename from android/src/de/samdev/colorrunner/android/AndroidLauncher.java rename to android/src/de/samdev/colorrunner/AndroidLauncher.java index 05a34e1..cd6f603 100644 --- a/android/src/de/samdev/colorrunner/android/AndroidLauncher.java +++ b/android/src/de/samdev/colorrunner/AndroidLauncher.java @@ -1,10 +1,9 @@ -package de.samdev.colorrunner.android; +package de.samdev.colorrunner; import android.os.Bundle; import com.badlogic.gdx.backends.android.AndroidApplication; import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration; -import de.samdev.colorrunner.CRGame; public class AndroidLauncher extends AndroidApplication { @Override diff --git a/build.gradle b/build.gradle index 785394c..5ed7b4e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,31 +1,38 @@ buildscript { + + repositories { + mavenLocal() mavenCentral() maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } jcenter() - google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' - classpath 'org.robovm:robovm-gradle-plugin:1.12.0' + classpath 'com.android.tools.build:gradle:2.2.0' + + } } allprojects { + apply plugin: "eclipse" apply plugin: "idea" version = '1.0' ext { - appName = 'ColorRunner' - gdxVersion = '1.6.1' - roboVMVersion = '1.2.0' + appName = "colorrunner" + gdxVersion = '1.9.7' + roboVMVersion = '2.3.1' + box2DLightsVersion = '1.4' + ashleyVersion = '1.7.0' + aiVersion = '1.8.0' } repositories { + mavenLocal() mavenCentral() maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } maven { url "https://oss.sonatype.org/content/repositories/releases/" } - google() } } @@ -37,7 +44,7 @@ project(":desktop") { compile project(":core") compile "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion" compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" - compile "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-desktop" + } } @@ -51,11 +58,10 @@ project(":android") { compile "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion" natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi" natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi-v7a" + natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a" natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86" - compile "com.badlogicgames.gdx:gdx-box2d:$gdxVersion" - natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-armeabi" - natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-armeabi-v7a" - natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-x86" + natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64" + } } @@ -65,22 +71,10 @@ project(":core") { dependencies { compile "com.badlogicgames.gdx:gdx:$gdxVersion" - compile "com.badlogicgames.gdx:gdx-box2d:$gdxVersion" + } } -project(":ios") { - apply plugin: "java" - apply plugin: "robovm" - - configurations { natives } - - dependencies { - compile project(":core") - compile "org.robovm:robovm-rt:${roboVMVersion}" - compile "org.robovm:robovm-cocoatouch:${roboVMVersion}" - compile "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion" - natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios" - natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-ios" - } +tasks.eclipse.doLast { + delete ".project" } \ No newline at end of file diff --git a/core/build.gradle b/core/build.gradle index 199ca7f..03cd1be 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -3,4 +3,9 @@ apply plugin: "java" sourceCompatibility = 1.6 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' -sourceSets.main.java.srcDirs = [ "src/" ] \ No newline at end of file +sourceSets.main.java.srcDirs = [ "src/" ] + + +eclipse.project { + name = appName + "-core" +} diff --git a/core/src/de/samdev/colorrunner/CRGame.java b/core/src/de/samdev/colorrunner/CRGame.java index 81b4c3f..df3a4c6 100644 --- a/core/src/de/samdev/colorrunner/CRGame.java +++ b/core/src/de/samdev/colorrunner/CRGame.java @@ -12,7 +12,7 @@ public class CRGame extends Game { public final static boolean DEBUG = true; public static AssetManager manager; - + @Override public void create() { //if (DEBUG) @@ -21,7 +21,7 @@ public class CRGame extends Game { manager = new AssetManager(); manager.load("sound/mainsound.mp3", Music.class); - manager.load("sound/menusound.mp3", Music.class); + //manager.load("sound/menusound.mp3", Music.class); manager.finishLoading(); Preferences endlessGameInfos = Gdx.app.getPreferences("endlessGameInfos"); diff --git a/core/src/de/samdev/colorrunner/game/renderer/CRGameRenderer.java b/core/src/de/samdev/colorrunner/game/renderer/CRGameRenderer.java index 283c803..8c8774f 100644 --- a/core/src/de/samdev/colorrunner/game/renderer/CRGameRenderer.java +++ b/core/src/de/samdev/colorrunner/game/renderer/CRGameRenderer.java @@ -1,6 +1,5 @@ package de.samdev.colorrunner.game.renderer; -import com.badlogic.gdx.Game; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Preferences; import com.badlogic.gdx.graphics.g2d.TextureRegion; @@ -16,8 +15,6 @@ import de.samdev.colorrunner.game.world.entities.MovingEntity; import de.samdev.colorrunner.game.world.entities.gameentities.floor.FloorTileEntity; import de.samdev.colorrunner.game.world.map.provider.EndlessMapProvider; import de.samdev.colorrunner.game.world.map.provider.StaticMapProvider; -import de.samdev.colorrunner.screens.gameScreen.GameScreen; -import de.samdev.colorrunner.screens.menu.MainMenu; public class CRGameRenderer extends AbstractGameRenderer { private CRGameWorld gameworld; diff --git a/core/src/de/samdev/colorrunner/game/world/entities/gameentities/PlayerEntity.java b/core/src/de/samdev/colorrunner/game/world/entities/gameentities/PlayerEntity.java index 7a85d34..29304f9 100644 --- a/core/src/de/samdev/colorrunner/game/world/entities/gameentities/PlayerEntity.java +++ b/core/src/de/samdev/colorrunner/game/world/entities/gameentities/PlayerEntity.java @@ -18,7 +18,6 @@ import de.samdev.colorrunner.game.world.entities.gameentities.controller.FlyPlay import de.samdev.colorrunner.game.world.entities.gameentities.controller.RunTopPlayerController; import de.samdev.colorrunner.game.world.entities.gameentities.floor.FloorTileEntity; import de.samdev.colorrunner.game.world.map.CRMapStorage; -import de.samdev.colorrunner.game.world.map.provider.MapProvider; import de.samdev.colorrunner.game.world.map.provider.StaticMapProvider; import de.samdev.colorrunner.game.world.map.provider.TriggerType; import de.samdev.colorrunner.screens.gameScreen.GameScreen; diff --git a/core/src/de/samdev/colorrunner/input/CRGameInputProcessor.java b/core/src/de/samdev/colorrunner/input/CRGameInputProcessor.java index 76bddbf..9abd89a 100644 --- a/core/src/de/samdev/colorrunner/input/CRGameInputProcessor.java +++ b/core/src/de/samdev/colorrunner/input/CRGameInputProcessor.java @@ -152,4 +152,9 @@ public class CRGameInputProcessor implements InputProcessor, GestureListener { return false; } + @Override + public void pinchStop() { + // NOP + } + } diff --git a/core/src/de/samdev/colorrunner/screens/gameScreen/GameScreen.java b/core/src/de/samdev/colorrunner/screens/gameScreen/GameScreen.java index 630ce17..ed49714 100644 --- a/core/src/de/samdev/colorrunner/screens/gameScreen/GameScreen.java +++ b/core/src/de/samdev/colorrunner/screens/gameScreen/GameScreen.java @@ -3,18 +3,13 @@ package de.samdev.colorrunner.screens.gameScreen; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.InputMultiplexer; import com.badlogic.gdx.Screen; -import com.badlogic.gdx.assets.AssetManager; -import com.badlogic.gdx.audio.Music; -import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.input.GestureDetector; -import de.samdev.colorrunner.CRGame; import de.samdev.colorrunner.game.renderer.CRGameRenderer; import de.samdev.colorrunner.game.world.AverageExecutionLogger; import de.samdev.colorrunner.game.world.CRGameWorld; import de.samdev.colorrunner.game.world.map.provider.MapProvider; import de.samdev.colorrunner.input.CRGameInputProcessor; -import de.samdev.colorrunner.screens.menu.SplashScreen; public class GameScreen implements Screen { private CRGameWorld world; diff --git a/core/src/de/samdev/colorrunner/screens/menu/SplashScreen.java b/core/src/de/samdev/colorrunner/screens/menu/SplashScreen.java index d12a74e..5b6085f 100644 --- a/core/src/de/samdev/colorrunner/screens/menu/SplashScreen.java +++ b/core/src/de/samdev/colorrunner/screens/menu/SplashScreen.java @@ -9,6 +9,8 @@ import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.math.MathUtils; +import de.samdev.colorrunner.CRGame; + public class SplashScreen implements Screen { @@ -29,12 +31,10 @@ public class SplashScreen implements Screen { sB.begin(); sB.draw(logo, -9,-8, 18, 16); sB.end(); - } - public void update(float delta) { loadTime += delta; if (loadTime > 0.9) - ((Game) Gdx.app.getApplicationListener()).setScreen(new MainMenu()); + CRGame.Inst().setScreen(new MainMenu()); } @Override diff --git a/desktop/build.gradle b/desktop/build.gradle index 387770e..f4a667b 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -1,8 +1,10 @@ apply plugin: "java" + sourceCompatibility = 1.6 -sourceSets.main.java.srcDirs = ["src/"] +sourceSets.main.java.srcDirs = [ "src/" ] + project.ext.mainClassName = "de.samdev.colorrunner.desktop.DesktopLauncher" -project.ext.assetsDir = new File("../android/assets") +project.ext.assetsDir = new File("../android/assets"); task run(dependsOn: classes, type: JavaExec) { main = project.mainClassName @@ -12,15 +14,42 @@ task run(dependsOn: classes, type: JavaExec) { ignoreExitValue = true } +task debug(dependsOn: classes, type: JavaExec) { + main = project.mainClassName + classpath = sourceSets.main.runtimeClasspath + standardInput = System.in + workingDir = project.assetsDir + ignoreExitValue = true + debug = true +} + task dist(type: Jar) { from files(sourceSets.main.output.classesDir) from files(sourceSets.main.output.resourcesDir) - from { configurations.compile.collect { zipTree(it) } } + from {configurations.compile.collect {zipTree(it)}} from files(project.assetsDir); - + manifest { attributes 'Main-Class': project.mainClassName } } dist.dependsOn classes + +eclipse { + project { + name = appName + "-desktop" + linkedResource name: 'assets', type: '2', location: 'PARENT-1-PROJECT_LOC/android/assets' + } +} + +task afterEclipseImport(description: "Post processing after project generation", group: "IDE") { + doLast { + def classpath = new XmlParser().parse(file(".classpath")) + new Node(classpath, "classpathentry", [ kind: 'src', path: 'assets' ]); + def writer = new FileWriter(file(".classpath")) + def printer = new XmlNodePrinter(new PrintWriter(writer)) + printer.setPreserveWhitespace(true) + printer.print(classpath) + } +} diff --git a/desktop/src/de/samdev/colorrunner/desktop/DesktopLauncher.java b/desktop/src/de/samdev/colorrunner/desktop/DesktopLauncher.java index 5ba7118..d18de39 100644 --- a/desktop/src/de/samdev/colorrunner/desktop/DesktopLauncher.java +++ b/desktop/src/de/samdev/colorrunner/desktop/DesktopLauncher.java @@ -2,24 +2,15 @@ package de.samdev.colorrunner.desktop; import com.badlogic.gdx.backends.lwjgl.LwjglApplication; import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; + import de.samdev.colorrunner.CRGame; public class DesktopLauncher { public static void main (String[] arg) { LwjglApplicationConfiguration config = new LwjglApplicationConfiguration(); - config.title = "ColorRunner"; config.width = 1000; config.height = 563; - - /* - * For FPS Independence Testing - */ -// config.vSyncEnabled = false; // Setting to false disables vertical sync -// config.foregroundFPS = 0; // Setting to 0 disables foreground fps throttling -// config.backgroundFPS = 0; // Setting to 0 disables background fps throttling - - new LwjglApplication(new CRGame(), config); } } diff --git a/gradle.properties b/gradle.properties index fa55fd1..339fa15 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.daemon=true -org.gradle.jvmargs=-Xms128m -Xmx512m -org.gradle.configureondemand=true \ No newline at end of file +org.gradle.jvmargs=-Xms128m -Xmx1500m +org.gradle.configureondemand=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 13372ae..bafc550 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e1408d..0eb9142 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Nov 22 17:23:18 CET 2017 +#Fri Jun 09 23:06:52 EDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip diff --git a/gradlew b/gradlew index 9d82f78..4453cce 100644 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,12 +6,30 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,26 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -85,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -150,11 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save ( ) { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 8a0b282..f955316 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,10 +46,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +59,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line diff --git a/ios/Info.plist.xml b/ios/Info.plist.xml deleted file mode 100644 index 407bec7..0000000 --- a/ios/Info.plist.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleDisplayName - ${app.name} - CFBundleExecutable - ${app.executable} - CFBundleIdentifier - ${app.id} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${app.name} - CFBundlePackageType - APPL - CFBundleShortVersionString - ${app.version} - CFBundleSignature - ???? - CFBundleVersion - ${app.build} - LSRequiresIPhoneOS - - UIViewControllerBasedStatusBarAppearance - - UIStatusBarHidden - - UIDeviceFamily - - 1 - 2 - - UIRequiredDeviceCapabilities - - armv7 - opengles-2 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - CFBundleIcons - - CFBundlePrimaryIcon - - CFBundleIconFiles - - Icon - Icon-72 - - - - - diff --git a/ios/build.gradle b/ios/build.gradle deleted file mode 100644 index f6f257b..0000000 --- a/ios/build.gradle +++ /dev/null @@ -1,58 +0,0 @@ -sourceSets.main.java.srcDirs = [ "src/" ] - -sourceCompatibility = '1.7' -[compileJava, compileTestJava]*.options*.encoding = 'UTF-8' - -ext { - mainClassName = "de.samdev.colorrunner.IOSLauncher" -} - -// Extracts native libs (*.a) from the native-ios.jar and places them -// under build/libs/ios/. -task copyNatives << { - file("build/libs/ios/").mkdirs(); - configurations.natives.files.each { jar -> - def outputDir = null - if (jar.name.endsWith("natives-ios.jar")) outputDir = file("build/libs/ios") - if (outputDir != null) { - copy { - from zipTree(jar) - into outputDir - include "*.a" - } - } - } -} - -// Updates a robovm.xml file. -task updateRoboVMXML << { - def xml = file('robovm.xml') - - if (!xml.exists()) { - return - } - - // Find all native (*.a) libraries beneath libs - def libtree = fileTree(dir: 'build/libs', include: '**/*.a') - - def config = new groovy.util.XmlParser().parse(xml) - config.libs.each {libs -> - libs.children().clear() - libtree.each { File file -> - libs.appendNode('lib', 'build/libs/ios/' + file.getName()) - } - } - - def writer = new FileWriter(xml) - def printer = new XmlNodePrinter(new PrintWriter(writer)) - printer.setPreserveWhitespace true - printer.print(config) -} - -updateRoboVMXML.dependsOn copyNatives -build.dependsOn updateRoboVMXML - -launchIPhoneSimulator.dependsOn build -launchIPadSimulator.dependsOn build -launchIOSDevice.dependsOn build -createIPA.dependsOn build diff --git a/ios/data/Default-568h@2x.png b/ios/data/Default-568h@2x.png deleted file mode 100644 index 101752f..0000000 Binary files a/ios/data/Default-568h@2x.png and /dev/null differ diff --git a/ios/data/Default.png b/ios/data/Default.png deleted file mode 100644 index f1a5582..0000000 Binary files a/ios/data/Default.png and /dev/null differ diff --git a/ios/data/Default@2x.png b/ios/data/Default@2x.png deleted file mode 100644 index ca32f62..0000000 Binary files a/ios/data/Default@2x.png and /dev/null differ diff --git a/ios/data/Default@2x~ipad.png b/ios/data/Default@2x~ipad.png deleted file mode 100644 index bb77ef0..0000000 Binary files a/ios/data/Default@2x~ipad.png and /dev/null differ diff --git a/ios/data/Default~ipad.png b/ios/data/Default~ipad.png deleted file mode 100644 index 855e4f2..0000000 Binary files a/ios/data/Default~ipad.png and /dev/null differ diff --git a/ios/data/Icon-72.png b/ios/data/Icon-72.png deleted file mode 100644 index 8cc5759..0000000 Binary files a/ios/data/Icon-72.png and /dev/null differ diff --git a/ios/data/Icon-72@2x.png b/ios/data/Icon-72@2x.png deleted file mode 100644 index ec5e380..0000000 Binary files a/ios/data/Icon-72@2x.png and /dev/null differ diff --git a/ios/data/Icon.png b/ios/data/Icon.png deleted file mode 100644 index 7f4bf36..0000000 Binary files a/ios/data/Icon.png and /dev/null differ diff --git a/ios/data/Icon@2x.png b/ios/data/Icon@2x.png deleted file mode 100644 index eddc17c..0000000 Binary files a/ios/data/Icon@2x.png and /dev/null differ diff --git a/ios/robovm.properties b/ios/robovm.properties deleted file mode 100644 index 164f9e7..0000000 --- a/ios/robovm.properties +++ /dev/null @@ -1,6 +0,0 @@ -app.version=1.0 -app.id=de.samdev.colorrunner.IOSLauncher -app.mainclass=de.samdev.colorrunner.IOSLauncher -app.executable=IOSLauncher -app.build=1 -app.name=ColorRunner diff --git a/ios/robovm.xml b/ios/robovm.xml deleted file mode 100644 index 2bd9cb1..0000000 --- a/ios/robovm.xml +++ /dev/null @@ -1,49 +0,0 @@ - - ${app.executable} - ${app.mainclass} - ios - thumbv7 - ios - Info.plist.xml - - - ../android/assets - - ** - - true - - - data - - - - com.badlogic.gdx.scenes.scene2d.ui.* - com.badlogic.gdx.physics.bullet.** - com.android.okhttp.HttpHandler - com.android.okhttp.HttpsHandler - com.android.org.conscrypt.** - com.android.org.bouncycastle.jce.provider.BouncyCastleProvider - com.android.org.bouncycastle.jcajce.provider.keystore.BC$Mappings - com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi - com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi$Std - com.android.org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi - com.android.org.bouncycastle.crypto.digests.AndroidDigestFactoryOpenSSL - org.apache.harmony.security.provider.cert.DRLCertFactory - org.apache.harmony.security.provider.crypto.CryptoProvider - - - build/libs/ios/libgdx-box2d.a - build/libs/ios/libgdx.a - build/libs/ios/libObjectAL.a - - - UIKit - OpenGLES - QuartzCore - CoreGraphics - OpenAL - AudioToolbox - AVFoundation - - diff --git a/ios/src/de/samdev/colorrunner/IOSLauncher.java b/ios/src/de/samdev/colorrunner/IOSLauncher.java deleted file mode 100644 index df8e335..0000000 --- a/ios/src/de/samdev/colorrunner/IOSLauncher.java +++ /dev/null @@ -1,22 +0,0 @@ -package de.samdev.colorrunner; - -import org.robovm.apple.foundation.NSAutoreleasePool; -import org.robovm.apple.uikit.UIApplication; - -import com.badlogic.gdx.backends.iosrobovm.IOSApplication; -import com.badlogic.gdx.backends.iosrobovm.IOSApplicationConfiguration; -import de.samdev.colorrunner.CRGame; - -public class IOSLauncher extends IOSApplication.Delegate { - @Override - protected IOSApplication createApplication() { - IOSApplicationConfiguration config = new IOSApplicationConfiguration(); - return new IOSApplication(new CRGame(), config); - } - - public static void main(String[] argv) { - NSAutoreleasePool pool = new NSAutoreleasePool(); - UIApplication.main(argv, null, IOSLauncher.class); - pool.close(); - } -} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 3efd058..77ae463 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include 'desktop', 'android', 'core', 'ios' \ No newline at end of file +include 'desktop', 'android', 'core' \ No newline at end of file