diff --git a/android/game.apk b/android/game.apk index 944fae0..aee7210 100644 Binary files a/android/game.apk and b/android/game.apk differ diff --git a/android/game.love b/android/game.love index 3c5e2e2..6b5ef67 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 9ab6176..101e891 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 3c5e2e2..6b5ef67 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 9ab6176..101e891 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 a72f0e1..db18b1d 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 -#Sat, 26 Nov 2016 18:22:56 +0100 +#Sat, 26 Nov 2016 18:27:55 +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 8ac5a92..f0d0ea2 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 7a22d76..24ae7fe 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/android1126182250/BuildConfig.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/LtaActivity.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R$attr.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R$drawable.class \ -/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1126182750/BuildConfig.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1126182750/LtaActivity.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1126182750/R$attr.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1126182750/R$drawable.class \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/bin/classes/love/to/android1126182750/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/android1126182250/R$attr.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R$attr.class deleted file mode 100644 index c866d9b..0000000 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R$attr.class and /dev/null differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/BuildConfig.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182750/BuildConfig.class similarity index 74% rename from android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/BuildConfig.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android1126182750/BuildConfig.class index 191058e..07b728a 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/BuildConfig.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182750/BuildConfig.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/LtaActivity.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182750/LtaActivity.class similarity index 62% rename from android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/LtaActivity.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android1126182750/LtaActivity.class index 7f311f5..931dedf 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/LtaActivity.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182750/LtaActivity.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1126182750/R$attr.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182750/R$attr.class new file mode 100644 index 0000000..31ffa64 Binary files /dev/null and b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182750/R$attr.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R$drawable.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182750/R$drawable.class similarity index 56% rename from android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R$drawable.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android1126182750/R$drawable.class index ce16d71..e10f4ac 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R$drawable.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182750/R$drawable.class differ diff --git a/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R.class b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182750/R.class similarity index 63% rename from android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R.class rename to android/tools/love-android-sdl2/bin/classes/love/to/android1126182750/R.class index e8010bc..d14a50d 100644 Binary files a/android/tools/love-android-sdl2/bin/classes/love/to/android1126182250/R.class and b/android/tools/love-android-sdl2/bin/classes/love/to/android1126182750/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 a1a2469..cb15476 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 944fae0..aee7210 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 fea8d81..bb849c2 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 c8291b5..157c5fc 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.android1126182250.DownloadActivity { (...); } +-keep class love.to.android1126182750.DownloadActivity { (...); } # view AndroidManifest.xml #generated:17 --keep class love.to.android1126182250.DownloadService { (...); } +-keep class love.to.android1126182750.DownloadService { (...); } # view AndroidManifest.xml #generated:18 --keep class love.to.android1126182250.LtaActivity { (...); } +-keep class love.to.android1126182750.LtaActivity { (...); } diff --git a/android/tools/love-android-sdl2/gen/R.java.d b/android/tools/love-android-sdl2/gen/R.java.d index 5a16e8e..fdf7c80 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/android1126182250/R.java \ +/Users/androsfenollosa/www/alunizaje/android/tools/love-android-sdl2/gen/love/to/android1126182750/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/android1126182250/BuildConfig.java b/android/tools/love-android-sdl2/gen/love/to/android1126182750/BuildConfig.java similarity index 79% rename from android/tools/love-android-sdl2/gen/love/to/android1126182250/BuildConfig.java rename to android/tools/love-android-sdl2/gen/love/to/android1126182750/BuildConfig.java index f6f1a0b..f6e4816 100644 --- a/android/tools/love-android-sdl2/gen/love/to/android1126182250/BuildConfig.java +++ b/android/tools/love-android-sdl2/gen/love/to/android1126182750/BuildConfig.java @@ -1,5 +1,5 @@ /** Automatically generated file. DO NOT MODIFY */ -package love.to.android1126182250; +package love.to.android1126182750; public final class BuildConfig { public final static boolean DEBUG = true; diff --git a/android/tools/love-android-sdl2/gen/love/to/android1126182250/R.java b/android/tools/love-android-sdl2/gen/love/to/android1126182750/R.java similarity index 91% rename from android/tools/love-android-sdl2/gen/love/to/android1126182250/R.java rename to android/tools/love-android-sdl2/gen/love/to/android1126182750/R.java index d17e95d..4e0ff83 100644 --- a/android/tools/love-android-sdl2/gen/love/to/android1126182250/R.java +++ b/android/tools/love-android-sdl2/gen/love/to/android1126182750/R.java @@ -5,7 +5,7 @@ * should not be modified by hand. */ -package love.to.android1126182250; +package love.to.android1126182750; public final class R { public static final class attr { diff --git a/android/tools/love-android-sdl2/src/love/to/android1126182250/LtaActivity.java b/android/tools/love-android-sdl2/src/love/to/android1126182750/LtaActivity.java similarity index 69% rename from android/tools/love-android-sdl2/src/love/to/android1126182250/LtaActivity.java rename to android/tools/love-android-sdl2/src/love/to/android1126182750/LtaActivity.java index 4712fc7..6453bd4 100644 --- a/android/tools/love-android-sdl2/src/love/to/android1126182250/LtaActivity.java +++ b/android/tools/love-android-sdl2/src/love/to/android1126182750/LtaActivity.java @@ -1,4 +1,4 @@ -package love.to.android1126182250; +package love.to.android1126182750; import org.love2d.android.GameActivity; public class LtaActivity extends GameActivity {} diff --git a/assets/scripts/spaceship.lua b/assets/scripts/spaceship.lua index ff59b38..34d2729 100644 --- a/assets/scripts/spaceship.lua +++ b/assets/scripts/spaceship.lua @@ -1,29 +1,53 @@ local anim8 = require 'assets/scripts/vendor/anim8' local spaceship = {} +local press_button = false function spaceship.load(game) -- power origin 1000 spaceship = { x = game.canvas.width / 2, y = 0 , power = 400 , size_collition = 28, polygons_collition = 8 } + spaceship.width = 156 + spaceship.height = 143 spaceship.img = love.graphics.newImage('assets/sprites/spaceship/body.png') spaceship.body = love.physics.newBody(game.world, (game.canvas.width / 2) - (spaceship.img:getWidth() / 2) , spaceship.y, 'dynamic') spaceship.shape = love.physics.newCircleShape(20) spaceship.fixture = love.physics.newFixture(spaceship.body, spaceship.shape, 1) spaceship.fixture:setRestitution(0.9) - local g = anim8.newGrid(110, 103, spaceship.img:getWidth(), spaceship.img:getHeight()) - spaceship.animation = anim8.newAnimation(g('1-1', 1), 0.1) + local g = anim8.newGrid(spaceship.width, spaceship.height, spaceship.img:getWidth(), spaceship.img:getHeight()) + spaceship.animation_stop = anim8.newAnimation(g('1-1', 1), 0.1) + spaceship.animation_fire = anim8.newAnimation(g('2-5', 1), 0.01) + -- Light + light = { + img = love.graphics.newImage('assets/sprites/spaceship/light.png'), + y = spaceship.y + } + light.x = spaceship.x + (spaceship.img:getWidth() / 2) + (light.img:getWidth() / 2) + light.num_frames = 9 + light.width = 16 + light.height = 16 + g = anim8.newGrid(light.width, light.height, light.img:getWidth(), light.img:getHeight()) + light.animation = anim8.newAnimation(g('1-' .. light.num_frames, 1), 0.1) end function spaceship.update(dt) - spaceship.animation:update(dt) + -- Spaceship + spaceship.animation_fire:update(dt) + press_button = false + -- Light + light.animation:update(dt) + light.x = spaceship.body:getX() + (spaceship.width / 2) + (light.width / 2) + light.y = spaceship.body:getY() -- Controls if control_up then spaceship.body:applyForce(0, -spaceship.power) + press_button = true end if control_right then spaceship.body:applyForce(spaceship.power, 0) + press_button = true elseif control_left then spaceship.body:applyForce(-spaceship.power, 0) + press_button = true end if control_quit then love.event.push('quit') @@ -31,7 +55,12 @@ function spaceship.update(dt) end function spaceship.draw() - spaceship.animation:draw(spaceship.img, spaceship.body:getX(), spaceship.body:getY()) + light.animation:draw(light.img, light.x, light.y) + if press_button then + spaceship.animation_fire:draw(spaceship.img, spaceship.body:getX(), spaceship.body:getY()) + else + spaceship.animation_stop:draw(spaceship.img, spaceship.body:getX(), spaceship.body:getY()) + end end return spaceship \ No newline at end of file diff --git a/assets/sprites/spaceship/light.png b/assets/sprites/spaceship/light.png new file mode 100755 index 0000000..e592b91 Binary files /dev/null and b/assets/sprites/spaceship/light.png differ