diff --git a/android/game.apk b/android/game.apk index f6edeaa..9482ce9 100644 Binary files a/android/game.apk and b/android/game.apk differ diff --git a/android/game.love b/android/game.love index a6081bf..7c171f2 100644 Binary files a/android/game.love and b/android/game.love differ diff --git a/android/tools/love-android-sdl2/AndroidManifest.xml b/android/tools/love-android-sdl2/AndroidManifest.xml index 3e7d9a7..68a6909 100644 --- a/android/tools/love-android-sdl2/AndroidManifest.xml +++ b/android/tools/love-android-sdl2/AndroidManifest.xml @@ -1,5 +1,5 @@ - @@ -12,13 +12,13 @@ diff --git a/android/tools/love-android-sdl2/assets/game.love b/android/tools/love-android-sdl2/assets/game.love index a6081bf..7c171f2 100644 Binary files a/android/tools/love-android-sdl2/assets/game.love and b/android/tools/love-android-sdl2/assets/game.love differ diff --git a/android/tools/love-android-sdl2/bin/AndroidManifest.xml b/android/tools/love-android-sdl2/bin/AndroidManifest.xml index 3e7d9a7..68a6909 100644 --- a/android/tools/love-android-sdl2/bin/AndroidManifest.xml +++ b/android/tools/love-android-sdl2/bin/AndroidManifest.xml @@ -1,5 +1,5 @@ - @@ -12,13 +12,13 @@ diff --git a/android/tools/love-android-sdl2/bin/build.prop b/android/tools/love-android-sdl2/bin/build.prop index d706830..9f0b514 100644 --- a/android/tools/love-android-sdl2/bin/build.prop +++ b/android/tools/love-android-sdl2/bin/build.prop @@ -1,5 +1,5 @@ #Last build type -#Tue, 03 Jan 2017 23:46:23 +0100 +#Tue, 03 Jan 2017 23:52:00 +0100 build.last.target=debug diff --git a/android/tools/love-android-sdl2/bin/classes.dex b/android/tools/love-android-sdl2/bin/classes.dex index fff892f..3457baa 100644 Binary files a/android/tools/love-android-sdl2/bin/classes.dex and b/android/tools/love-android-sdl2/bin/classes.dex differ diff --git a/android/tools/love-android-sdl2/bin/classes.dex.d b/android/tools/love-android-sdl2/bin/classes.dex.d index b63cba1..218115b 100644 --- a/android/tools/love-android-sdl2/bin/classes.dex.d +++ b/android/tools/love-android-sdl2/bin/classes.dex.d @@ -1,9 +1,9 @@ /Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes.dex : \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android0103234617/BuildConfig.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android0103234617/LtaActivity.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android0103234617/R$attr.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android0103234617/R$drawable.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android0103234617/R.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android0103235155/BuildConfig.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android0103235155/LtaActivity.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android0103235155/R$attr.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android0103235155/R$drawable.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android0103235155/R.class \ /Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/DummyEdit.class \ /Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$1.class \ /Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$2.class \ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android0103234617/R$attr.class b/android/tools/love-android-sdl2/bin/classes/love/to/android0103234617/R$attr.class deleted file mode 100644 index 76a621e..0000000 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android0103234617/R$attr.class and /dev/null differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android0103234617/BuildConfig.class b/android/tools/love-android-sdl2/bin/classes/love/to/android0103235155/BuildConfig.class similarity index 74% rename from android/tools/love-android-sdl2/bin/classes/love/to/android0103234617/BuildConfig.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android0103235155/BuildConfig.class index 23e9b97..b3e3996 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android0103234617/BuildConfig.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android0103235155/BuildConfig.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android0103234617/LtaActivity.class b/android/tools/love-android-sdl2/bin/classes/love/to/android0103235155/LtaActivity.class similarity index 62% rename from android/tools/love-android-sdl2/bin/classes/love/to/android0103234617/LtaActivity.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android0103235155/LtaActivity.class index 30bca49..6699234 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android0103234617/LtaActivity.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android0103235155/LtaActivity.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android0103235155/R$attr.class b/android/tools/love-android-sdl2/bin/classes/love/to/android0103235155/R$attr.class new file mode 100644 index 0000000..14f58cf Binary files /dev/null and b/android/tools/love-android-sdl2/bin/classes/love/to/android0103235155/R$attr.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android0103234617/R$drawable.class b/android/tools/love-android-sdl2/bin/classes/love/to/android0103235155/R$drawable.class similarity index 56% rename from android/tools/love-android-sdl2/bin/classes/love/to/android0103234617/R$drawable.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android0103235155/R$drawable.class index f91ae39..44129b5 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android0103234617/R$drawable.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android0103235155/R$drawable.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android0103234617/R.class b/android/tools/love-android-sdl2/bin/classes/love/to/android0103235155/R.class similarity index 63% rename from android/tools/love-android-sdl2/bin/classes/love/to/android0103234617/R.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android0103235155/R.class index 2e15eb4..806422e 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android0103234617/R.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android0103235155/R.class differ diff --git a/android/tools/love-android-sdl2/bin/love_android_sdl2-debug-unaligned.apk b/android/tools/love-android-sdl2/bin/love_android_sdl2-debug-unaligned.apk index e11a4e7..c108310 100644 Binary files a/android/tools/love-android-sdl2/bin/love_android_sdl2-debug-unaligned.apk and b/android/tools/love-android-sdl2/bin/love_android_sdl2-debug-unaligned.apk differ diff --git a/android/tools/love-android-sdl2/bin/love_android_sdl2-debug.apk b/android/tools/love-android-sdl2/bin/love_android_sdl2-debug.apk index f6edeaa..9482ce9 100644 Binary files a/android/tools/love-android-sdl2/bin/love_android_sdl2-debug.apk and b/android/tools/love-android-sdl2/bin/love_android_sdl2-debug.apk differ diff --git a/android/tools/love-android-sdl2/bin/love_android_sdl2.ap_ b/android/tools/love-android-sdl2/bin/love_android_sdl2.ap_ index 41b135a..147e29d 100644 Binary files a/android/tools/love-android-sdl2/bin/love_android_sdl2.ap_ and b/android/tools/love-android-sdl2/bin/love_android_sdl2.ap_ differ diff --git a/android/tools/love-android-sdl2/bin/proguard.txt b/android/tools/love-android-sdl2/bin/proguard.txt index 415524b..f48d178 100644 --- a/android/tools/love-android-sdl2/bin/proguard.txt +++ b/android/tools/love-android-sdl2/bin/proguard.txt @@ -1,9 +1,9 @@ # view AndroidManifest.xml #generated:45 --keep class love.to.android0103234617.DownloadActivity { (...); } +-keep class love.to.android0103235155.DownloadActivity { (...); } # view AndroidManifest.xml #generated:17 --keep class love.to.android0103234617.DownloadService { (...); } +-keep class love.to.android0103235155.DownloadService { (...); } # view AndroidManifest.xml #generated:18 --keep class love.to.android0103234617.LtaActivity { (...); } +-keep class love.to.android0103235155.LtaActivity { (...); } diff --git a/android/tools/love-android-sdl2/gen/R.java.d b/android/tools/love-android-sdl2/gen/R.java.d index a6a51d0..735cf0d 100644 --- a/android/tools/love-android-sdl2/gen/R.java.d +++ b/android/tools/love-android-sdl2/gen/R.java.d @@ -1,3 +1,3 @@ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/gen/love/to/android0103234617/R.java \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/gen/love/to/android0103235155/R.java \ : /Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/res/drawable-xxhdpi/ic_launcher.png \ /Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/AndroidManifest.xml \ diff --git a/android/tools/love-android-sdl2/gen/love/to/android0103234617/BuildConfig.java b/android/tools/love-android-sdl2/gen/love/to/android0103235155/BuildConfig.java similarity index 79% rename from android/tools/love-android-sdl2/gen/love/to/android0103234617/BuildConfig.java rename to android/tools/love-android-sdl2/gen/love/to/android0103235155/BuildConfig.java index 13cc3d8..ab8b43b 100644 --- a/android/tools/love-android-sdl2/gen/love/to/android0103234617/BuildConfig.java +++ b/android/tools/love-android-sdl2/gen/love/to/android0103235155/BuildConfig.java @@ -1,5 +1,5 @@ /** Automatically generated file. DO NOT MODIFY */ -package love.to.android0103234617; +package love.to.android0103235155; public final class BuildConfig { public final static boolean DEBUG = true; diff --git a/android/tools/love-android-sdl2/gen/love/to/android0103234617/R.java b/android/tools/love-android-sdl2/gen/love/to/android0103235155/R.java similarity index 91% rename from android/tools/love-android-sdl2/gen/love/to/android0103234617/R.java rename to android/tools/love-android-sdl2/gen/love/to/android0103235155/R.java index 36da636..9b7091e 100644 --- a/android/tools/love-android-sdl2/gen/love/to/android0103234617/R.java +++ b/android/tools/love-android-sdl2/gen/love/to/android0103235155/R.java @@ -5,7 +5,7 @@ * should not be modified by hand. */ -package love.to.android0103234617; +package love.to.android0103235155; public final class R { public static final class attr { diff --git a/android/tools/love-android-sdl2/src/love/to/android0103234617/LtaActivity.java b/android/tools/love-android-sdl2/src/love/to/android0103235155/LtaActivity.java similarity index 69% rename from android/tools/love-android-sdl2/src/love/to/android0103234617/LtaActivity.java rename to android/tools/love-android-sdl2/src/love/to/android0103235155/LtaActivity.java index ab903bd..707deed 100644 --- a/android/tools/love-android-sdl2/src/love/to/android0103234617/LtaActivity.java +++ b/android/tools/love-android-sdl2/src/love/to/android0103235155/LtaActivity.java @@ -1,4 +1,4 @@ -package love.to.android0103234617; +package love.to.android0103235155; import org.love2d.android.GameActivity; public class LtaActivity extends GameActivity {} diff --git a/assets/scripts/controls.lua b/assets/scripts/controls.lua index 44e962e..1d96798 100644 --- a/assets/scripts/controls.lua +++ b/assets/scripts/controls.lua @@ -21,11 +21,6 @@ function controls.load(game) controls.new_button('button_up', up_x, up_y, img_button_up) end -function controls.update(dt) - if love.mouse.isDown(1) then - end -end - function controls.draw() for key, button in pairs(BUTTONS) do button.animation:draw(button.img, button.x, button.y) diff --git a/main.lua b/main.lua index f8c8b11..d9e79aa 100644 --- a/main.lua +++ b/main.lua @@ -28,7 +28,6 @@ function love.update(dt) moon.update() spaceship.update(dt, game) camera.update(game, spaceship) - controls.update(dt) end -- DRAW