diff --git a/StartGamedev-160604-osx/game.apk b/StartGamedev-160604-osx/game.apk index fd042b0..b8281c9 100644 Binary files a/StartGamedev-160604-osx/game.apk and b/StartGamedev-160604-osx/game.apk differ diff --git a/StartGamedev-160604-osx/game.love b/StartGamedev-160604-osx/game.love index 2cd6028..f7bcfae 100644 Binary files a/StartGamedev-160604-osx/game.love and b/StartGamedev-160604-osx/game.love differ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/AndroidManifest.xml b/StartGamedev-160604-osx/tools/love-android-sdl2/AndroidManifest.xml index 1ceb660..e6ff30b 100644 --- a/StartGamedev-160604-osx/tools/love-android-sdl2/AndroidManifest.xml +++ b/StartGamedev-160604-osx/tools/love-android-sdl2/AndroidManifest.xml @@ -1,5 +1,5 @@ - @@ -12,13 +12,13 @@ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/assets/game.love b/StartGamedev-160604-osx/tools/love-android-sdl2/assets/game.love index 2cd6028..f7bcfae 100644 Binary files a/StartGamedev-160604-osx/tools/love-android-sdl2/assets/game.love and b/StartGamedev-160604-osx/tools/love-android-sdl2/assets/game.love differ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/AndroidManifest.xml b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/AndroidManifest.xml index 1ceb660..e6ff30b 100644 --- a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/AndroidManifest.xml +++ b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/AndroidManifest.xml @@ -1,5 +1,5 @@ - @@ -12,13 +12,13 @@ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/build.prop b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/build.prop index 019462a..0715b9c 100644 --- a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/build.prop +++ b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/build.prop @@ -1,5 +1,5 @@ #Last build type -#Thu, 03 Nov 2016 00:01:59 +0100 +#Thu, 03 Nov 2016 23:55:26 +0100 build.last.target=debug diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes.dex b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes.dex index 0b17f76..d65b63a 100644 Binary files a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes.dex and b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes.dex differ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes.dex.d b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes.dex.d index 328817c..1ada9e6 100644 --- a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes.dex.d +++ b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes.dex.d @@ -1,9 +1,9 @@ /Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes.dex : \ -/Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103000152/BuildConfig.class \ -/Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103000152/LtaActivity.class \ -/Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103000152/R$attr.class \ -/Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103000152/R$drawable.class \ -/Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103000152/R.class \ +/Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/BuildConfig.class \ +/Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/LtaActivity.class \ +/Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/R$attr.class \ +/Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/R$drawable.class \ +/Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/R.class \ /Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/DummyEdit.class \ /Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$1.class \ /Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/org/libsdl/app/SDLActivity$2.class \ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103000152/R$attr.class b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103000152/R$attr.class deleted file mode 100644 index 1ad6cf5..0000000 Binary files a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103000152/R$attr.class and /dev/null differ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103000152/BuildConfig.class b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/BuildConfig.class similarity index 74% rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103000152/BuildConfig.class rename to StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/BuildConfig.class index 90a58b5..2af6366 100644 Binary files a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103000152/BuildConfig.class and b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/BuildConfig.class differ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103000152/LtaActivity.class b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/LtaActivity.class similarity index 62% rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103000152/LtaActivity.class rename to StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/LtaActivity.class index 0d8ed8b..4dab8f7 100644 Binary files a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103000152/LtaActivity.class and b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/LtaActivity.class differ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/R$attr.class b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/R$attr.class new file mode 100644 index 0000000..2cb5831 Binary files /dev/null and b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/R$attr.class differ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103000152/R$drawable.class b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/R$drawable.class similarity index 56% rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103000152/R$drawable.class rename to StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/R$drawable.class index 760027a..976e63b 100644 Binary files a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103000152/R$drawable.class and b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/R$drawable.class differ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103000152/R.class b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/R.class similarity index 63% rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103000152/R.class rename to StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/R.class index 5c2a95c..6bb4255 100644 Binary files a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103000152/R.class and b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/R.class differ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2-debug-unaligned.apk b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2-debug-unaligned.apk index 651f666..955994e 100644 Binary files a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2-debug-unaligned.apk and b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2-debug-unaligned.apk differ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2-debug.apk b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2-debug.apk index fd042b0..b8281c9 100644 Binary files a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2-debug.apk and b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2-debug.apk differ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2.ap_ b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2.ap_ index f4ff87f..13a67ad 100644 Binary files a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2.ap_ and b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/love_android_sdl2.ap_ differ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/proguard.txt b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/proguard.txt index f9b7dce..494e9d8 100644 --- a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/proguard.txt +++ b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/proguard.txt @@ -1,9 +1,9 @@ # view AndroidManifest.xml #generated:45 --keep class love.to.android1103000152.DownloadActivity { (...); } +-keep class love.to.android1103235521.DownloadActivity { (...); } # view AndroidManifest.xml #generated:17 --keep class love.to.android1103000152.DownloadService { (...); } +-keep class love.to.android1103235521.DownloadService { (...); } # view AndroidManifest.xml #generated:18 --keep class love.to.android1103000152.LtaActivity { (...); } +-keep class love.to.android1103235521.LtaActivity { (...); } diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/gen/R.java.d b/StartGamedev-160604-osx/tools/love-android-sdl2/gen/R.java.d index aab26eb..72746af 100644 --- a/StartGamedev-160604-osx/tools/love-android-sdl2/gen/R.java.d +++ b/StartGamedev-160604-osx/tools/love-android-sdl2/gen/R.java.d @@ -1,3 +1,3 @@ -/Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1103000152/R.java \ +/Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1103235521/R.java \ : /Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/res/drawable-xxhdpi/ic_launcher.png \ /Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/bin/AndroidManifest.xml \ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1103000152/BuildConfig.java b/StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1103235521/BuildConfig.java similarity index 79% rename from StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1103000152/BuildConfig.java rename to StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1103235521/BuildConfig.java index 3fbd68f..27d4b8b 100644 --- a/StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1103000152/BuildConfig.java +++ b/StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1103235521/BuildConfig.java @@ -1,5 +1,5 @@ /** Automatically generated file. DO NOT MODIFY */ -package love.to.android1103000152; +package love.to.android1103235521; public final class BuildConfig { public final static boolean DEBUG = true; diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1103000152/R.java b/StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1103235521/R.java similarity index 91% rename from StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1103000152/R.java rename to StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1103235521/R.java index a43d699..46f9743 100644 --- a/StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1103000152/R.java +++ b/StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1103235521/R.java @@ -5,7 +5,7 @@ * should not be modified by hand. */ -package love.to.android1103000152; +package love.to.android1103235521; public final class R { public static final class attr { diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/src/love/to/android1103000152/LtaActivity.java b/StartGamedev-160604-osx/tools/love-android-sdl2/src/love/to/android1103235521/LtaActivity.java similarity index 69% rename from StartGamedev-160604-osx/tools/love-android-sdl2/src/love/to/android1103000152/LtaActivity.java rename to StartGamedev-160604-osx/tools/love-android-sdl2/src/love/to/android1103235521/LtaActivity.java index d484ecd..1a0ffde 100644 --- a/StartGamedev-160604-osx/tools/love-android-sdl2/src/love/to/android1103000152/LtaActivity.java +++ b/StartGamedev-160604-osx/tools/love-android-sdl2/src/love/to/android1103235521/LtaActivity.java @@ -1,4 +1,4 @@ -package love.to.android1103000152; +package love.to.android1103235521; import org.love2d.android.GameActivity; public class LtaActivity extends GameActivity {} diff --git a/main.lua b/main.lua index 8a5e4ee..bcb9166 100644 --- a/main.lua +++ b/main.lua @@ -123,23 +123,44 @@ function love.update(dt) fire.pos_frame = 1 end -- Controls + -- Keyboard if love.keyboard.isDown('escape') or love.keyboard.isDown('q') then love.event.push('quit') end if love.keyboard.isDown('right') then - ship.body:applyForce(ship.power, 0) - fire.visible = true - sounds.fire:play() - elseif love.keyboard.isDown('left') then - ship.body:applyForce(-ship.power, 0) - fire.visible = true - sounds.fire:play() - end + ship.body:applyForce(ship.power, 0) + fire.visible = true + sounds.fire:play() + elseif love.keyboard.isDown('left') then + ship.body:applyForce(-ship.power, 0) + fire.visible = true + sounds.fire:play() + end if love.keyboard.isDown('up') then - ship.body:applyForce(0, -ship.power) - fire.visible = true - sounds.fire:play() - end + ship.body:applyForce(0, -ship.power) + fire.visible = true + sounds.fire:play() + end + -- Mouse + if love.mouse.isDown(1) then + local x, y = love.mouse.getPosition() + -- Up + if x > width / 3 and x < width - (width / 3) and y < height / 3 then + ship.body:applyForce(0, -ship.power) + fire.visible = true + sounds.fire:play() + end + -- Left + if x < width / 3 then + ship.body:applyForce(-ship.power, 0) + fire.visible = true + sounds.fire:play() + elseif x > width - (width / 3) then + ship.body:applyForce(ship.power, 0) + fire.visible = true + sounds.fire:play() + end + end -- Rotate asteroids for key, value in pairs(asteroids) do value.angle = asteroids[key].angle + (dt * math.pi / 10) @@ -297,4 +318,8 @@ end -- Controls function love.keyreleased(key) sounds.fire:stop() +end + +function love.mousereleased(key) + sounds.fire:stop() end \ No newline at end of file