diff --git a/android/game.apk b/android/game.apk index 0e80420..7e82d6c 100644 Binary files a/android/game.apk and b/android/game.apk differ diff --git a/android/game.love b/android/game.love index b2ccec5..b8110f1 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 1e39a0d..df60cbd 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 b2ccec5..b8110f1 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 1e39a0d..df60cbd 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 f7b6db7..dcb939a 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 -#Fri, 06 Jan 2017 21:34:44 +0100 +#Fri, 06 Jan 2017 21:37:38 +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 aa7f9ad..ac31afc 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 40ea2bf..4071488 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/android0106213437/BuildConfig.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android0106213437/LtaActivity.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android0106213437/R$attr.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android0106213437/R$drawable.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android0106213437/R.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android0106213733/BuildConfig.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android0106213733/LtaActivity.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android0106213733/R$attr.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android0106213733/R$drawable.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android0106213733/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/android0106213437/R$attr.class b/android/tools/love-android-sdl2/bin/classes/love/to/android0106213437/R$attr.class deleted file mode 100644 index 99d2871..0000000 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android0106213437/R$attr.class and /dev/null differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android0106213437/BuildConfig.class b/android/tools/love-android-sdl2/bin/classes/love/to/android0106213733/BuildConfig.class similarity index 74% rename from android/tools/love-android-sdl2/bin/classes/love/to/android0106213437/BuildConfig.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android0106213733/BuildConfig.class index ba5fa61..2ebad59 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android0106213437/BuildConfig.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android0106213733/BuildConfig.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android0106213437/LtaActivity.class b/android/tools/love-android-sdl2/bin/classes/love/to/android0106213733/LtaActivity.class similarity index 62% rename from android/tools/love-android-sdl2/bin/classes/love/to/android0106213437/LtaActivity.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android0106213733/LtaActivity.class index 93786a4..d19f5cd 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android0106213437/LtaActivity.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android0106213733/LtaActivity.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android0106213733/R$attr.class b/android/tools/love-android-sdl2/bin/classes/love/to/android0106213733/R$attr.class new file mode 100644 index 0000000..a6d8608 Binary files /dev/null and b/android/tools/love-android-sdl2/bin/classes/love/to/android0106213733/R$attr.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android0106213437/R$drawable.class b/android/tools/love-android-sdl2/bin/classes/love/to/android0106213733/R$drawable.class similarity index 56% rename from android/tools/love-android-sdl2/bin/classes/love/to/android0106213437/R$drawable.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android0106213733/R$drawable.class index 5546896..7b5104c 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android0106213437/R$drawable.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android0106213733/R$drawable.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android0106213437/R.class b/android/tools/love-android-sdl2/bin/classes/love/to/android0106213733/R.class similarity index 63% rename from android/tools/love-android-sdl2/bin/classes/love/to/android0106213437/R.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android0106213733/R.class index b2c73a3..1998c67 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android0106213437/R.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android0106213733/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 c26827e..38e85ad 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 0e80420..7e82d6c 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 e13e34f..f1caa18 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 ac059cd..8fead6d 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.android0106213437.DownloadActivity { (...); } +-keep class love.to.android0106213733.DownloadActivity { (...); } # view AndroidManifest.xml #generated:17 --keep class love.to.android0106213437.DownloadService { (...); } +-keep class love.to.android0106213733.DownloadService { (...); } # view AndroidManifest.xml #generated:18 --keep class love.to.android0106213437.LtaActivity { (...); } +-keep class love.to.android0106213733.LtaActivity { (...); } diff --git a/android/tools/love-android-sdl2/gen/R.java.d b/android/tools/love-android-sdl2/gen/R.java.d index acc4d5a..ba57f54 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/android0106213437/R.java \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/gen/love/to/android0106213733/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/android0106213437/BuildConfig.java b/android/tools/love-android-sdl2/gen/love/to/android0106213733/BuildConfig.java similarity index 79% rename from android/tools/love-android-sdl2/gen/love/to/android0106213437/BuildConfig.java rename to android/tools/love-android-sdl2/gen/love/to/android0106213733/BuildConfig.java index 3b3f809..a956161 100644 --- a/android/tools/love-android-sdl2/gen/love/to/android0106213437/BuildConfig.java +++ b/android/tools/love-android-sdl2/gen/love/to/android0106213733/BuildConfig.java @@ -1,5 +1,5 @@ /** Automatically generated file. DO NOT MODIFY */ -package love.to.android0106213437; +package love.to.android0106213733; public final class BuildConfig { public final static boolean DEBUG = true; diff --git a/android/tools/love-android-sdl2/gen/love/to/android0106213437/R.java b/android/tools/love-android-sdl2/gen/love/to/android0106213733/R.java similarity index 91% rename from android/tools/love-android-sdl2/gen/love/to/android0106213437/R.java rename to android/tools/love-android-sdl2/gen/love/to/android0106213733/R.java index bba824b..8133086 100644 --- a/android/tools/love-android-sdl2/gen/love/to/android0106213437/R.java +++ b/android/tools/love-android-sdl2/gen/love/to/android0106213733/R.java @@ -5,7 +5,7 @@ * should not be modified by hand. */ -package love.to.android0106213437; +package love.to.android0106213733; public final class R { public static final class attr { diff --git a/android/tools/love-android-sdl2/src/love/to/android0106213437/LtaActivity.java b/android/tools/love-android-sdl2/src/love/to/android0106213733/LtaActivity.java similarity index 69% rename from android/tools/love-android-sdl2/src/love/to/android0106213437/LtaActivity.java rename to android/tools/love-android-sdl2/src/love/to/android0106213733/LtaActivity.java index 270359c..73bd126 100644 --- a/android/tools/love-android-sdl2/src/love/to/android0106213437/LtaActivity.java +++ b/android/tools/love-android-sdl2/src/love/to/android0106213733/LtaActivity.java @@ -1,4 +1,4 @@ -package love.to.android0106213437; +package love.to.android0106213733; import org.love2d.android.GameActivity; public class LtaActivity extends GameActivity {} diff --git a/assets/scripts/spaceship.lua b/assets/scripts/spaceship.lua index f2e153d..d20ad7e 100644 --- a/assets/scripts/spaceship.lua +++ b/assets/scripts/spaceship.lua @@ -10,9 +10,17 @@ function spaceship.load(game) body = { x = 0, y = 0, - power = 400, + power = 200, size_collition = 28, - polygons_collition = 8 + polygons_collition = 8, + visible = true, + blink = { + active = false, + num_repeat = 5, + duration = 0.05, + num_count = 0, + time = 0 + } } body.width = 156 body.height = 143 @@ -134,6 +142,25 @@ function spaceship.update(dt, game) x, y = body.body:getLinearVelocity() body.body:setLinearVelocity(-x, y) end + -- Blink + if body.blink.active then + body.blink.time = body.blink.time + dt + if body.blink.time >= body.blink.duration then + body.blink.time = 0 + if body.visible then + body.visible = false + if body.blink.num_count < body.blink.num_repeat then + body.blink.num_count = body.blink.num_count + 1 + else + body.blink.num_count = 0 + body.blink.active = false + body.visible = true + end + else + body.visible = true + end + end + end -- Check if this ingame local x, y = body.body:getPosition() if y < 0 then @@ -151,12 +178,13 @@ function spaceship.update(dt, game) body.body:setPosition(body.pos_center_x, y) game.play = true game.die = false + body.blink.active = true end end end function spaceship.draw(game) - if game.play then + if game.play and body.visible then -- Lignt light.animation:draw(light.img, light.x, light.y) -- Spaceship