diff --git a/.gitignore b/.gitignore index 2668f00..3d9d087 100644 --- a/.gitignore +++ b/.gitignore @@ -5,59 +5,110 @@ *.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-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/ *.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/ + +/build/ +/android/build/ +/core/build/ +/desktop/build/ +/html/build/ +/ios/build/ + +/nbbuild/ +/android/nbbuild/ +/core/nbbuild/ +/desktop/nbbuild/ +/html/nbbuild/ +/ios/nbbuild/ + +/dist/ +/android/dist/ +/core/dist/ +/desktop/dist/ +/html/dist/ +/ios/dist/ + +/nbdist/ +/android/nbdist/ +/core/nbdist/ +/desktop/nbdist/ +/html/nbdist/ +/ios/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/ ## OS Specific .DS_Store +Thumbs.db + +## iOS +/ios/xcode/*.xcodeproj/* +!/ios/xcode/*.xcodeproj/xcshareddata +!/ios/xcode/*.xcodeproj/project.pbxproj +/ios/xcode/native/ +/ios/IOSLauncher.app +/ios/IOSLauncher.app.dSYM diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index 785ae7a..5b25a44 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,19 +1,24 @@ + xmlns:tools="http://schemas.android.com/tools"> + + + android:theme="@style/AppTheme" + tools:ignore="UnusedAttribute"> + android:configChanges="keyboard|keyboardHidden|navigation|orientation|screenSize|screenLayout" + android:exported="true"> diff --git a/android/build.gradle b/android/build.gradle index 3a236bd..347a628 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,6 +1,7 @@ android { - buildToolsVersion "29.0.2" - compileSdkVersion 29 + namespace "com.senegas.kickoff" + buildToolsVersion "33.0.2" + compileSdkVersion 33 sourceSets { main { manifest.srcFile 'AndroidManifest.xml' @@ -8,7 +9,7 @@ android { aidl.srcDirs = ['src'] renderscript.srcDirs = ['src'] res.srcDirs = ['res'] - assets.srcDirs = ['assets'] + assets.srcDirs = ['../assets'] jniLibs.srcDirs = ['libs'] } @@ -18,14 +19,14 @@ android { } defaultConfig { applicationId "com.senegas.kickoff" - minSdkVersion 14 - targetSdkVersion 29 + minSdkVersion 19 + targetSdkVersion 33 versionCode 1 versionName "1.0" } buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } @@ -35,22 +36,20 @@ android { // 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 { +tasks.register('copyAndroidNatives') { doFirst { - 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 -> + configurations.natives.copy().files.each { jar -> def outputDir = null 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) { + 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 { from zipTree(jar) into outputDir @@ -61,13 +60,11 @@ task copyAndroidNatives { } } -tasks.whenTaskAdded { packageTask -> - if (packageTask.name.contains("package")) { - packageTask.dependsOn 'copyAndroidNatives' - } +tasks.matching { it.name.contains("merge") && it.name.contains("JniLibFolders") }.configureEach { packageTask -> + packageTask.dependsOn 'copyAndroidNatives' } -task run(type: Exec) { +tasks.register('run', Exec) { def path def localProperties = project.file("../local.properties") if (localProperties.exists()) { @@ -86,7 +83,7 @@ task run(type: Exec) { } def adb = path + "/platform-tools/adb" - commandLine "$adb", 'shell', 'am', 'start', '-n', 'com.senegas.kickoff.android/com.senegas.kickoff.android.AndroidLauncher' + commandLine "$adb", 'shell', 'am', 'start', '-n', 'com.senegas.kickoff/com.senegas.kickoff.AndroidLauncher' } -eclipse.project.name = appName + "-android" \ No newline at end of file +eclipse.project.name = appName + "-android" 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-rules.pro b/android/proguard-rules.pro index b166b1e..63c1adb 100644 --- a/android/proguard-rules.pro +++ b/android/proguard-rules.pro @@ -21,19 +21,12 @@ -verbose --dontwarn android.support.** -dontwarn com.badlogic.gdx.backends.android.AndroidFragmentApplication --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 +# Required if using Gdx-Controllers extension -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); -} - +# Required if using Box2D extension -keepclassmembers class com.badlogic.gdx.physics.box2d.World { boolean contactFilter(long, long); void beginContact(long); diff --git a/android/res/drawable-anydpi-v26/ic_launcher.xml b/android/res/drawable-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6c7313a --- /dev/null +++ b/android/res/drawable-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/android/res/drawable-anydpi-v26/ic_launcher_foreground.xml b/android/res/drawable-anydpi-v26/ic_launcher_foreground.xml new file mode 100644 index 0000000..5916ee8 --- /dev/null +++ b/android/res/drawable-anydpi-v26/ic_launcher_foreground.xml @@ -0,0 +1,40 @@ + + + + + + + + + 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-v21/styles.xml b/android/res/values-v21/styles.xml new file mode 100644 index 0000000..fcc6217 --- /dev/null +++ b/android/res/values-v21/styles.xml @@ -0,0 +1,6 @@ + + + + diff --git a/android/res/values/color.xml b/android/res/values/color.xml new file mode 100644 index 0000000..933353e --- /dev/null +++ b/android/res/values/color.xml @@ -0,0 +1,4 @@ + + + #FFFFFFFF + diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml index 3f00fc5..77377af 100644 --- a/android/res/values/styles.xml +++ b/android/res/values/styles.xml @@ -1,12 +1,6 @@ + - - - diff --git a/android/src/com/senegas/kickoff/android/AndroidLauncher.java b/android/src/com/senegas/kickoff/AndroidLauncher.java similarity index 92% rename from android/src/com/senegas/kickoff/android/AndroidLauncher.java rename to android/src/com/senegas/kickoff/AndroidLauncher.java index 7ca5c18..fababf4 100644 --- a/android/src/com/senegas/kickoff/android/AndroidLauncher.java +++ b/android/src/com/senegas/kickoff/AndroidLauncher.java @@ -1,4 +1,4 @@ -package com.senegas.kickoff.android; +package com.senegas.kickoff; import android.os.Bundle; diff --git a/android/assets/badlogic.jpg b/assets/badlogic.jpg similarity index 100% rename from android/assets/badlogic.jpg rename to assets/badlogic.jpg diff --git a/android/assets/entities/ball.png b/assets/entities/ball.png similarity index 100% rename from android/assets/entities/ball.png rename to assets/entities/ball.png diff --git a/android/assets/entities/player.png b/assets/entities/player.png similarity index 100% rename from android/assets/entities/player.png rename to assets/entities/player.png diff --git a/android/assets/entities/style1a.png b/assets/entities/style1a.png similarity index 100% rename from android/assets/entities/style1a.png rename to assets/entities/style1a.png diff --git a/android/assets/entities/style1b.png b/assets/entities/style1b.png similarity index 100% rename from android/assets/entities/style1b.png rename to assets/entities/style1b.png diff --git a/android/assets/font/black.fnt b/assets/font/black.fnt similarity index 99% rename from android/assets/font/black.fnt rename to assets/font/black.fnt index b62cc7d..14dcf40 100644 --- a/android/assets/font/black.fnt +++ b/assets/font/black.fnt @@ -1,201 +1,201 @@ -info face="Amiga Forever Pro" size=32 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=32 base=24 scaleW=256 scaleH=256 pages=1 packed=0 alphaChnl=0 redChnl=3 greenChnl=3 blueChnl=3 -page id=0 file="black_0.png" -chars count=197 -char id=32 x=251 y=0 width=3 height=1 xoffset=-1 yoffset=31 xadvance=21 page=0 chnl=15 -char id=33 x=98 y=182 width=6 height=18 xoffset=5 yoffset=6 xadvance=16 page=0 chnl=15 -char id=34 x=97 y=247 width=14 height=5 xoffset=2 yoffset=6 xadvance=18 page=0 chnl=15 -char id=35 x=21 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 -char id=36 x=165 y=162 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 -char id=37 x=154 y=181 width=20 height=16 xoffset=2 yoffset=8 xadvance=24 page=0 chnl=15 -char id=38 x=0 y=23 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=39 x=10 y=247 width=9 height=8 xoffset=2 yoffset=6 xadvance=13 page=0 chnl=15 -char id=40 x=183 y=142 width=11 height=19 xoffset=5 yoffset=5 xadvance=21 page=0 chnl=15 -char id=41 x=195 y=142 width=11 height=19 xoffset=5 yoffset=5 xadvance=21 page=0 chnl=15 -char id=42 x=148 y=199 width=22 height=14 xoffset=2 yoffset=8 xadvance=26 page=0 chnl=15 -char id=43 x=0 y=233 width=17 height=13 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=44 x=20 y=247 width=9 height=8 xoffset=5 yoffset=19 xadvance=21 page=0 chnl=15 -char id=45 x=159 y=244 width=17 height=3 xoffset=2 yoffset=13 xadvance=21 page=0 chnl=15 -char id=46 x=112 y=247 width=7 height=5 xoffset=7 yoffset=19 xadvance=21 page=0 chnl=15 -char id=47 x=69 y=23 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=48 x=216 y=61 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=49 x=69 y=182 width=12 height=18 xoffset=2 yoffset=6 xadvance=16 page=0 chnl=15 -char id=50 x=0 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=51 x=18 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=52 x=63 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 -char id=53 x=54 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=54 x=72 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=55 x=90 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=56 x=218 y=40 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=57 x=108 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=58 x=123 y=200 width=6 height=16 xoffset=5 yoffset=8 xadvance=16 page=0 chnl=15 -char id=59 x=217 y=141 width=9 height=19 xoffset=5 yoffset=8 xadvance=18 page=0 chnl=15 -char id=60 x=238 y=197 width=17 height=14 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=61 x=229 y=227 width=17 height=8 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=62 x=18 y=218 width=17 height=14 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=63 x=216 y=81 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=64 x=197 y=41 width=20 height=19 xoffset=2 yoffset=5 xadvance=24 page=0 chnl=15 -char id=65 x=234 y=80 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=66 x=0 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=67 x=18 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=68 x=36 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=69 x=54 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=70 x=72 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=71 x=90 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=72 x=108 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=73 x=170 y=142 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=74 x=18 y=182 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 -char id=75 x=176 y=42 width=20 height=19 xoffset=2 yoffset=5 xadvance=24 page=0 chnl=15 -char id=76 x=183 y=162 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 -char id=77 x=126 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 -char id=78 x=84 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 -char id=79 x=216 y=101 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=80 x=18 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=81 x=92 y=43 width=20 height=19 xoffset=2 yoffset=5 xadvance=24 page=0 chnl=15 -char id=82 x=0 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=83 x=18 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=84 x=36 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=85 x=54 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=86 x=219 y=161 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 -char id=87 x=0 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 -char id=88 x=230 y=20 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=89 x=0 y=43 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=90 x=113 y=43 width=20 height=19 xoffset=2 yoffset=5 xadvance=24 page=0 chnl=15 -char id=91 x=144 y=142 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=92 x=46 y=43 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=93 x=131 y=143 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=94 x=195 y=227 width=20 height=10 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 -char id=95 x=120 y=247 width=20 height=3 xoffset=2 yoffset=24 xadvance=24 page=0 chnl=15 -char id=96 x=0 y=247 width=9 height=8 xoffset=2 yoffset=6 xadvance=13 page=0 chnl=15 -char id=97 x=144 y=230 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=98 x=147 y=162 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 -char id=99 x=180 y=228 width=14 height=13 xoffset=2 yoffset=11 xadvance=18 page=0 chnl=15 -char id=100 x=0 y=182 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 -char id=101 x=126 y=232 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=102 x=90 y=143 width=14 height=19 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 -char id=103 x=214 y=181 width=17 height=16 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=104 x=36 y=182 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 -char id=105 x=227 y=141 width=9 height=19 xoffset=2 yoffset=5 xadvance=13 page=0 chnl=15 -char id=106 x=100 y=0 width=14 height=22 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 -char id=107 x=237 y=160 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 -char id=108 x=245 y=140 width=9 height=18 xoffset=2 yoffset=6 xadvance=13 page=0 chnl=15 -char id=109 x=202 y=213 width=20 height=13 xoffset=2 yoffset=11 xadvance=24 page=0 chnl=15 -char id=110 x=18 y=233 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=111 x=36 y=233 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=112 x=18 y=201 width=17 height=16 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=113 x=0 y=201 width=17 height=16 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=114 x=162 y=228 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=115 x=36 y=218 width=17 height=14 xoffset=2 yoffset=10 xadvance=21 page=0 chnl=15 -char id=116 x=54 y=182 width=14 height=18 xoffset=2 yoffset=6 xadvance=18 page=0 chnl=15 -char id=117 x=54 y=233 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=118 x=72 y=233 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=119 x=223 y=213 width=20 height=13 xoffset=2 yoffset=11 xadvance=24 page=0 chnl=15 -char id=120 x=181 y=213 width=20 height=13 xoffset=2 yoffset=11 xadvance=24 page=0 chnl=15 -char id=121 x=54 y=201 width=17 height=16 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=122 x=108 y=233 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=123 x=72 y=143 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=124 x=82 y=182 width=7 height=18 xoffset=2 yoffset=6 xadvance=11 page=0 chnl=15 -char id=125 x=236 y=40 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=126 x=30 y=247 width=23 height=6 xoffset=-1 yoffset=5 xadvance=21 page=0 chnl=15 -char id=161 x=237 y=140 width=7 height=19 xoffset=2 yoffset=5 xadvance=11 page=0 chnl=15 -char id=162 x=90 y=233 width=17 height=13 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=163 x=0 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=164 x=0 y=218 width=17 height=14 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=165 x=46 y=23 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=166 x=90 y=182 width=7 height=18 xoffset=2 yoffset=6 xadvance=11 page=0 chnl=15 -char id=167 x=36 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=168 x=79 y=247 width=17 height=5 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 -char id=169 x=23 y=23 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=170 x=87 y=218 width=14 height=14 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 -char id=171 x=194 y=198 width=22 height=14 xoffset=2 yoffset=8 xadvance=26 page=0 chnl=15 -char id=172 x=54 y=247 width=14 height=6 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 -char id=173 x=177 y=242 width=17 height=3 xoffset=2 yoffset=13 xadvance=21 page=0 chnl=15 -char id=174 x=0 y=0 width=22 height=22 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=175 x=141 y=246 width=17 height=3 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=177 x=201 y=162 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 -char id=178 x=117 y=217 width=14 height=14 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 -char id=179 x=102 y=218 width=14 height=14 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 -char id=180 x=216 y=227 width=12 height=9 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=181 x=175 y=181 width=20 height=16 xoffset=2 yoffset=11 xadvance=24 page=0 chnl=15 -char id=182 x=54 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=183 x=247 y=226 width=7 height=5 xoffset=2 yoffset=11 xadvance=11 page=0 chnl=15 -char id=184 x=69 y=247 width=9 height=6 xoffset=2 yoffset=21 xadvance=13 page=0 chnl=15 -char id=185 x=244 y=212 width=9 height=13 xoffset=2 yoffset=6 xadvance=13 page=0 chnl=15 -char id=186 x=72 y=218 width=14 height=14 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 -char id=187 x=171 y=198 width=22 height=14 xoffset=2 yoffset=8 xadvance=26 page=0 chnl=15 -char id=188 x=139 y=0 width=22 height=21 xoffset=2 yoffset=6 xadvance=26 page=0 chnl=15 -char id=189 x=162 y=0 width=20 height=21 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 -char id=190 x=23 y=0 width=22 height=22 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=191 x=72 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=192 x=90 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=193 x=108 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=194 x=126 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=195 x=228 y=0 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=196 x=144 y=62 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=197 x=162 y=62 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=198 x=205 y=0 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=199 x=64 y=0 width=17 height=22 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=200 x=180 y=62 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=201 x=198 y=61 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=202 x=234 y=60 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=203 x=36 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=204 x=118 y=143 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=205 x=105 y=143 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=206 x=126 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=207 x=144 y=82 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=208 x=134 y=42 width=20 height=19 xoffset=2 yoffset=5 xadvance=24 page=0 chnl=15 -char id=209 x=92 y=23 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=210 x=162 y=82 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=211 x=180 y=82 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=212 x=198 y=81 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=213 x=69 y=43 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=214 x=23 y=43 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=215 x=217 y=198 width=20 height=14 xoffset=2 yoffset=8 xadvance=24 page=0 chnl=15 -char id=216 x=207 y=20 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=217 x=126 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=218 x=144 y=102 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=219 x=162 y=102 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=220 x=180 y=102 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=221 x=184 y=21 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=222 x=42 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 -char id=223 x=82 y=0 width=17 height=22 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=224 x=198 y=101 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=225 x=234 y=100 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=226 x=72 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=227 x=161 y=22 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=228 x=90 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=229 x=108 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=230 x=158 y=214 width=22 height=13 xoffset=2 yoffset=11 xadvance=26 page=0 chnl=15 -char id=231 x=108 y=200 width=14 height=16 xoffset=2 yoffset=11 xadvance=18 page=0 chnl=15 -char id=232 x=126 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=233 x=144 y=122 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=234 x=162 y=122 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=235 x=180 y=122 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=236 x=157 y=142 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=237 x=207 y=141 width=9 height=19 xoffset=2 yoffset=5 xadvance=13 page=0 chnl=15 -char id=238 x=198 y=121 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=239 x=90 y=201 width=17 height=16 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=240 x=105 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 -char id=241 x=138 y=22 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=242 x=72 y=201 width=17 height=16 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=243 x=36 y=201 width=17 height=16 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=244 x=216 y=121 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=245 x=115 y=22 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=246 x=232 y=180 width=17 height=16 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=247 x=54 y=218 width=17 height=14 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=248 x=155 y=42 width=20 height=19 xoffset=2 yoffset=8 xadvance=24 page=0 chnl=15 -char id=249 x=234 y=120 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=250 x=0 y=143 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=251 x=18 y=143 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=252 x=196 y=181 width=17 height=16 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=253 x=46 y=0 width=17 height=22 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=254 x=36 y=143 width=17 height=19 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=255 x=54 y=143 width=17 height=19 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=8218 x=115 y=0 width=23 height=21 xoffset=-1 yoffset=6 xadvance=21 page=0 chnl=15 -char id=8222 x=105 y=182 width=20 height=17 xoffset=2 yoffset=7 xadvance=21 page=0 chnl=15 -char id=8224 x=183 y=0 width=21 height=20 xoffset=2 yoffset=4 xadvance=25 page=0 chnl=15 -char id=8225 x=130 y=199 width=17 height=15 xoffset=-1 yoffset=9 xadvance=16 page=0 chnl=15 -char id=8230 x=195 y=238 width=9 height=3 xoffset=13 yoffset=16 xadvance=0 page=0 chnl=15 -char id=8240 x=126 y=182 width=27 height=16 xoffset=2 yoffset=8 xadvance=31 page=0 chnl=15 -char id=8249 x=145 y=215 width=12 height=14 xoffset=2 yoffset=8 xadvance=16 page=0 chnl=15 -char id=8250 x=132 y=215 width=12 height=14 xoffset=2 yoffset=8 xadvance=16 page=0 chnl=15 +info face="Amiga Forever Pro" size=32 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=32 base=24 scaleW=256 scaleH=256 pages=1 packed=0 alphaChnl=0 redChnl=3 greenChnl=3 blueChnl=3 +page id=0 file="black_0.png" +chars count=197 +char id=32 x=251 y=0 width=3 height=1 xoffset=-1 yoffset=31 xadvance=21 page=0 chnl=15 +char id=33 x=98 y=182 width=6 height=18 xoffset=5 yoffset=6 xadvance=16 page=0 chnl=15 +char id=34 x=97 y=247 width=14 height=5 xoffset=2 yoffset=6 xadvance=18 page=0 chnl=15 +char id=35 x=21 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 +char id=36 x=165 y=162 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 +char id=37 x=154 y=181 width=20 height=16 xoffset=2 yoffset=8 xadvance=24 page=0 chnl=15 +char id=38 x=0 y=23 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=39 x=10 y=247 width=9 height=8 xoffset=2 yoffset=6 xadvance=13 page=0 chnl=15 +char id=40 x=183 y=142 width=11 height=19 xoffset=5 yoffset=5 xadvance=21 page=0 chnl=15 +char id=41 x=195 y=142 width=11 height=19 xoffset=5 yoffset=5 xadvance=21 page=0 chnl=15 +char id=42 x=148 y=199 width=22 height=14 xoffset=2 yoffset=8 xadvance=26 page=0 chnl=15 +char id=43 x=0 y=233 width=17 height=13 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=44 x=20 y=247 width=9 height=8 xoffset=5 yoffset=19 xadvance=21 page=0 chnl=15 +char id=45 x=159 y=244 width=17 height=3 xoffset=2 yoffset=13 xadvance=21 page=0 chnl=15 +char id=46 x=112 y=247 width=7 height=5 xoffset=7 yoffset=19 xadvance=21 page=0 chnl=15 +char id=47 x=69 y=23 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=48 x=216 y=61 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=49 x=69 y=182 width=12 height=18 xoffset=2 yoffset=6 xadvance=16 page=0 chnl=15 +char id=50 x=0 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=51 x=18 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=52 x=63 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 +char id=53 x=54 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=54 x=72 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=55 x=90 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=56 x=218 y=40 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=57 x=108 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=58 x=123 y=200 width=6 height=16 xoffset=5 yoffset=8 xadvance=16 page=0 chnl=15 +char id=59 x=217 y=141 width=9 height=19 xoffset=5 yoffset=8 xadvance=18 page=0 chnl=15 +char id=60 x=238 y=197 width=17 height=14 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=61 x=229 y=227 width=17 height=8 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=62 x=18 y=218 width=17 height=14 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=63 x=216 y=81 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=64 x=197 y=41 width=20 height=19 xoffset=2 yoffset=5 xadvance=24 page=0 chnl=15 +char id=65 x=234 y=80 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=66 x=0 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=67 x=18 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=68 x=36 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=69 x=54 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=70 x=72 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=71 x=90 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=72 x=108 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=73 x=170 y=142 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 +char id=74 x=18 y=182 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 +char id=75 x=176 y=42 width=20 height=19 xoffset=2 yoffset=5 xadvance=24 page=0 chnl=15 +char id=76 x=183 y=162 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 +char id=77 x=126 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 +char id=78 x=84 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 +char id=79 x=216 y=101 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=80 x=18 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=81 x=92 y=43 width=20 height=19 xoffset=2 yoffset=5 xadvance=24 page=0 chnl=15 +char id=82 x=0 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=83 x=18 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=84 x=36 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=85 x=54 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=86 x=219 y=161 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 +char id=87 x=0 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 +char id=88 x=230 y=20 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=89 x=0 y=43 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=90 x=113 y=43 width=20 height=19 xoffset=2 yoffset=5 xadvance=24 page=0 chnl=15 +char id=91 x=144 y=142 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 +char id=92 x=46 y=43 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=93 x=131 y=143 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 +char id=94 x=195 y=227 width=20 height=10 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 +char id=95 x=120 y=247 width=20 height=3 xoffset=2 yoffset=24 xadvance=24 page=0 chnl=15 +char id=96 x=0 y=247 width=9 height=8 xoffset=2 yoffset=6 xadvance=13 page=0 chnl=15 +char id=97 x=144 y=230 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=98 x=147 y=162 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 +char id=99 x=180 y=228 width=14 height=13 xoffset=2 yoffset=11 xadvance=18 page=0 chnl=15 +char id=100 x=0 y=182 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 +char id=101 x=126 y=232 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=102 x=90 y=143 width=14 height=19 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 +char id=103 x=214 y=181 width=17 height=16 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=104 x=36 y=182 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 +char id=105 x=227 y=141 width=9 height=19 xoffset=2 yoffset=5 xadvance=13 page=0 chnl=15 +char id=106 x=100 y=0 width=14 height=22 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 +char id=107 x=237 y=160 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 +char id=108 x=245 y=140 width=9 height=18 xoffset=2 yoffset=6 xadvance=13 page=0 chnl=15 +char id=109 x=202 y=213 width=20 height=13 xoffset=2 yoffset=11 xadvance=24 page=0 chnl=15 +char id=110 x=18 y=233 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=111 x=36 y=233 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=112 x=18 y=201 width=17 height=16 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=113 x=0 y=201 width=17 height=16 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=114 x=162 y=228 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=115 x=36 y=218 width=17 height=14 xoffset=2 yoffset=10 xadvance=21 page=0 chnl=15 +char id=116 x=54 y=182 width=14 height=18 xoffset=2 yoffset=6 xadvance=18 page=0 chnl=15 +char id=117 x=54 y=233 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=118 x=72 y=233 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=119 x=223 y=213 width=20 height=13 xoffset=2 yoffset=11 xadvance=24 page=0 chnl=15 +char id=120 x=181 y=213 width=20 height=13 xoffset=2 yoffset=11 xadvance=24 page=0 chnl=15 +char id=121 x=54 y=201 width=17 height=16 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=122 x=108 y=233 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=123 x=72 y=143 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=124 x=82 y=182 width=7 height=18 xoffset=2 yoffset=6 xadvance=11 page=0 chnl=15 +char id=125 x=236 y=40 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=126 x=30 y=247 width=23 height=6 xoffset=-1 yoffset=5 xadvance=21 page=0 chnl=15 +char id=161 x=237 y=140 width=7 height=19 xoffset=2 yoffset=5 xadvance=11 page=0 chnl=15 +char id=162 x=90 y=233 width=17 height=13 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=163 x=0 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=164 x=0 y=218 width=17 height=14 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=165 x=46 y=23 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=166 x=90 y=182 width=7 height=18 xoffset=2 yoffset=6 xadvance=11 page=0 chnl=15 +char id=167 x=36 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=168 x=79 y=247 width=17 height=5 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 +char id=169 x=23 y=23 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=170 x=87 y=218 width=14 height=14 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 +char id=171 x=194 y=198 width=22 height=14 xoffset=2 yoffset=8 xadvance=26 page=0 chnl=15 +char id=172 x=54 y=247 width=14 height=6 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 +char id=173 x=177 y=242 width=17 height=3 xoffset=2 yoffset=13 xadvance=21 page=0 chnl=15 +char id=174 x=0 y=0 width=22 height=22 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=175 x=141 y=246 width=17 height=3 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=177 x=201 y=162 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 +char id=178 x=117 y=217 width=14 height=14 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 +char id=179 x=102 y=218 width=14 height=14 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 +char id=180 x=216 y=227 width=12 height=9 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 +char id=181 x=175 y=181 width=20 height=16 xoffset=2 yoffset=11 xadvance=24 page=0 chnl=15 +char id=182 x=54 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=183 x=247 y=226 width=7 height=5 xoffset=2 yoffset=11 xadvance=11 page=0 chnl=15 +char id=184 x=69 y=247 width=9 height=6 xoffset=2 yoffset=21 xadvance=13 page=0 chnl=15 +char id=185 x=244 y=212 width=9 height=13 xoffset=2 yoffset=6 xadvance=13 page=0 chnl=15 +char id=186 x=72 y=218 width=14 height=14 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 +char id=187 x=171 y=198 width=22 height=14 xoffset=2 yoffset=8 xadvance=26 page=0 chnl=15 +char id=188 x=139 y=0 width=22 height=21 xoffset=2 yoffset=6 xadvance=26 page=0 chnl=15 +char id=189 x=162 y=0 width=20 height=21 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 +char id=190 x=23 y=0 width=22 height=22 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=191 x=72 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=192 x=90 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=193 x=108 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=194 x=126 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=195 x=228 y=0 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=196 x=144 y=62 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=197 x=162 y=62 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=198 x=205 y=0 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=199 x=64 y=0 width=17 height=22 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=200 x=180 y=62 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=201 x=198 y=61 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=202 x=234 y=60 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=203 x=36 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=204 x=118 y=143 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 +char id=205 x=105 y=143 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 +char id=206 x=126 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=207 x=144 y=82 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=208 x=134 y=42 width=20 height=19 xoffset=2 yoffset=5 xadvance=24 page=0 chnl=15 +char id=209 x=92 y=23 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=210 x=162 y=82 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=211 x=180 y=82 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=212 x=198 y=81 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=213 x=69 y=43 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=214 x=23 y=43 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=215 x=217 y=198 width=20 height=14 xoffset=2 yoffset=8 xadvance=24 page=0 chnl=15 +char id=216 x=207 y=20 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=217 x=126 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=218 x=144 y=102 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=219 x=162 y=102 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=220 x=180 y=102 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=221 x=184 y=21 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=222 x=42 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 +char id=223 x=82 y=0 width=17 height=22 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=224 x=198 y=101 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=225 x=234 y=100 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=226 x=72 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=227 x=161 y=22 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=228 x=90 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=229 x=108 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=230 x=158 y=214 width=22 height=13 xoffset=2 yoffset=11 xadvance=26 page=0 chnl=15 +char id=231 x=108 y=200 width=14 height=16 xoffset=2 yoffset=11 xadvance=18 page=0 chnl=15 +char id=232 x=126 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=233 x=144 y=122 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=234 x=162 y=122 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=235 x=180 y=122 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=236 x=157 y=142 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 +char id=237 x=207 y=141 width=9 height=19 xoffset=2 yoffset=5 xadvance=13 page=0 chnl=15 +char id=238 x=198 y=121 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=239 x=90 y=201 width=17 height=16 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=240 x=105 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 +char id=241 x=138 y=22 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=242 x=72 y=201 width=17 height=16 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=243 x=36 y=201 width=17 height=16 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=244 x=216 y=121 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=245 x=115 y=22 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=246 x=232 y=180 width=17 height=16 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=247 x=54 y=218 width=17 height=14 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=248 x=155 y=42 width=20 height=19 xoffset=2 yoffset=8 xadvance=24 page=0 chnl=15 +char id=249 x=234 y=120 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=250 x=0 y=143 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=251 x=18 y=143 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=252 x=196 y=181 width=17 height=16 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=253 x=46 y=0 width=17 height=22 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=254 x=36 y=143 width=17 height=19 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=255 x=54 y=143 width=17 height=19 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=8218 x=115 y=0 width=23 height=21 xoffset=-1 yoffset=6 xadvance=21 page=0 chnl=15 +char id=8222 x=105 y=182 width=20 height=17 xoffset=2 yoffset=7 xadvance=21 page=0 chnl=15 +char id=8224 x=183 y=0 width=21 height=20 xoffset=2 yoffset=4 xadvance=25 page=0 chnl=15 +char id=8225 x=130 y=199 width=17 height=15 xoffset=-1 yoffset=9 xadvance=16 page=0 chnl=15 +char id=8230 x=195 y=238 width=9 height=3 xoffset=13 yoffset=16 xadvance=0 page=0 chnl=15 +char id=8240 x=126 y=182 width=27 height=16 xoffset=2 yoffset=8 xadvance=31 page=0 chnl=15 +char id=8249 x=145 y=215 width=12 height=14 xoffset=2 yoffset=8 xadvance=16 page=0 chnl=15 +char id=8250 x=132 y=215 width=12 height=14 xoffset=2 yoffset=8 xadvance=16 page=0 chnl=15 diff --git a/android/assets/font/black_0.png b/assets/font/black_0.png similarity index 100% rename from android/assets/font/black_0.png rename to assets/font/black_0.png diff --git a/android/assets/font/white.fnt b/assets/font/white.fnt similarity index 99% rename from android/assets/font/white.fnt rename to assets/font/white.fnt index 2c6468c..75bc657 100644 --- a/android/assets/font/white.fnt +++ b/assets/font/white.fnt @@ -1,201 +1,201 @@ -info face="Amiga Forever Pro" size=32 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=32 base=24 scaleW=256 scaleH=256 pages=1 packed=0 alphaChnl=0 redChnl=4 greenChnl=4 blueChnl=4 -page id=0 file="white_0.png" -chars count=197 -char id=32 x=251 y=0 width=3 height=1 xoffset=-1 yoffset=31 xadvance=21 page=0 chnl=15 -char id=33 x=98 y=182 width=6 height=18 xoffset=5 yoffset=6 xadvance=16 page=0 chnl=15 -char id=34 x=97 y=247 width=14 height=5 xoffset=2 yoffset=6 xadvance=18 page=0 chnl=15 -char id=35 x=21 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 -char id=36 x=165 y=162 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 -char id=37 x=154 y=181 width=20 height=16 xoffset=2 yoffset=8 xadvance=24 page=0 chnl=15 -char id=38 x=0 y=23 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=39 x=10 y=247 width=9 height=8 xoffset=2 yoffset=6 xadvance=13 page=0 chnl=15 -char id=40 x=183 y=142 width=11 height=19 xoffset=5 yoffset=5 xadvance=21 page=0 chnl=15 -char id=41 x=195 y=142 width=11 height=19 xoffset=5 yoffset=5 xadvance=21 page=0 chnl=15 -char id=42 x=148 y=199 width=22 height=14 xoffset=2 yoffset=8 xadvance=26 page=0 chnl=15 -char id=43 x=0 y=233 width=17 height=13 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=44 x=20 y=247 width=9 height=8 xoffset=5 yoffset=19 xadvance=21 page=0 chnl=15 -char id=45 x=159 y=244 width=17 height=3 xoffset=2 yoffset=13 xadvance=21 page=0 chnl=15 -char id=46 x=112 y=247 width=7 height=5 xoffset=7 yoffset=19 xadvance=21 page=0 chnl=15 -char id=47 x=69 y=23 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=48 x=216 y=61 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=49 x=69 y=182 width=12 height=18 xoffset=2 yoffset=6 xadvance=16 page=0 chnl=15 -char id=50 x=0 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=51 x=18 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=52 x=63 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 -char id=53 x=54 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=54 x=72 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=55 x=90 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=56 x=218 y=40 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=57 x=108 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=58 x=123 y=200 width=6 height=16 xoffset=5 yoffset=8 xadvance=16 page=0 chnl=15 -char id=59 x=217 y=141 width=9 height=19 xoffset=5 yoffset=8 xadvance=18 page=0 chnl=15 -char id=60 x=238 y=197 width=17 height=14 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=61 x=229 y=227 width=17 height=8 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=62 x=18 y=218 width=17 height=14 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=63 x=216 y=81 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=64 x=197 y=41 width=20 height=19 xoffset=2 yoffset=5 xadvance=24 page=0 chnl=15 -char id=65 x=234 y=80 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=66 x=0 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=67 x=18 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=68 x=36 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=69 x=54 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=70 x=72 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=71 x=90 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=72 x=108 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=73 x=170 y=142 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=74 x=18 y=182 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 -char id=75 x=176 y=42 width=20 height=19 xoffset=2 yoffset=5 xadvance=24 page=0 chnl=15 -char id=76 x=183 y=162 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 -char id=77 x=126 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 -char id=78 x=84 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 -char id=79 x=216 y=101 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=80 x=18 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=81 x=92 y=43 width=20 height=19 xoffset=2 yoffset=5 xadvance=24 page=0 chnl=15 -char id=82 x=0 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=83 x=18 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=84 x=36 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=85 x=54 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=86 x=219 y=161 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 -char id=87 x=0 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 -char id=88 x=230 y=20 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=89 x=0 y=43 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=90 x=113 y=43 width=20 height=19 xoffset=2 yoffset=5 xadvance=24 page=0 chnl=15 -char id=91 x=144 y=142 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=92 x=46 y=43 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=93 x=131 y=143 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=94 x=195 y=227 width=20 height=10 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 -char id=95 x=120 y=247 width=20 height=3 xoffset=2 yoffset=24 xadvance=24 page=0 chnl=15 -char id=96 x=0 y=247 width=9 height=8 xoffset=2 yoffset=6 xadvance=13 page=0 chnl=15 -char id=97 x=144 y=230 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=98 x=147 y=162 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 -char id=99 x=180 y=228 width=14 height=13 xoffset=2 yoffset=11 xadvance=18 page=0 chnl=15 -char id=100 x=0 y=182 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 -char id=101 x=126 y=232 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=102 x=90 y=143 width=14 height=19 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 -char id=103 x=214 y=181 width=17 height=16 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=104 x=36 y=182 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 -char id=105 x=227 y=141 width=9 height=19 xoffset=2 yoffset=5 xadvance=13 page=0 chnl=15 -char id=106 x=100 y=0 width=14 height=22 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 -char id=107 x=237 y=160 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 -char id=108 x=245 y=140 width=9 height=18 xoffset=2 yoffset=6 xadvance=13 page=0 chnl=15 -char id=109 x=202 y=213 width=20 height=13 xoffset=2 yoffset=11 xadvance=24 page=0 chnl=15 -char id=110 x=18 y=233 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=111 x=36 y=233 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=112 x=18 y=201 width=17 height=16 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=113 x=0 y=201 width=17 height=16 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=114 x=162 y=228 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=115 x=36 y=218 width=17 height=14 xoffset=2 yoffset=10 xadvance=21 page=0 chnl=15 -char id=116 x=54 y=182 width=14 height=18 xoffset=2 yoffset=6 xadvance=18 page=0 chnl=15 -char id=117 x=54 y=233 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=118 x=72 y=233 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=119 x=223 y=213 width=20 height=13 xoffset=2 yoffset=11 xadvance=24 page=0 chnl=15 -char id=120 x=181 y=213 width=20 height=13 xoffset=2 yoffset=11 xadvance=24 page=0 chnl=15 -char id=121 x=54 y=201 width=17 height=16 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=122 x=108 y=233 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 -char id=123 x=72 y=143 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=124 x=82 y=182 width=7 height=18 xoffset=2 yoffset=6 xadvance=11 page=0 chnl=15 -char id=125 x=236 y=40 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=126 x=30 y=247 width=23 height=6 xoffset=-1 yoffset=5 xadvance=21 page=0 chnl=15 -char id=161 x=237 y=140 width=7 height=19 xoffset=2 yoffset=5 xadvance=11 page=0 chnl=15 -char id=162 x=90 y=233 width=17 height=13 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=163 x=0 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=164 x=0 y=218 width=17 height=14 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=165 x=46 y=23 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=166 x=90 y=182 width=7 height=18 xoffset=2 yoffset=6 xadvance=11 page=0 chnl=15 -char id=167 x=36 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=168 x=79 y=247 width=17 height=5 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 -char id=169 x=23 y=23 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=170 x=87 y=218 width=14 height=14 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 -char id=171 x=194 y=198 width=22 height=14 xoffset=2 yoffset=8 xadvance=26 page=0 chnl=15 -char id=172 x=54 y=247 width=14 height=6 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 -char id=173 x=177 y=242 width=17 height=3 xoffset=2 yoffset=13 xadvance=21 page=0 chnl=15 -char id=174 x=0 y=0 width=22 height=22 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=175 x=141 y=246 width=17 height=3 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=177 x=201 y=162 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 -char id=178 x=117 y=217 width=14 height=14 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 -char id=179 x=102 y=218 width=14 height=14 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 -char id=180 x=216 y=227 width=12 height=9 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=181 x=175 y=181 width=20 height=16 xoffset=2 yoffset=11 xadvance=24 page=0 chnl=15 -char id=182 x=54 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=183 x=247 y=226 width=7 height=5 xoffset=2 yoffset=11 xadvance=11 page=0 chnl=15 -char id=184 x=69 y=247 width=9 height=6 xoffset=2 yoffset=21 xadvance=13 page=0 chnl=15 -char id=185 x=244 y=212 width=9 height=13 xoffset=2 yoffset=6 xadvance=13 page=0 chnl=15 -char id=186 x=72 y=218 width=14 height=14 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 -char id=187 x=171 y=198 width=22 height=14 xoffset=2 yoffset=8 xadvance=26 page=0 chnl=15 -char id=188 x=139 y=0 width=22 height=21 xoffset=2 yoffset=6 xadvance=26 page=0 chnl=15 -char id=189 x=162 y=0 width=20 height=21 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 -char id=190 x=23 y=0 width=22 height=22 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=191 x=72 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=192 x=90 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=193 x=108 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=194 x=126 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=195 x=228 y=0 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=196 x=144 y=62 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=197 x=162 y=62 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=198 x=205 y=0 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=199 x=64 y=0 width=17 height=22 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=200 x=180 y=62 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=201 x=198 y=61 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=202 x=234 y=60 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=203 x=36 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=204 x=118 y=143 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=205 x=105 y=143 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=206 x=126 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=207 x=144 y=82 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=208 x=134 y=42 width=20 height=19 xoffset=2 yoffset=5 xadvance=24 page=0 chnl=15 -char id=209 x=92 y=23 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=210 x=162 y=82 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=211 x=180 y=82 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=212 x=198 y=81 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=213 x=69 y=43 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=214 x=23 y=43 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=215 x=217 y=198 width=20 height=14 xoffset=2 yoffset=8 xadvance=24 page=0 chnl=15 -char id=216 x=207 y=20 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=217 x=126 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=218 x=144 y=102 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=219 x=162 y=102 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=220 x=180 y=102 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=221 x=184 y=21 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=222 x=42 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 -char id=223 x=82 y=0 width=17 height=22 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=224 x=198 y=101 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=225 x=234 y=100 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=226 x=72 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=227 x=161 y=22 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=228 x=90 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=229 x=108 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=230 x=158 y=214 width=22 height=13 xoffset=2 yoffset=11 xadvance=26 page=0 chnl=15 -char id=231 x=108 y=200 width=14 height=16 xoffset=2 yoffset=11 xadvance=18 page=0 chnl=15 -char id=232 x=126 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=233 x=144 y=122 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=234 x=162 y=122 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=235 x=180 y=122 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=236 x=157 y=142 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=237 x=207 y=141 width=9 height=19 xoffset=2 yoffset=5 xadvance=13 page=0 chnl=15 -char id=238 x=198 y=121 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=239 x=90 y=201 width=17 height=16 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=240 x=105 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 -char id=241 x=138 y=22 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=242 x=72 y=201 width=17 height=16 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=243 x=36 y=201 width=17 height=16 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=244 x=216 y=121 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=245 x=115 y=22 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 -char id=246 x=232 y=180 width=17 height=16 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=247 x=54 y=218 width=17 height=14 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=248 x=155 y=42 width=20 height=19 xoffset=2 yoffset=8 xadvance=24 page=0 chnl=15 -char id=249 x=234 y=120 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=250 x=0 y=143 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=251 x=18 y=143 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=252 x=196 y=181 width=17 height=16 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=253 x=46 y=0 width=17 height=22 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 -char id=254 x=36 y=143 width=17 height=19 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=255 x=54 y=143 width=17 height=19 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 -char id=8218 x=115 y=0 width=23 height=21 xoffset=-1 yoffset=6 xadvance=21 page=0 chnl=15 -char id=8222 x=105 y=182 width=20 height=17 xoffset=2 yoffset=7 xadvance=21 page=0 chnl=15 -char id=8224 x=183 y=0 width=21 height=20 xoffset=2 yoffset=4 xadvance=25 page=0 chnl=15 -char id=8225 x=130 y=199 width=17 height=15 xoffset=-1 yoffset=9 xadvance=16 page=0 chnl=15 -char id=8230 x=195 y=238 width=9 height=3 xoffset=13 yoffset=16 xadvance=0 page=0 chnl=15 -char id=8240 x=126 y=182 width=27 height=16 xoffset=2 yoffset=8 xadvance=31 page=0 chnl=15 -char id=8249 x=145 y=215 width=12 height=14 xoffset=2 yoffset=8 xadvance=16 page=0 chnl=15 -char id=8250 x=132 y=215 width=12 height=14 xoffset=2 yoffset=8 xadvance=16 page=0 chnl=15 +info face="Amiga Forever Pro" size=32 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=32 base=24 scaleW=256 scaleH=256 pages=1 packed=0 alphaChnl=0 redChnl=4 greenChnl=4 blueChnl=4 +page id=0 file="white_0.png" +chars count=197 +char id=32 x=251 y=0 width=3 height=1 xoffset=-1 yoffset=31 xadvance=21 page=0 chnl=15 +char id=33 x=98 y=182 width=6 height=18 xoffset=5 yoffset=6 xadvance=16 page=0 chnl=15 +char id=34 x=97 y=247 width=14 height=5 xoffset=2 yoffset=6 xadvance=18 page=0 chnl=15 +char id=35 x=21 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 +char id=36 x=165 y=162 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 +char id=37 x=154 y=181 width=20 height=16 xoffset=2 yoffset=8 xadvance=24 page=0 chnl=15 +char id=38 x=0 y=23 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=39 x=10 y=247 width=9 height=8 xoffset=2 yoffset=6 xadvance=13 page=0 chnl=15 +char id=40 x=183 y=142 width=11 height=19 xoffset=5 yoffset=5 xadvance=21 page=0 chnl=15 +char id=41 x=195 y=142 width=11 height=19 xoffset=5 yoffset=5 xadvance=21 page=0 chnl=15 +char id=42 x=148 y=199 width=22 height=14 xoffset=2 yoffset=8 xadvance=26 page=0 chnl=15 +char id=43 x=0 y=233 width=17 height=13 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=44 x=20 y=247 width=9 height=8 xoffset=5 yoffset=19 xadvance=21 page=0 chnl=15 +char id=45 x=159 y=244 width=17 height=3 xoffset=2 yoffset=13 xadvance=21 page=0 chnl=15 +char id=46 x=112 y=247 width=7 height=5 xoffset=7 yoffset=19 xadvance=21 page=0 chnl=15 +char id=47 x=69 y=23 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=48 x=216 y=61 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=49 x=69 y=182 width=12 height=18 xoffset=2 yoffset=6 xadvance=16 page=0 chnl=15 +char id=50 x=0 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=51 x=18 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=52 x=63 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 +char id=53 x=54 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=54 x=72 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=55 x=90 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=56 x=218 y=40 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=57 x=108 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=58 x=123 y=200 width=6 height=16 xoffset=5 yoffset=8 xadvance=16 page=0 chnl=15 +char id=59 x=217 y=141 width=9 height=19 xoffset=5 yoffset=8 xadvance=18 page=0 chnl=15 +char id=60 x=238 y=197 width=17 height=14 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=61 x=229 y=227 width=17 height=8 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=62 x=18 y=218 width=17 height=14 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=63 x=216 y=81 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=64 x=197 y=41 width=20 height=19 xoffset=2 yoffset=5 xadvance=24 page=0 chnl=15 +char id=65 x=234 y=80 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=66 x=0 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=67 x=18 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=68 x=36 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=69 x=54 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=70 x=72 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=71 x=90 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=72 x=108 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=73 x=170 y=142 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 +char id=74 x=18 y=182 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 +char id=75 x=176 y=42 width=20 height=19 xoffset=2 yoffset=5 xadvance=24 page=0 chnl=15 +char id=76 x=183 y=162 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 +char id=77 x=126 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 +char id=78 x=84 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 +char id=79 x=216 y=101 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=80 x=18 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=81 x=92 y=43 width=20 height=19 xoffset=2 yoffset=5 xadvance=24 page=0 chnl=15 +char id=82 x=0 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=83 x=18 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=84 x=36 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=85 x=54 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=86 x=219 y=161 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 +char id=87 x=0 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 +char id=88 x=230 y=20 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=89 x=0 y=43 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=90 x=113 y=43 width=20 height=19 xoffset=2 yoffset=5 xadvance=24 page=0 chnl=15 +char id=91 x=144 y=142 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 +char id=92 x=46 y=43 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=93 x=131 y=143 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 +char id=94 x=195 y=227 width=20 height=10 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 +char id=95 x=120 y=247 width=20 height=3 xoffset=2 yoffset=24 xadvance=24 page=0 chnl=15 +char id=96 x=0 y=247 width=9 height=8 xoffset=2 yoffset=6 xadvance=13 page=0 chnl=15 +char id=97 x=144 y=230 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=98 x=147 y=162 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 +char id=99 x=180 y=228 width=14 height=13 xoffset=2 yoffset=11 xadvance=18 page=0 chnl=15 +char id=100 x=0 y=182 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 +char id=101 x=126 y=232 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=102 x=90 y=143 width=14 height=19 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 +char id=103 x=214 y=181 width=17 height=16 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=104 x=36 y=182 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 +char id=105 x=227 y=141 width=9 height=19 xoffset=2 yoffset=5 xadvance=13 page=0 chnl=15 +char id=106 x=100 y=0 width=14 height=22 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 +char id=107 x=237 y=160 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 +char id=108 x=245 y=140 width=9 height=18 xoffset=2 yoffset=6 xadvance=13 page=0 chnl=15 +char id=109 x=202 y=213 width=20 height=13 xoffset=2 yoffset=11 xadvance=24 page=0 chnl=15 +char id=110 x=18 y=233 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=111 x=36 y=233 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=112 x=18 y=201 width=17 height=16 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=113 x=0 y=201 width=17 height=16 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=114 x=162 y=228 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=115 x=36 y=218 width=17 height=14 xoffset=2 yoffset=10 xadvance=21 page=0 chnl=15 +char id=116 x=54 y=182 width=14 height=18 xoffset=2 yoffset=6 xadvance=18 page=0 chnl=15 +char id=117 x=54 y=233 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=118 x=72 y=233 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=119 x=223 y=213 width=20 height=13 xoffset=2 yoffset=11 xadvance=24 page=0 chnl=15 +char id=120 x=181 y=213 width=20 height=13 xoffset=2 yoffset=11 xadvance=24 page=0 chnl=15 +char id=121 x=54 y=201 width=17 height=16 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=122 x=108 y=233 width=17 height=13 xoffset=2 yoffset=11 xadvance=21 page=0 chnl=15 +char id=123 x=72 y=143 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=124 x=82 y=182 width=7 height=18 xoffset=2 yoffset=6 xadvance=11 page=0 chnl=15 +char id=125 x=236 y=40 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=126 x=30 y=247 width=23 height=6 xoffset=-1 yoffset=5 xadvance=21 page=0 chnl=15 +char id=161 x=237 y=140 width=7 height=19 xoffset=2 yoffset=5 xadvance=11 page=0 chnl=15 +char id=162 x=90 y=233 width=17 height=13 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=163 x=0 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=164 x=0 y=218 width=17 height=14 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=165 x=46 y=23 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=166 x=90 y=182 width=7 height=18 xoffset=2 yoffset=6 xadvance=11 page=0 chnl=15 +char id=167 x=36 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=168 x=79 y=247 width=17 height=5 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 +char id=169 x=23 y=23 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=170 x=87 y=218 width=14 height=14 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 +char id=171 x=194 y=198 width=22 height=14 xoffset=2 yoffset=8 xadvance=26 page=0 chnl=15 +char id=172 x=54 y=247 width=14 height=6 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 +char id=173 x=177 y=242 width=17 height=3 xoffset=2 yoffset=13 xadvance=21 page=0 chnl=15 +char id=174 x=0 y=0 width=22 height=22 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=175 x=141 y=246 width=17 height=3 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=177 x=201 y=162 width=17 height=18 xoffset=2 yoffset=6 xadvance=21 page=0 chnl=15 +char id=178 x=117 y=217 width=14 height=14 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 +char id=179 x=102 y=218 width=14 height=14 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 +char id=180 x=216 y=227 width=12 height=9 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 +char id=181 x=175 y=181 width=20 height=16 xoffset=2 yoffset=11 xadvance=24 page=0 chnl=15 +char id=182 x=54 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=183 x=247 y=226 width=7 height=5 xoffset=2 yoffset=11 xadvance=11 page=0 chnl=15 +char id=184 x=69 y=247 width=9 height=6 xoffset=2 yoffset=21 xadvance=13 page=0 chnl=15 +char id=185 x=244 y=212 width=9 height=13 xoffset=2 yoffset=6 xadvance=13 page=0 chnl=15 +char id=186 x=72 y=218 width=14 height=14 xoffset=2 yoffset=5 xadvance=18 page=0 chnl=15 +char id=187 x=171 y=198 width=22 height=14 xoffset=2 yoffset=8 xadvance=26 page=0 chnl=15 +char id=188 x=139 y=0 width=22 height=21 xoffset=2 yoffset=6 xadvance=26 page=0 chnl=15 +char id=189 x=162 y=0 width=20 height=21 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 +char id=190 x=23 y=0 width=22 height=22 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=191 x=72 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=192 x=90 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=193 x=108 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=194 x=126 y=63 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=195 x=228 y=0 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=196 x=144 y=62 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=197 x=162 y=62 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=198 x=205 y=0 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=199 x=64 y=0 width=17 height=22 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=200 x=180 y=62 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=201 x=198 y=61 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=202 x=234 y=60 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=203 x=36 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=204 x=118 y=143 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 +char id=205 x=105 y=143 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 +char id=206 x=126 y=83 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=207 x=144 y=82 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=208 x=134 y=42 width=20 height=19 xoffset=2 yoffset=5 xadvance=24 page=0 chnl=15 +char id=209 x=92 y=23 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=210 x=162 y=82 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=211 x=180 y=82 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=212 x=198 y=81 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=213 x=69 y=43 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=214 x=23 y=43 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=215 x=217 y=198 width=20 height=14 xoffset=2 yoffset=8 xadvance=24 page=0 chnl=15 +char id=216 x=207 y=20 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=217 x=126 y=103 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=218 x=144 y=102 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=219 x=162 y=102 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=220 x=180 y=102 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=221 x=184 y=21 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=222 x=42 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 +char id=223 x=82 y=0 width=17 height=22 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=224 x=198 y=101 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=225 x=234 y=100 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=226 x=72 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=227 x=161 y=22 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=228 x=90 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=229 x=108 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=230 x=158 y=214 width=22 height=13 xoffset=2 yoffset=11 xadvance=26 page=0 chnl=15 +char id=231 x=108 y=200 width=14 height=16 xoffset=2 yoffset=11 xadvance=18 page=0 chnl=15 +char id=232 x=126 y=123 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=233 x=144 y=122 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=234 x=162 y=122 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=235 x=180 y=122 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=236 x=157 y=142 width=12 height=19 xoffset=2 yoffset=5 xadvance=16 page=0 chnl=15 +char id=237 x=207 y=141 width=9 height=19 xoffset=2 yoffset=5 xadvance=13 page=0 chnl=15 +char id=238 x=198 y=121 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=239 x=90 y=201 width=17 height=16 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=240 x=105 y=163 width=20 height=18 xoffset=2 yoffset=6 xadvance=24 page=0 chnl=15 +char id=241 x=138 y=22 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=242 x=72 y=201 width=17 height=16 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=243 x=36 y=201 width=17 height=16 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=244 x=216 y=121 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=245 x=115 y=22 width=22 height=19 xoffset=2 yoffset=5 xadvance=26 page=0 chnl=15 +char id=246 x=232 y=180 width=17 height=16 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=247 x=54 y=218 width=17 height=14 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=248 x=155 y=42 width=20 height=19 xoffset=2 yoffset=8 xadvance=24 page=0 chnl=15 +char id=249 x=234 y=120 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=250 x=0 y=143 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=251 x=18 y=143 width=17 height=19 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=252 x=196 y=181 width=17 height=16 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=253 x=46 y=0 width=17 height=22 xoffset=2 yoffset=5 xadvance=21 page=0 chnl=15 +char id=254 x=36 y=143 width=17 height=19 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=255 x=54 y=143 width=17 height=19 xoffset=2 yoffset=8 xadvance=21 page=0 chnl=15 +char id=8218 x=115 y=0 width=23 height=21 xoffset=-1 yoffset=6 xadvance=21 page=0 chnl=15 +char id=8222 x=105 y=182 width=20 height=17 xoffset=2 yoffset=7 xadvance=21 page=0 chnl=15 +char id=8224 x=183 y=0 width=21 height=20 xoffset=2 yoffset=4 xadvance=25 page=0 chnl=15 +char id=8225 x=130 y=199 width=17 height=15 xoffset=-1 yoffset=9 xadvance=16 page=0 chnl=15 +char id=8230 x=195 y=238 width=9 height=3 xoffset=13 yoffset=16 xadvance=0 page=0 chnl=15 +char id=8240 x=126 y=182 width=27 height=16 xoffset=2 yoffset=8 xadvance=31 page=0 chnl=15 +char id=8249 x=145 y=215 width=12 height=14 xoffset=2 yoffset=8 xadvance=16 page=0 chnl=15 +char id=8250 x=132 y=215 width=12 height=14 xoffset=2 yoffset=8 xadvance=16 page=0 chnl=15 diff --git a/android/assets/font/white_0.png b/assets/font/white_0.png similarity index 100% rename from android/assets/font/white_0.png rename to assets/font/white_0.png diff --git a/android/assets/gfx/logo.png b/assets/gfx/logo.png similarity index 100% rename from android/assets/gfx/logo.png rename to assets/gfx/logo.png diff --git a/android/assets/pitches/classic.png b/assets/pitches/classic.png similarity index 100% rename from android/assets/pitches/classic.png rename to assets/pitches/classic.png diff --git a/android/assets/pitches/classic.tmx b/assets/pitches/classic.tmx similarity index 100% rename from android/assets/pitches/classic.tmx rename to assets/pitches/classic.tmx diff --git a/android/assets/pitches/playermanager.png b/assets/pitches/playermanager.png similarity index 100% rename from android/assets/pitches/playermanager.png rename to assets/pitches/playermanager.png diff --git a/android/assets/pitches/playermanager.tmx b/assets/pitches/playermanager.tmx similarity index 100% rename from android/assets/pitches/playermanager.tmx rename to assets/pitches/playermanager.tmx diff --git a/android/assets/pitches/soggy.png b/assets/pitches/soggy.png similarity index 100% rename from android/assets/pitches/soggy.png rename to assets/pitches/soggy.png diff --git a/android/assets/pitches/soggy.tmx b/assets/pitches/soggy.tmx similarity index 100% rename from android/assets/pitches/soggy.tmx rename to assets/pitches/soggy.tmx diff --git a/android/assets/pitches/synthetic.png b/assets/pitches/synthetic.png similarity index 100% rename from android/assets/pitches/synthetic.png rename to assets/pitches/synthetic.png diff --git a/android/assets/pitches/synthetic.tmx b/assets/pitches/synthetic.tmx similarity index 100% rename from android/assets/pitches/synthetic.tmx rename to assets/pitches/synthetic.tmx diff --git a/android/assets/pitches/wet.png b/assets/pitches/wet.png similarity index 100% rename from android/assets/pitches/wet.png rename to assets/pitches/wet.png diff --git a/android/assets/pitches/wet.tmx b/assets/pitches/wet.tmx similarity index 100% rename from android/assets/pitches/wet.tmx rename to assets/pitches/wet.tmx diff --git a/android/assets/sounds/bounce.ogg b/assets/sounds/bounce.ogg similarity index 100% rename from android/assets/sounds/bounce.ogg rename to assets/sounds/bounce.ogg diff --git a/android/assets/sounds/crowd.ogg b/assets/sounds/crowd.ogg similarity index 100% rename from android/assets/sounds/crowd.ogg rename to assets/sounds/crowd.ogg diff --git a/android/assets/sounds/dribble.ogg b/assets/sounds/dribble.ogg similarity index 100% rename from android/assets/sounds/dribble.ogg rename to assets/sounds/dribble.ogg diff --git a/android/assets/sounds/foul.ogg b/assets/sounds/foul.ogg similarity index 100% rename from android/assets/sounds/foul.ogg rename to assets/sounds/foul.ogg diff --git a/android/assets/sounds/foulcrowd.ogg b/assets/sounds/foulcrowd.ogg similarity index 100% rename from android/assets/sounds/foulcrowd.ogg rename to assets/sounds/foulcrowd.ogg diff --git a/android/assets/sounds/passe.ogg b/assets/sounds/passe.ogg similarity index 100% rename from android/assets/sounds/passe.ogg rename to assets/sounds/passe.ogg diff --git a/android/assets/sounds/penalty.ogg b/assets/sounds/penalty.ogg similarity index 100% rename from android/assets/sounds/penalty.ogg rename to assets/sounds/penalty.ogg diff --git a/android/assets/sounds/shot.ogg b/assets/sounds/shot.ogg similarity index 100% rename from android/assets/sounds/shot.ogg rename to assets/sounds/shot.ogg diff --git a/android/assets/sounds/whistle.ogg b/assets/sounds/whistle.ogg similarity index 100% rename from android/assets/sounds/whistle.ogg rename to assets/sounds/whistle.ogg diff --git a/android/assets/sounds/woodwork.ogg b/assets/sounds/woodwork.ogg similarity index 100% rename from android/assets/sounds/woodwork.ogg rename to assets/sounds/woodwork.ogg diff --git a/android/assets/tactics/4-2-4.xml b/assets/tactics/4-2-4.xml similarity index 100% rename from android/assets/tactics/4-2-4.xml rename to assets/tactics/4-2-4.xml diff --git a/android/assets/tactics/4-3-3.xml b/assets/tactics/4-3-3.xml similarity index 100% rename from android/assets/tactics/4-3-3.xml rename to assets/tactics/4-3-3.xml diff --git a/android/assets/tactics/4-4-2.xml b/assets/tactics/4-4-2.xml similarity index 100% rename from android/assets/tactics/4-4-2.xml rename to assets/tactics/4-4-2.xml diff --git a/android/assets/tactics/5-3-2.xml b/assets/tactics/5-3-2.xml similarity index 100% rename from android/assets/tactics/5-3-2.xml rename to assets/tactics/5-3-2.xml diff --git a/android/assets/tactics/balanced.xml b/assets/tactics/balanced.xml old mode 100755 new mode 100644 similarity index 95% rename from android/assets/tactics/balanced.xml rename to assets/tactics/balanced.xml index bc1c145..f43d869 --- a/android/assets/tactics/balanced.xml +++ b/assets/tactics/balanced.xml @@ -1,823 +1,823 @@ - - - - - 504 - 144 - - - 456 - 426 - - - 546 - 816 - - - 468 - 1077 - - - 522 - 96 - - - 702 - 432 - - - 744 - 615 - - - 708 - 924 - - - 654 - 138 - - - 690 - 246 - - - 762 - 618 - - - 780 - 828 - - - 726 - 351 - - - 726 - 351 - - - 720 - 342 - - - 768 - 441 - - - 174 - 12 - - - 600 - 1008 - - - 738 - 24 - - - 582 - 1224 - - - - - 258 - 138 - - - 222 - 246 - - - 150 - 618 - - - 132 - 828 - - - 402 - 87 - - - 216 - 441 - - - 162 - 573 - - - 186 - 900 - - - 408 - 144 - - - 456 - 426 - - - 366 - 816 - - - 444 - 1077 - - - 204 - 348 - - - 204 - 348 - - - 192 - 348 - - - 150 - 444 - - - 570 - 60 - - - 330 - 1224 - - - 342 - 60 - - - 312 - 1008 - - - - - 120 - 198 - - - 78 - 486 - - - 108 - 927 - - - 168 - 1266 - - - 564 - 297 - - - 402 - 510 - - - 564 - 804 - - - 564 - 1122 - - - 792 - 198 - - - 834 - 486 - - - 804 - 927 - - - 744 - 1266 - - - 534 - 690 - - - 642 - 453 - - - 612 - 600 - - - 594 - 522 - - - 486 - 6 - - - 120 - 1386 - - - 426 - 6 - - - 792 - 1386 - - - - - 426 - 27 - - - 396 - 114 - - - 408 - 519 - - - 348 - 666 - - - 486 - 27 - - - 450 - 282 - - - 462 - 426 - - - 462 - 678 - - - 486 - 27 - - - 516 - 114 - - - 504 - 519 - - - 564 - 666 - - - 558 - 258 - - - 558 - 258 - - - 450 - 264 - - - 456 - 420 - - - 432 - 12 - - - 456 - 630 - - - 480 - 12 - - - 456 - 630 - - - - - 486 - 27 - - - 444 - 192 - - - 606 - 633 - - - 408 - 870 - - - 432 - 27 - - - 492 - 330 - - - 462 - 594 - - - 468 - 894 - - - 426 - 27 - - - 468 - 192 - - - 306 - 633 - - - 504 - 870 - - - 372 - 258 - - - 372 - 258 - - - 444 - 504 - - - 456 - 564 - - - 462 - 18 - - - 450 - 930 - - - 450 - 18 - - - 462 - 930 - - - - - 690 - 513 - - - 756 - 774 - - - 666 - 1008 - - - 576 - 1272 - - - 762 - 549 - - - 750 - 933 - - - 828 - 981 - - - 684 - 1293 - - - 786 - 510 - - - 774 - 672 - - - 720 - 972 - - - 840 - 1182 - - - 840 - 660 - - - 576 - 606 - - - 828 - 852 - - - 738 - 654 - - - 756 - 198 - - - 654 - 1152 - - - 702 - 48 - - - 900 - 1368 - - - - - 216 - 276 - - - 204 - 498 - - - 228 - 858 - - - 204 - 1155 - - - 354 - 309 - - - 522 - 504 - - - 372 - 822 - - - 372 - 1116 - - - 696 - 276 - - - 708 - 498 - - - 684 - 858 - - - 708 - 1155 - - - 462 - 510 - - - 276 - 459 - - - 300 - 606 - - - 300 - 522 - - - 342 - 66 - - - 384 - 1320 - - - 570 - 66 - - - 528 - 1320 - - - - - 402 - 516 - - - 312 - 984 - - - 504 - 1152 - - - 468 - 1311 - - - 474 - 441 - - - 456 - 654 - - - 516 - 1140 - - - 498 - 1350 - - - 510 - 516 - - - 600 - 984 - - - 600 - 1146 - - - 444 - 1311 - - - 372 - 696 - - - 456 - 408 - - - 456 - 702 - - - 450 - 726 - - - 432 - 288 - - - 498 - 1374 - - - 480 - 288 - - - 414 - 1374 - - - - - 456 - 684 - - - 480 - 1044 - - - 312 - 1146 - - - 456 - 1371 - - - 456 - 684 - - - 462 - 993 - - - 396 - 1122 - - - 444 - 1356 - - - 456 - 684 - - - 432 - 1044 - - - 408 - 1152 - - - 456 - 1371 - - - 456 - 666 - - - 450 - 564 - - - 444 - 978 - - - 456 - 1032 - - - 426 - 678 - - - 462 - 1368 - - - 486 - 678 - - - 450 - 1368 - - - - - 126 - 510 - - - 138 - 672 - - - 192 - 972 - - - 72 - 1182 - - - 114 - 573 - - - 186 - 930 - - - 72 - 945 - - - 234 - 1284 - - - 222 - 513 - - - 156 - 774 - - - 246 - 1008 - - - 336 - 1272 - - - 78 - 672 - - - 342 - 618 - - - 102 - 846 - - - 186 - 651 - - - 204 - 42 - - - 12 - 1368 - - - 156 - 198 - - - 258 - 1152 - - - + + + + + 504 + 144 + + + 456 + 426 + + + 546 + 816 + + + 468 + 1077 + + + 522 + 96 + + + 702 + 432 + + + 744 + 615 + + + 708 + 924 + + + 654 + 138 + + + 690 + 246 + + + 762 + 618 + + + 780 + 828 + + + 726 + 351 + + + 726 + 351 + + + 720 + 342 + + + 768 + 441 + + + 174 + 12 + + + 600 + 1008 + + + 738 + 24 + + + 582 + 1224 + + + + + 258 + 138 + + + 222 + 246 + + + 150 + 618 + + + 132 + 828 + + + 402 + 87 + + + 216 + 441 + + + 162 + 573 + + + 186 + 900 + + + 408 + 144 + + + 456 + 426 + + + 366 + 816 + + + 444 + 1077 + + + 204 + 348 + + + 204 + 348 + + + 192 + 348 + + + 150 + 444 + + + 570 + 60 + + + 330 + 1224 + + + 342 + 60 + + + 312 + 1008 + + + + + 120 + 198 + + + 78 + 486 + + + 108 + 927 + + + 168 + 1266 + + + 564 + 297 + + + 402 + 510 + + + 564 + 804 + + + 564 + 1122 + + + 792 + 198 + + + 834 + 486 + + + 804 + 927 + + + 744 + 1266 + + + 534 + 690 + + + 642 + 453 + + + 612 + 600 + + + 594 + 522 + + + 486 + 6 + + + 120 + 1386 + + + 426 + 6 + + + 792 + 1386 + + + + + 426 + 27 + + + 396 + 114 + + + 408 + 519 + + + 348 + 666 + + + 486 + 27 + + + 450 + 282 + + + 462 + 426 + + + 462 + 678 + + + 486 + 27 + + + 516 + 114 + + + 504 + 519 + + + 564 + 666 + + + 558 + 258 + + + 558 + 258 + + + 450 + 264 + + + 456 + 420 + + + 432 + 12 + + + 456 + 630 + + + 480 + 12 + + + 456 + 630 + + + + + 486 + 27 + + + 444 + 192 + + + 606 + 633 + + + 408 + 870 + + + 432 + 27 + + + 492 + 330 + + + 462 + 594 + + + 468 + 894 + + + 426 + 27 + + + 468 + 192 + + + 306 + 633 + + + 504 + 870 + + + 372 + 258 + + + 372 + 258 + + + 444 + 504 + + + 456 + 564 + + + 462 + 18 + + + 450 + 930 + + + 450 + 18 + + + 462 + 930 + + + + + 690 + 513 + + + 756 + 774 + + + 666 + 1008 + + + 576 + 1272 + + + 762 + 549 + + + 750 + 933 + + + 828 + 981 + + + 684 + 1293 + + + 786 + 510 + + + 774 + 672 + + + 720 + 972 + + + 840 + 1182 + + + 840 + 660 + + + 576 + 606 + + + 828 + 852 + + + 738 + 654 + + + 756 + 198 + + + 654 + 1152 + + + 702 + 48 + + + 900 + 1368 + + + + + 216 + 276 + + + 204 + 498 + + + 228 + 858 + + + 204 + 1155 + + + 354 + 309 + + + 522 + 504 + + + 372 + 822 + + + 372 + 1116 + + + 696 + 276 + + + 708 + 498 + + + 684 + 858 + + + 708 + 1155 + + + 462 + 510 + + + 276 + 459 + + + 300 + 606 + + + 300 + 522 + + + 342 + 66 + + + 384 + 1320 + + + 570 + 66 + + + 528 + 1320 + + + + + 402 + 516 + + + 312 + 984 + + + 504 + 1152 + + + 468 + 1311 + + + 474 + 441 + + + 456 + 654 + + + 516 + 1140 + + + 498 + 1350 + + + 510 + 516 + + + 600 + 984 + + + 600 + 1146 + + + 444 + 1311 + + + 372 + 696 + + + 456 + 408 + + + 456 + 702 + + + 450 + 726 + + + 432 + 288 + + + 498 + 1374 + + + 480 + 288 + + + 414 + 1374 + + + + + 456 + 684 + + + 480 + 1044 + + + 312 + 1146 + + + 456 + 1371 + + + 456 + 684 + + + 462 + 993 + + + 396 + 1122 + + + 444 + 1356 + + + 456 + 684 + + + 432 + 1044 + + + 408 + 1152 + + + 456 + 1371 + + + 456 + 666 + + + 450 + 564 + + + 444 + 978 + + + 456 + 1032 + + + 426 + 678 + + + 462 + 1368 + + + 486 + 678 + + + 450 + 1368 + + + + + 126 + 510 + + + 138 + 672 + + + 192 + 972 + + + 72 + 1182 + + + 114 + 573 + + + 186 + 930 + + + 72 + 945 + + + 234 + 1284 + + + 222 + 513 + + + 156 + 774 + + + 246 + 1008 + + + 336 + 1272 + + + 78 + 672 + + + 342 + 618 + + + 102 + 846 + + + 186 + 651 + + + 204 + 42 + + + 12 + 1368 + + + 156 + 198 + + + 258 + 1152 + + + diff --git a/android/assets/tactics/blitz.xml b/assets/tactics/blitz.xml old mode 100755 new mode 100644 similarity index 100% rename from android/assets/tactics/blitz.xml rename to assets/tactics/blitz.xml diff --git a/android/assets/tactics/falcon.xml b/assets/tactics/falcon.xml old mode 100755 new mode 100644 similarity index 100% rename from android/assets/tactics/falcon.xml rename to assets/tactics/falcon.xml diff --git a/android/assets/tactics/lockout.xml b/assets/tactics/lockout.xml old mode 100755 new mode 100644 similarity index 100% rename from android/assets/tactics/lockout.xml rename to assets/tactics/lockout.xml diff --git a/android/assets/tactics/tactic-regions.png b/assets/tactics/tactic-regions.png similarity index 100% rename from android/assets/tactics/tactic-regions.png rename to assets/tactics/tactic-regions.png diff --git a/android/assets/tactics/zbreak.xml b/assets/tactics/zbreak.xml old mode 100755 new mode 100644 similarity index 100% rename from android/assets/tactics/zbreak.xml rename to assets/tactics/zbreak.xml diff --git a/android/assets/tactics/zxcross.xml b/assets/tactics/zxcross.xml old mode 100755 new mode 100644 similarity index 100% rename from android/assets/tactics/zxcross.xml rename to assets/tactics/zxcross.xml diff --git a/android/assets/ui/button.pack b/assets/ui/button.pack similarity index 100% rename from android/assets/ui/button.pack rename to assets/ui/button.pack diff --git a/android/assets/ui/button.png b/assets/ui/button.png similarity index 100% rename from android/assets/ui/button.png rename to assets/ui/button.png diff --git a/build.gradle b/build.gradle index 3670ac5..76c3516 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,16 @@ buildscript { - + repositories { mavenLocal() mavenCentral() - maven { url "https://plugins.gradle.org/m2/" } + gradlePluginPortal() maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } - jcenter() google() } dependencies { - classpath 'org.wisepersist:gwt-gradle-plugin:1.0.9' - classpath 'com.android.tools.build:gradle:3.6.3' - classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.8' + classpath 'com.android.tools.build:gradle:8.1.2' + classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.20' } @@ -24,20 +22,22 @@ allprojects { version = '1.0' ext { appName = "kickoff" - gdxVersion = '1.9.10' - roboVMVersion = '2.3.8' - box2DLightsVersion = '1.4' - ashleyVersion = '1.7.0' - aiVersion = '1.8.0' + gdxVersion = '1.12.1' + roboVMVersion = '2.3.20' + box2DLightsVersion = '1.5' + ashleyVersion = '1.7.4' + aiVersion = '1.8.2' + gdxControllersVersion = '2.2.1' } repositories { mavenLocal() mavenCentral() - jcenter() google() + gradlePluginPortal() maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } maven { url "https://oss.sonatype.org/content/repositories/releases/" } + maven { url "https://jitpack.io" } } } @@ -47,38 +47,29 @@ project(":desktop") { dependencies { implementation project(":core") - api "com.badlogicgames.gdx:gdx-backend-lwjgl:$gdxVersion" + api "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion" api "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop" - api "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-desktop" - api "com.badlogicgames.gdx:gdx-controllers-desktop:$gdxVersion" - api "com.badlogicgames.gdx:gdx-controllers-platform:$gdxVersion:natives-desktop" + api "com.badlogicgames.gdx-controllers:gdx-controllers-desktop:$gdxControllersVersion" } } project(":android") { - apply plugin: "android" + apply plugin: "com.android.application" configurations { natives } dependencies { implementation project(":core") api "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" natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64" - api "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-arm64-v8a" - natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-x86" - natives "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-x86_64" - api "com.badlogicgames.gdx:gdx-controllers:$gdxVersion" - api "com.badlogicgames.gdx:gdx-controllers-android:$gdxVersion" + api "com.badlogicgames.gdx-controllers:gdx-controllers-android:$gdxControllersVersion" + api "com.badlogicgames.ashley:ashley:$ashleyVersion" api "com.badlogicgames.gdx:gdx-ai:$aiVersion" - + } } @@ -93,28 +84,7 @@ project(":ios") { api "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion" api "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion" api "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios" - api "com.badlogicgames.gdx:gdx-box2d-platform:$gdxVersion:natives-ios" - - } -} - -project(":html") { - apply plugin: "java-library" - apply plugin: "gwt" - apply plugin: "war" - - - dependencies { - implementation project(":core") - api "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion" - api "com.badlogicgames.gdx:gdx:$gdxVersion:sources" - api "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources" - api "com.badlogicgames.gdx:gdx-box2d:$gdxVersion:sources" - api "com.badlogicgames.gdx:gdx-box2d-gwt:$gdxVersion:sources" - api "com.badlogicgames.gdx:gdx-controllers:$gdxVersion:sources" - api "com.badlogicgames.gdx:gdx-controllers-gwt:$gdxVersion" - api "com.badlogicgames.gdx:gdx-controllers-gwt:$gdxVersion:sources" - api "com.badlogicgames.gdx:gdx-ai:$aiVersion:sources" + api "com.badlogicgames.gdx-controllers:gdx-controllers-ios:$gdxControllersVersion" } } @@ -125,12 +95,9 @@ project(":core") { dependencies { api "com.badlogicgames.gdx:gdx:$gdxVersion" - api "com.badlogicgames.gdx:gdx-box2d:$gdxVersion" - api "com.badlogicgames.gdx:gdx-controllers:$gdxVersion" + api "com.badlogicgames.gdx-controllers:gdx-controllers-core:$gdxControllersVersion" + api "com.badlogicgames.ashley:ashley:$ashleyVersion" api "com.badlogicgames.gdx:gdx-ai:$aiVersion" + } } - -tasks.eclipse.doLast { - delete ".project" -} \ No newline at end of file diff --git a/core/build.gradle b/core/build.gradle index 24ad12f..0cad2ec 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -1,5 +1,3 @@ -apply plugin: "java" - sourceCompatibility = 1.8 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' diff --git a/core/src/KickOff.gwt.xml b/core/src/KickOff.gwt.xml deleted file mode 100644 index 77a8ca6..0000000 --- a/core/src/KickOff.gwt.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/desktop/build.gradle b/desktop/build.gradle index 54696fe..e8e1406 100644 --- a/desktop/build.gradle +++ b/desktop/build.gradle @@ -1,22 +1,29 @@ -apply plugin: "java" - sourceCompatibility = 1.8 sourceSets.main.java.srcDirs = [ "src/" ] -sourceSets.main.resources.srcDirs = ["../android/assets"] +sourceSets.main.resources.srcDirs = ["../assets"] + +project.ext.mainClassName = "com.senegas.kickoff.DesktopLauncher" +project.ext.assetsDir = new File("../assets") -project.ext.mainClassName = "com.senegas.kickoff.desktop.DesktopLauncher" -project.ext.assetsDir = new File("../android/assets"); +import org.gradle.internal.os.OperatingSystem -task run(dependsOn: classes, type: JavaExec) { - main = project.mainClassName +tasks.register('run', JavaExec) { + dependsOn classes + mainClass = project.mainClassName classpath = sourceSets.main.runtimeClasspath standardInput = System.in workingDir = project.assetsDir ignoreExitValue = true + + if (OperatingSystem.current() == OperatingSystem.MAC_OS) { + // Required to run on macOS + jvmArgs += "-XstartOnFirstThread" + } } -task debug(dependsOn: classes, type: JavaExec) { - main = project.mainClassName +tasks.register('debug', JavaExec) { + dependsOn classes + mainClass = project.mainClassName classpath = sourceSets.main.runtimeClasspath standardInput = System.in workingDir = project.assetsDir @@ -24,7 +31,8 @@ task debug(dependsOn: classes, type: JavaExec) { debug = true } -task dist(type: Jar) { +tasks.register('dist', Jar) { + duplicatesStrategy(DuplicatesStrategy.EXCLUDE) manifest { attributes 'Main-Class': project.mainClassName } @@ -35,6 +43,7 @@ task dist(type: Jar) { with jar } + dist.dependsOn classes eclipse.project.name = appName + "-desktop" diff --git a/desktop/src/com/senegas/kickoff/DesktopLauncher.java b/desktop/src/com/senegas/kickoff/DesktopLauncher.java new file mode 100644 index 0000000..d196250 --- /dev/null +++ b/desktop/src/com/senegas/kickoff/DesktopLauncher.java @@ -0,0 +1,17 @@ +package com.senegas.kickoff; + +import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application; +import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration; +import com.senegas.kickoff.KickOff; + +// Please note that on macOS your application needs to be started with the -XstartOnFirstThread JVM argument +public class DesktopLauncher { + public static void main (String[] arg) { + Lwjgl3ApplicationConfiguration config = new Lwjgl3ApplicationConfiguration(); + config.setTitle(KickOff.TITLE + " v" + KickOff.VERSION); + config.setWindowedMode(KickOff.APP_DESKTOP_WIDTH, KickOff.APP_DESKTOP_HEIGHT); + config.useVsync(true); + config.setForegroundFPS(60); + new Lwjgl3Application(new KickOff(), config); + } +} diff --git a/desktop/src/com/senegas/kickoff/desktop/DesktopLauncher.java b/desktop/src/com/senegas/kickoff/desktop/DesktopLauncher.java deleted file mode 100644 index 0de825c..0000000 --- a/desktop/src/com/senegas/kickoff/desktop/DesktopLauncher.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.senegas.kickoff.desktop; - -import com.badlogic.gdx.backends.lwjgl.LwjglApplication; -import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration; -import com.senegas.kickoff.KickOff; - -public class DesktopLauncher { - public static void main (String[] arg) { - LwjglApplicationConfiguration config = new LwjglApplicationConfiguration(); - config.title = KickOff.TITLE + " v" + KickOff.VERSION; - config.vSyncEnabled = true; - config.useGL30 = true; - config.width = KickOff.APP_DESKTOP_WIDTH; - config.height = KickOff.APP_DESKTOP_HEIGHT; - config.forceExit = false; - new LwjglApplication(new KickOff(), config); - } -} diff --git a/gradle.properties b/gradle.properties index ff329ac..c5aae14 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,4 @@ org.gradle.daemon=true org.gradle.jvmargs=-Xms128m -Xmx1500m org.gradle.configureondemand=false +android.enableR8.fullMode=false diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index bafc550..7f93135 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 4bfb3d2..1af9e09 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Fri May 01 17:29:25 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/gradlew b/gradlew index 4453cce..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,127 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # 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 +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac 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="" +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum -warn ( ) { +warn () { echo "$*" -} +} >&2 -die ( ) { +die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,92 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -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 - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save ( ) { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# 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")" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index e95643d..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,20 @@ -@if "%DEBUG%" == "" @echo off +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -9,19 +25,23 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @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 DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +55,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,38 +65,26 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/html/build.gradle b/html/build.gradle deleted file mode 100644 index 4decb58..0000000 --- a/html/build.gradle +++ /dev/null @@ -1,83 +0,0 @@ -gwt { - gwtVersion='2.8.2' // Should match the gwt version used for building the gwt backend - maxHeapSize="1G" // Default 256m is not enough for gwt compiler. GWT is HUNGRY - minHeapSize="1G" - - src = files(file("src/")) // Needs to be in front of "modules" below. - modules 'com.senegas.kickoff.GdxDefinition' - devModules 'com.senegas.kickoff.GdxDefinitionSuperdev' - project.webAppDirName = 'webapp' - - compiler { - strict = true; - disableCastChecking = true; - } -} - -import org.wisepersist.gradle.plugins.gwt.GwtSuperDev - -def HttpFileServer server = null -def httpFilePort = 8080 - -task startHttpServer () { - dependsOn draftCompileGwt - - String output = project.buildDir.path + "/gwt/draftOut" - - doLast { - copy { - from "webapp" - into output - } - - copy { - from "war" - into output - } - - server = new SimpleHttpFileServerFactory().start(new File(output), httpFilePort) - - println "Server started in directory " + server.getContentRoot() + ", http://localhost:" + server.getPort() - } -} - -task superDev (type: GwtSuperDev) { - dependsOn startHttpServer - doFirst { - gwt.modules = gwt.devModules - } -} - - -task dist(dependsOn: [clean, compileGwt]) { - doLast { - file("build/dist").mkdirs() - copy { - from "build/gwt/out" - into "build/dist" - } - copy { - from "webapp" - into "build/dist" - } - copy { - from "war" - into "build/dist" - } - } -} - -task addSource { - doLast { - sourceSets.main.compileClasspath += files(project(':core').sourceSets.main.allJava.srcDirs) - } -} - -tasks.compileGwt.dependsOn(addSource) -tasks.draftCompileGwt.dependsOn(addSource) - -sourceCompatibility = 1.7 -sourceSets.main.java.srcDirs = [ "src/" ] - - -eclipse.project.name = appName + "-html" diff --git a/html/src/com/senegas/kickoff/GdxDefinition.gwt.xml b/html/src/com/senegas/kickoff/GdxDefinition.gwt.xml deleted file mode 100644 index 3ce7ec9..0000000 --- a/html/src/com/senegas/kickoff/GdxDefinition.gwt.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/html/src/com/senegas/kickoff/GdxDefinitionSuperdev.gwt.xml b/html/src/com/senegas/kickoff/GdxDefinitionSuperdev.gwt.xml deleted file mode 100644 index 19d1a4a..0000000 --- a/html/src/com/senegas/kickoff/GdxDefinitionSuperdev.gwt.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/html/src/com/senegas/kickoff/client/HtmlLauncher.java b/html/src/com/senegas/kickoff/client/HtmlLauncher.java deleted file mode 100644 index b7106fc..0000000 --- a/html/src/com/senegas/kickoff/client/HtmlLauncher.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.senegas.kickoff.client; - -import com.badlogic.gdx.ApplicationListener; -import com.badlogic.gdx.backends.gwt.GwtApplication; -import com.badlogic.gdx.backends.gwt.GwtApplicationConfiguration; -import com.senegas.kickoff.KickOff; - -public class HtmlLauncher extends GwtApplication { - - @Override - public GwtApplicationConfiguration getConfig () { - return new GwtApplicationConfiguration(480, 320); - } - - @Override - public ApplicationListener getApplicationListener () { - return new KickOff(); - } -} \ No newline at end of file diff --git a/html/webapp/WEB-INF/web.xml b/html/webapp/WEB-INF/web.xml deleted file mode 100644 index 4301df2..0000000 --- a/html/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/html/webapp/index.html b/html/webapp/index.html deleted file mode 100644 index 4f020e7..0000000 --- a/html/webapp/index.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - kickoff - - - - - - - - SuperDev Refresh -
- - - - - \ No newline at end of file diff --git a/html/webapp/refresh.png b/html/webapp/refresh.png deleted file mode 100644 index 24a48f1..0000000 Binary files a/html/webapp/refresh.png and /dev/null differ diff --git a/html/webapp/soundmanager2-jsmin.js b/html/webapp/soundmanager2-jsmin.js deleted file mode 100644 index b6af93d..0000000 --- a/html/webapp/soundmanager2-jsmin.js +++ /dev/null @@ -1,110 +0,0 @@ -/** @license - - - SoundManager 2: JavaScript Sound for the Web - ---------------------------------------------- - http://schillmania.com/projects/soundmanager2/ - - Copyright (c) 2007, Scott Schiller. All rights reserved. - Code provided under the BSD License: - http://schillmania.com/projects/soundmanager2/license.txt - - V2.97a.20130512 -*/ -(function(h,g){function fa(fa,wa){function ga(b){return c.preferFlash&&H&&!c.ignoreFlash&&c.flash[b]!==g&&c.flash[b]}function s(b){return function(d){var e=this._s;!e||!e._a?(e&&e.id?c._wD(e.id+": Ignoring "+d.type):c._wD(rb+"Ignoring "+d.type),d=null):d=b.call(this,d);return d}}this.setupOptions={url:fa||null,flashVersion:8,debugMode:!0,debugFlash:!1,useConsole:!0,consoleOnly:!0,waitForWindowLoad:!1,bgColor:"#ffffff",useHighPerformance:!1,flashPollingInterval:null,html5PollingInterval:null,flashLoadTimeout:1E3, -wmode:null,allowScriptAccess:"always",useFlashBlock:!1,useHTML5Audio:!0,html5Test:/^(probably|maybe)$/i,preferFlash:!0,noSWFCache:!1,idPrefix:"sound"};this.defaultOptions={autoLoad:!1,autoPlay:!1,from:null,loops:1,onid3:null,onload:null,whileloading:null,onplay:null,onpause:null,onresume:null,whileplaying:null,onposition:null,onstop:null,onfailure:null,onfinish:null,multiShot:!0,multiShotEvents:!1,position:null,pan:0,stream:!0,to:null,type:null,usePolicyFile:!1,volume:100};this.flash9Options={isMovieStar:null, -usePeakData:!1,useWaveformData:!1,useEQData:!1,onbufferchange:null,ondataerror:null};this.movieStarOptions={bufferTime:3,serverURL:null,onconnect:null,duration:null};this.audioFormats={mp3:{type:['audio/mpeg; codecs\x3d"mp3"',"audio/mpeg","audio/mp3","audio/MPA","audio/mpa-robust"],required:!0},mp4:{related:["aac","m4a","m4b"],type:['audio/mp4; codecs\x3d"mp4a.40.2"',"audio/aac","audio/x-m4a","audio/MP4A-LATM","audio/mpeg4-generic"],required:!1},ogg:{type:["audio/ogg; codecs\x3dvorbis"],required:!1}, -opus:{type:["audio/ogg; codecs\x3dopus","audio/opus"],required:!1},wav:{type:['audio/wav; codecs\x3d"1"',"audio/wav","audio/wave","audio/x-wav"],required:!1}};this.movieID="sm2-container";this.id=wa||"sm2movie";this.debugID="soundmanager-debug";this.debugURLParam=/([#?&])debug=1/i;this.versionNumber="V2.97a.20130512";this.altURL=this.movieURL=this.version=null;this.enabled=this.swfLoaded=!1;this.oMC=null;this.sounds={};this.soundIDs=[];this.didFlashBlock=this.muted=!1;this.filePattern=null;this.filePatterns= -{flash8:/\.mp3(\?.*)?$/i,flash9:/\.mp3(\?.*)?$/i};this.features={buffering:!1,peakData:!1,waveformData:!1,eqData:!1,movieStar:!1};this.sandbox={type:null,types:{remote:"remote (domain-based) rules",localWithFile:"local with file access (no internet access)",localWithNetwork:"local with network (internet access only, no local access)",localTrusted:"local, trusted (local+internet access)"},description:null,noRemote:null,noLocal:null};this.html5={usingFlash:null};this.flash={};this.ignoreFlash=this.html5Only= -!1;var Ua,c=this,Va=null,k=null,rb="HTML5::",A,t=navigator.userAgent,U=h.location.href.toString(),m=document,xa,Wa,ya,n,F=[],za=!0,C,V=!1,W=!1,q=!1,y=!1,ha=!1,p,sb=0,X,B,Aa,O,Ba,M,P,Q,Xa,Ca,ia,I,ja,Da,R,Ea,Y,ka,la,S,Ya,Fa,Za=["log","info","warn","error"],$a,Ga,ab,Z=null,Ha=null,r,Ia,T,bb,ma,na,J,v,$=!1,Ja=!1,cb,db,eb,oa=0,aa=null,pa,N=[],qa,u=null,fb,ra,ba,K,sa,Ka,gb,w,hb=Array.prototype.slice,E=!1,La,H,Ma,ib,G,jb,Na,ta,kb=0,ca=t.match(/(ipad|iphone|ipod)/i),lb=t.match(/android/i),L=t.match(/msie/i), -tb=t.match(/webkit/i),ua=t.match(/safari/i)&&!t.match(/chrome/i),Oa=t.match(/opera/i),ub=t.match(/firefox/i),Pa=t.match(/(mobile|pre\/|xoom)/i)||ca||lb,Qa=!U.match(/usehtml5audio/i)&&!U.match(/sm2\-ignorebadua/i)&&ua&&!t.match(/silk/i)&&t.match(/OS X 10_6_([3-7])/i),da=h.console!==g&&console.log!==g,Ra=m.hasFocus!==g?m.hasFocus():null,va=ua&&(m.hasFocus===g||!m.hasFocus()),mb=!va,nb=/(mp3|mp4|mpa|m4a|m4b)/i,ea=m.location?m.location.protocol.match(/http/i):null,ob=!ea?"http://":"",pb=/^\s*audio\/(?:x-)?(?:mpeg4|aac|flv|mov|mp4||m4v|m4a|m4b|mp4v|3gp|3g2)\s*(?:$|;)/i, -qb="mpeg4 aac flv mov mp4 m4v f4v m4a m4b mp4v 3gp 3g2".split(" "),vb=RegExp("\\.("+qb.join("|")+")(\\?.*)?$","i");this.mimePattern=/^\s*audio\/(?:x-)?(?:mp(?:eg|3))\s*(?:$|;)/i;this.useAltURL=!ea;var Sa;try{Sa=Audio!==g&&(Oa&&opera!==g&&10>opera.version()?new Audio(null):new Audio).canPlayType!==g}catch(wb){Sa=!1}this.hasHTML5=Sa;this.setup=function(b){var d=!c.url;b!==g&&(q&&u&&c.ok()&&(b.flashVersion!==g||b.url!==g||b.html5Test!==g))&&J(r("setupLate"));Aa(b);b&&(d&&(Y&&b.url!==g)&&c.beginDelayedInit(), -!Y&&(b.url!==g&&"complete"===m.readyState)&&setTimeout(R,1));return c};this.supported=this.ok=function(){return u?q&&!y:c.useHTML5Audio&&c.hasHTML5};this.getMovie=function(c){return A(c)||m[c]||h[c]};this.createSound=function(b,d){function e(){f=ma(f);c.sounds[f.id]=new Ua(f);c.soundIDs.push(f.id);return c.sounds[f.id]}var a,f;a=null;a="soundManager.createSound(): "+r(!q?"notReady":"notOK");if(!q||!c.ok())return J(a),!1;d!==g&&(b={id:b,url:d});f=B(b);f.url=pa(f.url);void 0===f.id&&(f.id=c.setupOptions.idPrefix+ -kb++);f.id.toString().charAt(0).match(/^[0-9]$/)&&c._wD("soundManager.createSound(): "+r("badID",f.id),2);c._wD("soundManager.createSound(): "+f.id+(f.url?" ("+f.url+")":""),1);if(v(f.id,!0))return c._wD("soundManager.createSound(): "+f.id+" exists",1),c.sounds[f.id];if(ra(f))a=e(),c._wD(f.id+": Using HTML5"),a._setup_html5(f);else{if(c.html5Only)return c._wD(f.id+": No HTML5 support for this sound, and no Flash. Exiting."),e();if(c.html5.usingFlash&&f.url&&f.url.match(/data\:/i))return c._wD(f.id+ -": data: URIs not supported via Flash. Exiting."),e();8a.instanceCount?(m(),e=a._setup_html5(),a.setPosition(a._iO.position),e.play()):(c._wD(a.id+": Cloning Audio() for instance #"+a.instanceCount+"..."),l=new Audio(a._iO.url),z=function(){w.remove(l,"onended",z);a._onfinish(a);sa(l);l=null},h=function(){w.remove(l,"canplay",h);try{l.currentTime=a._iO.position/1E3}catch(c){J(a.id+": multiShot play() failed to apply position of "+a._iO.position/1E3)}l.play()},w.add(l,"ended",z),a._iO.position? -w.add(l,"canplay",h):l.play()):(x=k._start(a.id,a._iO.loops||1,9===n?a.position:a.position/1E3,a._iO.multiShot||!1),9===n&&!x&&(c._wD(e+"No sound hardware, or 32-sound ceiling hit",2),a._iO.onplayerror&&a._iO.onplayerror.apply(a)))}return a};this.stop=function(b){var d=a._iO;1===a.playState&&(c._wD(a.id+": stop()"),a._onbufferchange(0),a._resetOnPosition(0),a.paused=!1,a.isHTML5||(a.playState=0),Ta(),d.to&&a.clearOnPosition(d.to),a.isHTML5?a._a&&(b=a.position,a.setPosition(0),a.position=b,a._a.pause(), -a.playState=0,a._onTimer(),l()):(k._stop(a.id,b),d.serverURL&&a.unload()),a.instanceCount=0,a._iO={},d.onstop&&d.onstop.apply(a));return a};this.setAutoPlay=function(b){c._wD(a.id+": Autoplay turned "+(b?"on":"off"));a._iO.autoPlay=b;a.isHTML5||(k._setAutoPlay(a.id,b),b&&(!a.instanceCount&&1===a.readyState)&&(a.instanceCount++,c._wD(a.id+": Incremented instance count to "+a.instanceCount)))};this.getAutoPlay=function(){return a._iO.autoPlay};this.setPosition=function(b){b===g&&(b=0);var d=a.isHTML5? -Math.max(b,0):Math.min(a.duration||a._iO.duration,Math.max(b,0));a.position=d;b=a.position/1E3;a._resetOnPosition(a.position);a._iO.position=d;if(a.isHTML5){if(a._a){if(a._html5_canplay){if(a._a.currentTime!==b){c._wD(a.id+": setPosition("+b+")");try{a._a.currentTime=b,(0===a.playState||a.paused)&&a._a.pause()}catch(e){c._wD(a.id+": setPosition("+b+") failed: "+e.message,2)}}}else if(b)return c._wD(a.id+": setPosition("+b+"): Cannot seek yet, sound not ready",2),a;a.paused&&a._onTimer(!0)}}else b= -9===n?a.position:b,a.readyState&&2!==a.readyState&&k._setPosition(a.id,b,a.paused||!a.playState,a._iO.multiShot);return a};this.pause=function(b){if(a.paused||0===a.playState&&1!==a.readyState)return a;c._wD(a.id+": pause()");a.paused=!0;a.isHTML5?(a._setup_html5().pause(),l()):(b||b===g)&&k._pause(a.id,a._iO.multiShot);a._iO.onpause&&a._iO.onpause.apply(a);return a};this.resume=function(){var b=a._iO;if(!a.paused)return a;c._wD(a.id+": resume()");a.paused=!1;a.playState=1;a.isHTML5?(a._setup_html5().play(), -m()):(b.isMovieStar&&!b.serverURL&&a.setPosition(a.position),k._pause(a.id,b.multiShot));!s&&b.onplay?(b.onplay.apply(a),s=!0):b.onresume&&b.onresume.apply(a);return a};this.togglePause=function(){c._wD(a.id+": togglePause()");if(0===a.playState)return a.play({position:9===n&&!a.isHTML5?a.position:a.position/1E3}),a;a.paused?a.resume():a.pause();return a};this.setPan=function(b,c){b===g&&(b=0);c===g&&(c=!1);a.isHTML5||k._setPan(a.id,b);a._iO.pan=b;c||(a.pan=b,a.options.pan=b);return a};this.setVolume= -function(b,d){b===g&&(b=100);d===g&&(d=!1);a.isHTML5?a._a&&(a._a.volume=Math.max(0,Math.min(1,b/100))):k._setVolume(a.id,c.muted&&!a.muted||a.muted?0:b);a._iO.volume=b;d||(a.volume=b,a.options.volume=b);return a};this.mute=function(){a.muted=!0;a.isHTML5?a._a&&(a._a.muted=!0):k._setVolume(a.id,0);return a};this.unmute=function(){a.muted=!1;var b=a._iO.volume!==g;a.isHTML5?a._a&&(a._a.muted=!1):k._setVolume(a.id,b?a._iO.volume:a.options.volume);return a};this.toggleMute=function(){return a.muted?a.unmute(): -a.mute()};this.onposition=this.onPosition=function(b,c,d){D.push({position:parseInt(b,10),method:c,scope:d!==g?d:a,fired:!1});return a};this.clearOnPosition=function(a,b){var c;a=parseInt(a,10);if(isNaN(a))return!1;for(c=0;c=b)return!1;for(b-=1;0<=b;b--)c=D[b],!c.fired&&a.position>=c.position&&(c.fired=!0,t++,c.method.apply(c.scope,[c.position])); -return!0};this._resetOnPosition=function(a){var b,c;b=D.length;if(!b)return!1;for(b-=1;0<=b;b--)c=D[b],c.fired&&a<=c.position&&(c.fired=!1,t--);return!0};y=function(){var b=a._iO,d=b.from,e=b.to,f,g;g=function(){c._wD(a.id+': "To" time of '+e+" reached.");a.clearOnPosition(e,g);a.stop()};f=function(){c._wD(a.id+': Playing "from" '+d);if(null!==e&&!isNaN(e))a.onPosition(e,g)};null!==d&&!isNaN(d)&&(b.position=d,b.multiShot=!1,f());return b};q=function(){var b,c=a._iO.onposition;if(c)for(b in c)if(c.hasOwnProperty(b))a.onPosition(parseInt(b, -10),c[b])};Ta=function(){var b,c=a._iO.onposition;if(c)for(b in c)c.hasOwnProperty(b)&&a.clearOnPosition(parseInt(b,10))};m=function(){a.isHTML5&&cb(a)};l=function(){a.isHTML5&&db(a)};f=function(b){b||(D=[],t=0);s=!1;a._hasTimer=null;a._a=null;a._html5_canplay=!1;a.bytesLoaded=null;a.bytesTotal=null;a.duration=a._iO&&a._iO.duration?a._iO.duration:null;a.durationEstimate=null;a.buffered=[];a.eqData=[];a.eqData.left=[];a.eqData.right=[];a.failures=0;a.isBuffering=!1;a.instanceOptions={};a.instanceCount= -0;a.loaded=!1;a.metadata={};a.readyState=0;a.muted=!1;a.paused=!1;a.peakData={left:0,right:0};a.waveformData={left:[],right:[]};a.playState=0;a.position=null;a.id3={}};f();this._onTimer=function(b){var c,f=!1,g={};if(a._hasTimer||b){if(a._a&&(b||(0opera.version()?new Audio(null):new Audio,c=a._a,c._called_load=!1,E&&(Va=c);a.isHTML5=!0;a._a=c;c._s=a;h();a._apply_loop(c,b.loops);b.autoLoad||b.autoPlay?a.load():(c.autobuffer=!1,c.preload="auto");return c};h=function(){if(a._a._added_events)return!1;var b;a._a._added_events=!0;for(b in G)G.hasOwnProperty(b)&&a._a&&a._a.addEventListener(b,G[b],!1);return!0};z=function(){var b;c._wD(a.id+": Removing event listeners"); -a._a._added_events=!1;for(b in G)G.hasOwnProperty(b)&&a._a&&a._a.removeEventListener(b,G[b],!1)};this._onload=function(b){var d=!!b||!a.isHTML5&&8===n&&a.duration;b=a.id+": ";c._wD(b+(d?"onload()":"Failed to load / invalid sound?"+(!a.duration?" Zero-length duration reported.":" -")+" ("+a.url+")"),d?1:2);!d&&!a.isHTML5&&(!0===c.sandbox.noRemote&&c._wD(b+r("noNet"),1),!0===c.sandbox.noLocal&&c._wD(b+r("noLocal"),1));a.loaded=d;a.readyState=d?3:2;a._onbufferchange(0);a._iO.onload&&ta(a,function(){a._iO.onload.apply(a, -[d])});return!0};this._onbufferchange=function(b){if(0===a.playState||b&&a.isBuffering||!b&&!a.isBuffering)return!1;a.isBuffering=1===b;a._iO.onbufferchange&&(c._wD(a.id+": Buffer state change: "+b),a._iO.onbufferchange.apply(a));return!0};this._onsuspend=function(){a._iO.onsuspend&&(c._wD(a.id+": Playback suspended"),a._iO.onsuspend.apply(a));return!0};this._onfailure=function(b,d,e){a.failures++;c._wD(a.id+": Failures \x3d "+a.failures);if(a._iO.onfailure&&1===a.failures)a._iO.onfailure(a,b,d,e); -else c._wD(a.id+": Ignoring failure")};this._onfinish=function(){var b=a._iO.onfinish;a._onbufferchange(0);a._resetOnPosition(0);if(a.instanceCount&&(a.instanceCount--,a.instanceCount||(Ta(),a.playState=0,a.paused=!1,a.instanceCount=0,a.instanceOptions={},a._iO={},l(),a.isHTML5&&(a.position=0)),(!a.instanceCount||a._iO.multiShotEvents)&&b))c._wD(a.id+": onfinish()"),ta(a,function(){b.apply(a)})};this._whileloading=function(b,c,d,e){var f=a._iO;a.bytesLoaded=b;a.bytesTotal=c;a.duration=Math.floor(d); -a.bufferLength=e;a.durationEstimate=!a.isHTML5&&!f.isMovieStar?f.duration?a.duration>f.duration?a.duration:f.duration:parseInt(a.bytesTotal/a.bytesLoaded*a.duration,10):a.duration;a.isHTML5||(a.buffered=[{start:0,end:a.duration}]);(3!==a.readyState||a.isHTML5)&&f.whileloading&&f.whileloading.apply(a)};this._whileplaying=function(b,c,d,e,f){var l=a._iO;if(isNaN(b)||null===b)return!1;a.position=Math.max(0,b);a._processOnPosition();!a.isHTML5&&8opera.version()?new Audio(null):new Audio:null,e,a,f={},h;h=c.audioFormats;for(e in h)if(h.hasOwnProperty(e)&&(a="audio/"+e,f[e]=b(h[e].type),f[a]=f[e],e.match(nb)?(c.flash[e]=!0,c.flash[a]=!0):(c.flash[e]=!1,c.flash[a]=!1),h[e]&&h[e].related))for(a=h[e].related.length- -1;0<=a;a--)f["audio/"+h[e].related[a]]=f[e],c.html5[h[e].related[a]]=f[e],c.flash[h[e].related[a]]=f[e];f.canPlayType=d?b:null;c.html5=B(c.html5,f);c.html5.usingFlash=fb();u=c.html5.usingFlash;return!0};I={notReady:"Unavailable - wait until onready() has fired.",notOK:"Audio support is not available.",domError:"soundManagerexception caught while appending SWF to DOM.",spcWmode:"Removing wmode, preventing known SWF loading issue(s)",swf404:"soundManager: Verify that %s is a valid path.",tryDebug:"Try soundManager.debugFlash \x3d true for more security details (output goes to SWF.)", -checkSWF:"See SWF output for more debug info.",localFail:"soundManager: Non-HTTP page ("+m.location.protocol+" URL?) Review Flash player security settings for this special case:\nhttp://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager04.html\nMay need to add/allow path, eg. c:/sm2/ or /users/me/sm2/",waitFocus:"soundManager: Special case: Waiting for SWF to load with window focus...",waitForever:"soundManager: Waiting indefinitely for Flash (will recover if unblocked)...", -waitSWF:"soundManager: Waiting for 100% SWF load...",needFunction:"soundManager: Function object expected for %s",badID:'Sound ID "%s" should be a string, starting with a non-numeric character',currentObj:"soundManager: _debug(): Current sound objects",waitOnload:"soundManager: Waiting for window.onload()",docLoaded:"soundManager: Document already loaded",onload:"soundManager: initComplete(): calling soundManager.onload()",onloadOK:"soundManager.onload() complete",didInit:"soundManager: init(): Already called?", -secNote:"Flash security note: Network/internet URLs will not load due to security restrictions. Access can be configured via Flash Player Global Security Settings Page: http://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager04.html",badRemove:"soundManager: Failed to remove Flash node.",shutdown:"soundManager.disable(): Shutting down",queue:"soundManager: Queueing %s handler",smError:"SMSound.load(): Exception: JS-Flash communication failed, or JS error.",fbTimeout:"No flash response, applying .swf_timedout CSS...", -fbLoaded:"Flash loaded",fbHandler:"soundManager: flashBlockHandler()",manURL:"SMSound.load(): Using manually-assigned URL",onURL:"soundManager.load(): current URL already assigned.",badFV:'soundManager.flashVersion must be 8 or 9. "%s" is invalid. Reverting to %s.',as2loop:"Note: Setting stream:false so looping can work (flash 8 limitation)",noNSLoop:"Note: Looping not implemented for MovieStar formats",needfl9:"Note: Switching to flash 9, required for MP4 formats.",mfTimeout:"Setting flashLoadTimeout \x3d 0 (infinite) for off-screen, mobile flash case", -needFlash:"soundManager: Fatal error: Flash is needed to play some required formats, but is not available.",gotFocus:"soundManager: Got window focus.",policy:"Enabling usePolicyFile for data access",setup:"soundManager.setup(): allowed parameters: %s",setupError:'soundManager.setup(): "%s" cannot be assigned with this method.',setupUndef:'soundManager.setup(): Could not find option "%s"',setupLate:"soundManager.setup(): url, flashVersion and html5Test property changes will not take effect until reboot().", -noURL:"soundManager: Flash URL required. Call soundManager.setup({url:...}) to get started.",sm2Loaded:"SoundManager 2: Ready.",reset:"soundManager.reset(): Removing event callbacks",mobileUA:"Mobile UA detected, preferring HTML5 by default.",globalHTML5:"Using singleton HTML5 Audio() pattern for this device."};r=function(){var b=hb.call(arguments),c=b.shift(),c=I&&I[c]?I[c]:"",e,a;if(c&&b&&b.length){e=0;for(a=b.length;en)&&(c._wD(r("needfl9")),c.flashVersion=n=9);c.version=c.versionNumber+(c.html5Only?" (HTML5-only mode)": -9===n?" (AS3/Flash 9)":" (AS2/Flash 8)");8b&&(d= -!0));setTimeout(function(){b=c.getMoviePercent();if(d)return $=!1,c._wD(r("waitSWF")),h.setTimeout(Q,1),!1;q||(c._wD("soundManager: No Flash response within expected time. Likely causes: "+(0===b?"SWF load failed, ":"")+"Flash blocked or JS-Flash security error."+(c.debugFlash?" "+r("checkSWF"):""),2),!ea&&b&&(p("localFail",2),c.debugFlash||p("tryDebug",2)),0===b&&c._wD(r("swf404",c.url),1),C("flashtojs",!1,": Timed out"+ea?" (Check flash security or flash blockers)":" (No plugin/missing SWF?)")); -!q&&mb&&(null===b?c.useFlashBlock||0===c.flashLoadTimeout?(c.useFlashBlock&&Ia(),p("waitForever")):!c.useFlashBlock&&qa?h.setTimeout(function(){J("soundManager: useFlashBlock is false, 100% HTML5 mode is possible. Rebooting with preferFlash: false...");c.setup({preferFlash:!1}).reboot();c.didFlashBlock=!0;c.beginDelayedInit()},1):(p("waitForever"),M({type:"ontimeout",ignoreInit:!0})):0===c.flashLoadTimeout?p("waitForever"):Ga(!0))},c.flashLoadTimeout)};ia=function(){if(Ra||!va)return w.remove(h,"focus", -ia),!0;Ra=mb=!0;p("gotFocus");$=!1;Q();w.remove(h,"focus",ia);return!0};Na=function(){N.length&&(c._wD("SoundManager 2: "+N.join(" "),1),N=[])};jb=function(){Na();var b,d=[];if(c.useHTML5Audio&&c.hasHTML5){for(b in c.audioFormats)c.audioFormats.hasOwnProperty(b)&&d.push(b+" \x3d "+c.html5[b]+(!c.html5[b]&&u&&c.flash[b]?" (using flash)":c.preferFlash&&c.flash[b]&&u?" (preferring flash)":!c.html5[b]?" ("+(c.audioFormats[b].required?"required, ":"")+"and no flash support)":""));c._wD("SoundManager 2 HTML5 support: "+ -d.join(", "),1)}};X=function(b){if(q)return!1;if(c.html5Only)return p("sm2Loaded"),q=!0,P(),C("onload",!0),!0;var d=!0,e;if(!c.useFlashBlock||!c.flashLoadTimeout||c.getMoviePercent())q=!0,y&&(e={type:!H&&u?"NO_FLASH":"INIT_TIMEOUT"});c._wD("SoundManager 2 "+(y?"failed to load":"loaded")+" ("+(y?"Flash security/load error":"OK")+")",y?2:1);y||b?(c.useFlashBlock&&c.oMC&&(c.oMC.className=T()+" "+(null===c.getMoviePercent()?"swf_timedout":"swf_error")),M({type:"ontimeout",error:e,ignoreInit:!0}),C("onload", -!1),S(e),d=!1):C("onload",!0);y||(c.waitForWindowLoad&&!ha?(p("waitOnload"),w.add(h,"load",P)):(c.waitForWindowLoad&&ha&&p("docLoaded"),P()));return d};Wa=function(){var b,d=c.setupOptions;for(b in d)d.hasOwnProperty(b)&&(c[b]===g?c[b]=d[b]:c[b]!==d[b]&&(c.setupOptions[b]=c[b]))};ya=function(){if(q)return p("didInit"),!1;if(c.html5Only)return q||(w.remove(h,"load",c.beginDelayedInit),c.enabled=!0,X()),!0;ja();try{k._externalInterfaceTest(!1),Ya(!0,c.flashPollingInterval||(c.useHighPerformance?10: -50)),c.debugMode||k._disableDebug(),c.enabled=!0,C("jstoflash",!0),c.html5Only||w.add(h,"unload",xa)}catch(b){return c._wD("js/flash exception: "+b.toString()),C("jstoflash",!1),S({type:"JS_TO_FLASH_EXCEPTION",fatal:!0}),Ga(!0),X(),!1}X();w.remove(h,"load",c.beginDelayedInit);return!0};R=function(){if(Y)return!1;Y=!0;Wa();Fa();var b=null,b=null,d=U.toLowerCase();-1!==d.indexOf("sm2-usehtml5audio\x3d")&&(b="1"===d.charAt(d.indexOf("sm2-usehtml5audio\x3d")+18),da&&console.log((b?"Enabling ":"Disabling ")+ -"useHTML5Audio via URL parameter"),c.setup({useHTML5Audio:b}));-1!==d.indexOf("sm2-preferflash\x3d")&&(b="1"===d.charAt(d.indexOf("sm2-preferflash\x3d")+16),da&&console.log((b?"Enabling ":"Disabling ")+"preferFlash via URL parameter"),c.setup({preferFlash:b}));!H&&c.hasHTML5&&(c._wD("SoundManager: No Flash detected"+(!c.useHTML5Audio?", enabling HTML5.":". Trying HTML5-only mode."),1),c.setup({useHTML5Audio:!0,preferFlash:!1}));gb();!H&&u&&(N.push(I.needFlash),c.setup({flashLoadTimeout:1}));m.removeEventListener&& -m.removeEventListener("DOMContentLoaded",R,!1);ja();return!0};Ka=function(){"complete"===m.readyState&&(R(),m.detachEvent("onreadystatechange",Ka));return!0};Ea=function(){ha=!0;w.remove(h,"load",Ea)};Da=function(){if(Pa&&((!c.setupOptions.useHTML5Audio||c.setupOptions.preferFlash)&&N.push(I.mobileUA),c.setupOptions.useHTML5Audio=!0,c.setupOptions.preferFlash=!1,ca||lb&&!t.match(/android\s2\.3/i)))N.push(I.globalHTML5),ca&&(c.ignoreFlash=!0),E=!0};Da();Ma();w.add(h,"focus",ia);w.add(h,"load",Q);w.add(h, -"load",Ea);m.addEventListener?m.addEventListener("DOMContentLoaded",R,!1):m.attachEvent?m.attachEvent("onreadystatechange",Ka):(C("onload",!1),S({type:"NO_DOM2_EVENTS",fatal:!0}))}var wa=null;if(void 0===h.SM2_DEFER||!SM2_DEFER)wa=new fa;h.SoundManager=fa;h.soundManager=wa})(window); \ No newline at end of file diff --git a/html/webapp/soundmanager2-setup.js b/html/webapp/soundmanager2-setup.js deleted file mode 100644 index 4d0ac66..0000000 --- a/html/webapp/soundmanager2-setup.js +++ /dev/null @@ -1 +0,0 @@ -window.SM2_DEFER = true; \ No newline at end of file diff --git a/html/webapp/styles.css b/html/webapp/styles.css deleted file mode 100644 index f823a7a..0000000 --- a/html/webapp/styles.css +++ /dev/null @@ -1,91 +0,0 @@ -canvas { - cursor: default; - outline: none; -} - -body { - background-color: #ffffff; -} - -.superdev { - background-color:#3bb3e0; - font-family: 'Open Sans', sans-serif; - font-size:12px; - text-decoration:none; - color:#fff; - position:relative; - padding:10px 20px; - padding-right:50px; - background-image: linear-gradient(bottom, rgb(44,160,202) 0%, rgb(62,184,229) 100%); - background-image: -o-linear-gradient(bottom, rgb(44,160,202) 0%, rgb(62,184,229) 100%); - background-image: -moz-linear-gradient(bottom, rgb(44,160,202) 0%, rgb(62,184,229) 100%); - background-image: -webkit-linear-gradient(bottom, rgb(44,160,202) 0%, rgb(62,184,229) 100%); - background-image: -ms-linear-gradient(bottom, rgb(44,160,202) 0%, rgb(62,184,229) 100%); - background-image: -webkit-gradient( - linear, - left bottom, - left top, - color-stop(0, rgb(44,160,202)), - color-stop(1, rgb(62,184,229)) - ); - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - -o-border-radius: 5px; - border-radius: 5px; - -webkit-box-shadow: inset 0px 1px 0px #2ab7ec, 0px 5px 0px 0px #156785, 0px 10px 5px #999; - -moz-box-shadow: inset 0px 1px 0px #2ab7ec, 0px 5px 0px 0px #156785, 0px 10px 5px #999; - -o-box-shadow: inset 0px 1px 0px #2ab7ec, 0px 5px 0px 0px #156785, 0px 10px 5px #999; - box-shadow: inset 0px 1px 0px #2ab7ec, 0px 5px 0px 0px #156785, 0px 10px 5px #999; -} - -.superdev:active { - top:3px; - background-image: linear-gradient(bottom, rgb(62,184,229) 0%, rgb(44,160,202) 100%); - background-image: -o-linear-gradient(bottom, rgb(62,184,229) 0%, rgb(44,160,202) 100%); - background-image: -moz-linear-gradient(bottom, rgb(62,184,229) 0%, rgb(44,160,202) 100%); - background-image: -webkit-linear-gradient(bottom, rgb(62,184,229) 0%, rgb(44,160,202) 100%); - background-image: -ms-linear-gradient(bottom, rgb(62,184,229) 0%, rgb(44,160,202) 100%); - background-image: -webkit-gradient( - linear, - left bottom, - left top, - color-stop(0, rgb(62,184,229)), - color-stop(1, rgb(44,160,202)) - ); - -webkit-box-shadow: inset 0px 1px 0px #2ab7ec, 0px 2px 0px 0px #156785, 0px 5px 3px #999; - -moz-box-shadow: inset 0px 1px 0px #2ab7ec, 0px 2px 0px 0px #156785, 0px 5px 3px #999; - -o-box-shadow: inset 0px 1px 0px #2ab7ec, 0px 2px 0px 0px #156785, 0px 5px 3px #999; - box-shadow: inset 0px 1px 0px #2ab7ec, 0px 2px 0px 0px #156785, 0px 5px 3px #999; -} - -.superdev::before { - background-color:#2591b4; - background-image:url(refresh.png); - background-size: 12px; - background-repeat:no-repeat; - background-position:center center; - content:""; - width:20px; - height:20px; - position:absolute; - right:15px; - top:50%; - margin-top:-9px; - -webkit-border-radius: 50%; - -moz-border-radius: 50%; - -o-border-radius: 50%; - border-radius: 50%; - -webkit-box-shadow: inset 0px 1px 0px #052756, 0px 1px 0px #60c9f0; - -moz-box-shadow: inset 0px 1px 0px #052756, 0px 1px 0px #60c9f0; - -o-box-shadow: inset 0px 1px 0px #052756, 0px 1px 0px #60c9f0; - box-shadow: inset 0px 1px 0px #052756, 0px 1px 0px #60c9f0; -} - -.superdev:active::before { - top:50%; - margin-top:-12px; - -webkit-box-shadow: inset 0px 1px 0px #60c9f0, 0px 3px 0px #0e3871, 0px 6px 3px #1a80a6; - -moz-box-shadow: inset 0px 1px 0px #60c9f0, 0px 3px 0px #0e3871, 0px 6px 3px #1a80a6; - -o-box-shadow: inset 0px 1px 0px #60c9f0, 0px 3px 0px #0e3871, 0px 6px 3px #1a80a6; - box-shadow: inset 0px 1px 0px #60c9f0, 0px 3px 0px #0e3871, 0px 6px 3px #1a80a6; -} \ No newline at end of file diff --git a/ios/Info.plist.xml b/ios/Info.plist.xml index 9842ae2..b56e278 100644 --- a/ios/Info.plist.xml +++ b/ios/Info.plist.xml @@ -28,6 +28,8 @@ UIStatusBarHidden + MinimumOSVersion + 11.0 UIDeviceFamily 1 @@ -35,15 +37,17 @@ UIRequiredDeviceCapabilities - armv7 opengles-2 UISupportedInterfaceOrientations UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + UILaunchStoryboardName + LaunchScreen CFBundleIconName AppIcon diff --git a/ios/build.gradle b/ios/build.gradle index 6b58b46..f63f84d 100644 --- a/ios/build.gradle +++ b/ios/build.gradle @@ -1,6 +1,6 @@ sourceSets.main.java.srcDirs = [ "src/" ] -sourceCompatibility = '1.7' +sourceCompatibility = '1.8' [compileJava, compileTestJava]*.options*.encoding = 'UTF-8' ext { @@ -13,7 +13,7 @@ launchIOSDevice.dependsOn build createIPA.dependsOn build robovm { - archs = "thumbv7:arm64" + archs = "arm64" } -eclipse.project.name = appName + "-ios" \ No newline at end of file +eclipse.project.name = appName + "-ios" diff --git a/ios/data/Base.lproj/LaunchScreen.storyboard b/ios/data/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..5fb346b --- /dev/null +++ b/ios/data/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/data/Default-375w-667h@2x.png b/ios/data/Default-375w-667h@2x.png deleted file mode 100644 index f213ce6..0000000 Binary files a/ios/data/Default-375w-667h@2x.png and /dev/null differ diff --git a/ios/data/Default-414w-736h@3x.png b/ios/data/Default-414w-736h@3x.png deleted file mode 100644 index 685ba51..0000000 Binary files a/ios/data/Default-414w-736h@3x.png and /dev/null differ 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/data/Media.xcassets/AppIcon.appiconset/Contents.json b/ios/data/Media.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..9ed19e1 --- /dev/null +++ b/ios/data/Media.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "iphone-notification-icon-20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "iphone-notification-icon-20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "iphone-spotlight-settings-icon-29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "iphone-spotlight-settings-icon-29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "iphone-spotlight-icon-40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "iphone-spotlight-icon-40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "iphone-app-icon-60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "iphone-app-icon-60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "ipad-notifications-icon-20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "ipad-notifications-icon-20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "ipad-settings-icon-29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "ipad-settings-icon-29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "ipad-spotlight-icon-40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "ipad-spotlight-icon-40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "ipad-app-icon-76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "ipad-app-icon-76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "ipad-pro-app-icon-83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "app-store-icon-1024@1x.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/data/Media.xcassets/AppIcon.appiconset/app-store-icon-1024@1x.png b/ios/data/Media.xcassets/AppIcon.appiconset/app-store-icon-1024@1x.png new file mode 100644 index 0000000..b4a987c Binary files /dev/null and b/ios/data/Media.xcassets/AppIcon.appiconset/app-store-icon-1024@1x.png differ diff --git a/ios/data/Media.xcassets/AppIcon.appiconset/ipad-app-icon-76@1x.png b/ios/data/Media.xcassets/AppIcon.appiconset/ipad-app-icon-76@1x.png new file mode 100644 index 0000000..d425b2f Binary files /dev/null and b/ios/data/Media.xcassets/AppIcon.appiconset/ipad-app-icon-76@1x.png differ diff --git a/ios/data/Media.xcassets/AppIcon.appiconset/ipad-app-icon-76@2x.png b/ios/data/Media.xcassets/AppIcon.appiconset/ipad-app-icon-76@2x.png new file mode 100644 index 0000000..192460f Binary files /dev/null and b/ios/data/Media.xcassets/AppIcon.appiconset/ipad-app-icon-76@2x.png differ diff --git a/ios/data/Media.xcassets/AppIcon.appiconset/ipad-notifications-icon-20@1x.png b/ios/data/Media.xcassets/AppIcon.appiconset/ipad-notifications-icon-20@1x.png new file mode 100644 index 0000000..3ad5eb6 Binary files /dev/null and b/ios/data/Media.xcassets/AppIcon.appiconset/ipad-notifications-icon-20@1x.png differ diff --git a/ios/data/Media.xcassets/AppIcon.appiconset/ipad-notifications-icon-20@2x.png b/ios/data/Media.xcassets/AppIcon.appiconset/ipad-notifications-icon-20@2x.png new file mode 100644 index 0000000..0dbad45 Binary files /dev/null and b/ios/data/Media.xcassets/AppIcon.appiconset/ipad-notifications-icon-20@2x.png differ diff --git a/ios/data/Media.xcassets/AppIcon.appiconset/ipad-pro-app-icon-83.5@2x.png b/ios/data/Media.xcassets/AppIcon.appiconset/ipad-pro-app-icon-83.5@2x.png new file mode 100644 index 0000000..0710fdb Binary files /dev/null and b/ios/data/Media.xcassets/AppIcon.appiconset/ipad-pro-app-icon-83.5@2x.png differ diff --git a/ios/data/Media.xcassets/AppIcon.appiconset/ipad-settings-icon-29@1x.png b/ios/data/Media.xcassets/AppIcon.appiconset/ipad-settings-icon-29@1x.png new file mode 100644 index 0000000..949fbaa Binary files /dev/null and b/ios/data/Media.xcassets/AppIcon.appiconset/ipad-settings-icon-29@1x.png differ diff --git a/ios/data/Media.xcassets/AppIcon.appiconset/ipad-settings-icon-29@2x.png b/ios/data/Media.xcassets/AppIcon.appiconset/ipad-settings-icon-29@2x.png new file mode 100644 index 0000000..0a82ae9 Binary files /dev/null and b/ios/data/Media.xcassets/AppIcon.appiconset/ipad-settings-icon-29@2x.png differ diff --git a/ios/data/Media.xcassets/AppIcon.appiconset/ipad-spotlight-icon-40@1x.png b/ios/data/Media.xcassets/AppIcon.appiconset/ipad-spotlight-icon-40@1x.png new file mode 100644 index 0000000..0dbad45 Binary files /dev/null and b/ios/data/Media.xcassets/AppIcon.appiconset/ipad-spotlight-icon-40@1x.png differ diff --git a/ios/data/Media.xcassets/AppIcon.appiconset/ipad-spotlight-icon-40@2x.png b/ios/data/Media.xcassets/AppIcon.appiconset/ipad-spotlight-icon-40@2x.png new file mode 100644 index 0000000..4fc801a Binary files /dev/null and b/ios/data/Media.xcassets/AppIcon.appiconset/ipad-spotlight-icon-40@2x.png differ diff --git a/ios/data/Media.xcassets/AppIcon.appiconset/iphone-app-icon-60@2x.png b/ios/data/Media.xcassets/AppIcon.appiconset/iphone-app-icon-60@2x.png new file mode 100644 index 0000000..4ce7690 Binary files /dev/null and b/ios/data/Media.xcassets/AppIcon.appiconset/iphone-app-icon-60@2x.png differ diff --git a/ios/data/Media.xcassets/AppIcon.appiconset/iphone-app-icon-60@3x.png b/ios/data/Media.xcassets/AppIcon.appiconset/iphone-app-icon-60@3x.png new file mode 100644 index 0000000..a0a4ae4 Binary files /dev/null and b/ios/data/Media.xcassets/AppIcon.appiconset/iphone-app-icon-60@3x.png differ diff --git a/ios/data/Media.xcassets/AppIcon.appiconset/iphone-notification-icon-20@2x.png b/ios/data/Media.xcassets/AppIcon.appiconset/iphone-notification-icon-20@2x.png new file mode 100644 index 0000000..0dbad45 Binary files /dev/null and b/ios/data/Media.xcassets/AppIcon.appiconset/iphone-notification-icon-20@2x.png differ diff --git a/ios/data/Media.xcassets/AppIcon.appiconset/iphone-notification-icon-20@3x.png b/ios/data/Media.xcassets/AppIcon.appiconset/iphone-notification-icon-20@3x.png new file mode 100644 index 0000000..b4fc090 Binary files /dev/null and b/ios/data/Media.xcassets/AppIcon.appiconset/iphone-notification-icon-20@3x.png differ diff --git a/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-icon-40@2x.png b/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-icon-40@2x.png new file mode 100644 index 0000000..4fc801a Binary files /dev/null and b/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-icon-40@2x.png differ diff --git a/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-icon-40@3x.png b/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-icon-40@3x.png new file mode 100644 index 0000000..4ce7690 Binary files /dev/null and b/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-icon-40@3x.png differ diff --git a/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-settings-icon-29@2x.png b/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-settings-icon-29@2x.png new file mode 100644 index 0000000..0a82ae9 Binary files /dev/null and b/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-settings-icon-29@2x.png differ diff --git a/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-settings-icon-29@3x.png b/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-settings-icon-29@3x.png new file mode 100644 index 0000000..eb0446e Binary files /dev/null and b/ios/data/Media.xcassets/AppIcon.appiconset/iphone-spotlight-settings-icon-29@3x.png differ diff --git a/ios/data/Media.xcassets/Contents.json b/ios/data/Media.xcassets/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/ios/data/Media.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/ios/data/Media.xcassets/Logo.imageset/Contents.json b/ios/data/Media.xcassets/Logo.imageset/Contents.json new file mode 100644 index 0000000..1a13499 --- /dev/null +++ b/ios/data/Media.xcassets/Logo.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "libgdx@1x.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "libgdx@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "libgdx@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ios/data/Media.xcassets/Logo.imageset/libgdx@1x.png b/ios/data/Media.xcassets/Logo.imageset/libgdx@1x.png new file mode 100644 index 0000000..22c41cb Binary files /dev/null and b/ios/data/Media.xcassets/Logo.imageset/libgdx@1x.png differ diff --git a/ios/data/Media.xcassets/Logo.imageset/libgdx@2x.png b/ios/data/Media.xcassets/Logo.imageset/libgdx@2x.png new file mode 100644 index 0000000..d077d74 Binary files /dev/null and b/ios/data/Media.xcassets/Logo.imageset/libgdx@2x.png differ diff --git a/ios/data/Media.xcassets/Logo.imageset/libgdx@3x.png b/ios/data/Media.xcassets/Logo.imageset/libgdx@3x.png new file mode 100644 index 0000000..e1d7262 Binary files /dev/null and b/ios/data/Media.xcassets/Logo.imageset/libgdx@3x.png differ diff --git a/ios/robovm.xml b/ios/robovm.xml index 0f18d46..e9a67bc 100644 --- a/ios/robovm.xml +++ b/ios/robovm.xml @@ -2,12 +2,12 @@ ${app.executable} ${app.mainclass} ios - thumbv7 ios Info.plist.xml + conservative - ../android/assets + ../assets ** @@ -19,7 +19,7 @@ com.badlogic.gdx.scenes.scene2d.ui.* - com.badlogic.gdx.physics.bullet.** + com.badlogic.gdx.graphics.g3d.particles.** com.android.okhttp.HttpHandler com.android.okhttp.HttpsHandler com.android.org.conscrypt.** @@ -33,16 +33,15 @@ org.apache.harmony.security.provider.crypto.CryptoProvider - build/libs/ios/libgdx.a - build/libs/ios/libObjectAL.a + z UIKit - OpenGLES QuartzCore CoreGraphics OpenAL AudioToolbox AVFoundation + GameController diff --git a/ios/src/com/senegas/kickoff/IOSLauncher.java b/ios/src/com/senegas/kickoff/IOSLauncher.java index a87a6f0..e38e639 100644 --- a/ios/src/com/senegas/kickoff/IOSLauncher.java +++ b/ios/src/com/senegas/kickoff/IOSLauncher.java @@ -19,4 +19,4 @@ public static void main(String[] argv) { UIApplication.main(argv, null, IOSLauncher.class); pool.close(); } -} \ No newline at end of file +} diff --git a/settings.gradle b/settings.gradle index 965b6a3..61be2f7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include 'desktop', 'android', 'ios', 'html', 'core' \ No newline at end of file +include 'desktop', 'android', 'ios', 'core' \ No newline at end of file