diff --git a/StartGamedev-160604-osx/game.apk b/StartGamedev-160604-osx/game.apk index b8281c9..b6a762c 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 f7bcfae..9e5be30 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 e6ff30b..36a2b7a 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 f7bcfae..9e5be30 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 e6ff30b..36a2b7a 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 0715b9c..ae57b35 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 23:55:26 +0100 +#Fri, 04 Nov 2016 17:37:41 +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 d65b63a..5930351 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 1ada9e6..df406d1 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/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/love/to/android1104173735/BuildConfig.class \ +/Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104173735/LtaActivity.class \ +/Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104173735/R$attr.class \ +/Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104173735/R$drawable.class \ +/Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104173735/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/android1103235521/R$attr.class b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/R$attr.class deleted file mode 100644 index 2cb5831..0000000 Binary files a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/R$attr.class and /dev/null differ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/BuildConfig.class b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104173735/BuildConfig.class similarity index 74% rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/BuildConfig.class rename to StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104173735/BuildConfig.class index 2af6366..a7ccc5e 100644 Binary files a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/BuildConfig.class and b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104173735/BuildConfig.class differ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/LtaActivity.class b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104173735/LtaActivity.class similarity index 62% rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/LtaActivity.class rename to StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104173735/LtaActivity.class index 4dab8f7..e2f8d55 100644 Binary files a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/LtaActivity.class and b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104173735/LtaActivity.class differ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104173735/R$attr.class b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104173735/R$attr.class new file mode 100644 index 0000000..f7896ac Binary files /dev/null and b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104173735/R$attr.class differ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/R$drawable.class b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104173735/R$drawable.class similarity index 56% rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/R$drawable.class rename to StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104173735/R$drawable.class index 976e63b..fa2da6b 100644 Binary files a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/R$drawable.class and b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104173735/R$drawable.class differ diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/R.class b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104173735/R.class similarity index 63% rename from StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/R.class rename to StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104173735/R.class index 6bb4255..23edd99 100644 Binary files a/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1103235521/R.class and b/StartGamedev-160604-osx/tools/love-android-sdl2/bin/classes/love/to/android1104173735/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 955994e..bb330de 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 b8281c9..b6a762c 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 13a67ad..ce7b042 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 494e9d8..8a87a78 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.android1103235521.DownloadActivity { (...); } +-keep class love.to.android1104173735.DownloadActivity { (...); } # view AndroidManifest.xml #generated:17 --keep class love.to.android1103235521.DownloadService { (...); } +-keep class love.to.android1104173735.DownloadService { (...); } # view AndroidManifest.xml #generated:18 --keep class love.to.android1103235521.LtaActivity { (...); } +-keep class love.to.android1104173735.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 72746af..fb4b449 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/android1103235521/R.java \ +/Users/androsfenollosa/www/alunizaje/StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1104173735/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/android1103235521/BuildConfig.java b/StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1104173735/BuildConfig.java similarity index 79% rename from StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1103235521/BuildConfig.java rename to StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1104173735/BuildConfig.java index 27d4b8b..26852a2 100644 --- a/StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1103235521/BuildConfig.java +++ b/StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1104173735/BuildConfig.java @@ -1,5 +1,5 @@ /** Automatically generated file. DO NOT MODIFY */ -package love.to.android1103235521; +package love.to.android1104173735; public final class BuildConfig { public final static boolean DEBUG = true; diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1103235521/R.java b/StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1104173735/R.java similarity index 91% rename from StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1103235521/R.java rename to StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1104173735/R.java index 46f9743..c82ca79 100644 --- a/StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1103235521/R.java +++ b/StartGamedev-160604-osx/tools/love-android-sdl2/gen/love/to/android1104173735/R.java @@ -5,7 +5,7 @@ * should not be modified by hand. */ -package love.to.android1103235521; +package love.to.android1104173735; public final class R { public static final class attr { diff --git a/StartGamedev-160604-osx/tools/love-android-sdl2/src/love/to/android1103235521/LtaActivity.java b/StartGamedev-160604-osx/tools/love-android-sdl2/src/love/to/android1104173735/LtaActivity.java similarity index 69% rename from StartGamedev-160604-osx/tools/love-android-sdl2/src/love/to/android1103235521/LtaActivity.java rename to StartGamedev-160604-osx/tools/love-android-sdl2/src/love/to/android1104173735/LtaActivity.java index 1a0ffde..425823d 100644 --- a/StartGamedev-160604-osx/tools/love-android-sdl2/src/love/to/android1103235521/LtaActivity.java +++ b/StartGamedev-160604-osx/tools/love-android-sdl2/src/love/to/android1104173735/LtaActivity.java @@ -1,4 +1,4 @@ -package love.to.android1103235521; +package love.to.android1104173735; import org.love2d.android.GameActivity; public class LtaActivity extends GameActivity {} diff --git a/assets/sprite/button.png b/assets/sprite/button.png index 7de212c..d6fb82c 100644 Binary files a/assets/sprite/button.png and b/assets/sprite/button.png differ diff --git a/main.lua b/main.lua index 772a26f..9bd0f10 100644 --- a/main.lua +++ b/main.lua @@ -84,8 +84,14 @@ function love.load() love.graphics.newQuad(button.frame_width * 1, 0, button.frame_width, button.frame_height, button.img:getWidth(), button.img:getHeight()) } button_up = {} - button_up.x = window.width - button.img:getWidth() + button_up.x = window.width - (button.img:getWidth() / button.num_frames) - (button.img:getWidth() / (2 * button.num_frames)) button_up.y = level.y + (camera.height / 4) + -camera.y + button_right = {} + button_right.x = button_up.x + button_right.y = button_up.y + (button.img:getHeight() / 3) + button_left = {} + button_left.x = button.img:getWidth() / (2 * button.num_frames) + button_left.y = button_right.y -- Generates initial asteroids asteroids_collision = 40 asteroids_collision_polygon = 8 @@ -158,6 +164,12 @@ function love.update(dt) if x > button_up.x and x < button_up.x + button.img:getWidth() and y > button_up.y + camera.y and y < button_up.y + button.img:getHeight() + camera.y then control_up = true end + -- Right + if x > button_right.x and x < button_right.x + button.img:getWidth() and y > button_right.y + camera.y and y < button_right.y + button.img:getHeight() + camera.y then + control_right = true + elseif x > button_left.x and x < button_left.x + button.img:getWidth() and y > button_left.y + camera.y and y < button_left.y + button.img:getHeight() + camera.y then + control_left = true + end end -- Ship move if control_up then @@ -193,7 +205,7 @@ function love.update(dt) local temp_img = img_asteroide[math.random(1, table_length(img_asteroide))] asteroids[table_length(asteroids) + 1] = { x = canvas.width + temp_img:getWidth(), - y = math.random(window.height / 2, canvas.height - temp_img:getHeight()), + y = math.random(window.height, canvas.height - temp_img:getHeight()), speed = math.random(1, max_speed_asteroids), img = temp_img, angle = math.random(0, 90)} @@ -286,6 +298,29 @@ function love.draw() button_frame_up = button.frames[2] end love.graphics.draw(button.img, button_frame_up, button_up.x, button_up.y) + if debug then + love.graphics.rectangle('fill', button_up.x, button_up.y, button.img:getWidth(), button.img:getHeight()) + end + -- Right + button_right.y = button_up.y + (button.img:getHeight() + (button.img:getHeight() / 3)) + local button_frame_right = button.frames[1] + if control_right then + button_frame_right = button.frames[2] + end + love.graphics.draw(button.img, button_frame_right, button_right.x + (button.img:getWidth() / (2 * button.num_frames)), button_right.y + button.img:getHeight(), 90 * math.pi / 180, 1, 1, button.img:getWidth() / 2, button.img:getHeight() / 2) + if debug then + love.graphics.rectangle('fill', button_right.x, button_right.y, button.img:getWidth(), button.img:getHeight()) + end + -- Left + button_left.y = button_right.y + local button_frame_left = button.frames[1] + if control_left then + button_frame_left = button.frames[2] + end + love.graphics.draw(button.img, button_frame_left, button_left.x + (button.img:getWidth() / (2 * button.num_frames)), button_left.y, 270 * math.pi / 180, 1, 1, button.img:getWidth() / 2, button.img:getHeight() / 2) + if debug then + love.graphics.rectangle('fill', button_left.x, button_left.y, button.img:getWidth(), button.img:getHeight()) + end -- Texts if not play and not win then -- Game over love.graphics.print(text_restart.text, (camera.width / 2) - (text_restart.size / 2), -camera.y + (camera.height / 2))