From b49fa71d1fe3b2498e2f4068cc9915602f962ae1 Mon Sep 17 00:00:00 2001 From: julian Date: Fri, 6 Jul 2018 16:03:40 +0200 Subject: [PATCH] Added soccer-player-shape fixed bug with tools not being set on top of obstacles Tools are no longer moved to left if set hard on edge of obstacle --- .../debug/android/support/v7/appcompat/R.java | 4 +- .../mergeDebugResources/merger.xml | 10 +- app/build/intermediates/symbols/debug/R.txt | 325 +++++++++--------- .../frajul/endlessroll/entities/Player.java | 4 +- .../entities/shapes/PlayerShape.java | 34 +- .../endlessroll/entities/tools/Bomb.java | 1 + .../endlessroll/main/MyGlSurfaceView.java | 1 - .../endlessroll/main/physics/Physics.java | 42 +-- .../main/screens/PlayerShapeShopScreen.java | 5 +- .../drawable/juri_background_game_grass_2.png | Bin 39707 -> 0 bytes .../drawable/juri_background_game_grass_3.png | Bin 21789 -> 0 bytes .../drawable/juri_background_game_snow_2.png | Bin 21352 -> 0 bytes .../drawable/juri_background_game_snow_3.png | Bin 27453 -> 0 bytes .../res/drawable/juri_obstacles_grass.png | Bin 44837 -> 0 bytes .../jury_playershapes_ball_omg_im_blue.png | Bin 11074 -> 0 bytes app/src/main/res/layout/game.xml | 2 + app/src/main/res/layout/start_screen.xml | 2 +- app/src/main/res/layout/worlds.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 + app/src/main/res/values/strings.xml | 2 + app/src/main/res/values/styles.xml | 4 + 21 files changed, 223 insertions(+), 217 deletions(-) delete mode 100644 app/src/main/res/drawable/juri_background_game_grass_2.png delete mode 100644 app/src/main/res/drawable/juri_background_game_grass_3.png delete mode 100644 app/src/main/res/drawable/juri_background_game_snow_2.png delete mode 100644 app/src/main/res/drawable/juri_background_game_snow_3.png delete mode 100644 app/src/main/res/drawable/juri_obstacles_grass.png delete mode 100644 app/src/main/res/drawable/jury_playershapes_ball_omg_im_blue.png diff --git a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java index 4c075a1..e37d861 100644 --- a/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java +++ b/app/build/generated/source/r/debug/android/support/v7/appcompat/R.java @@ -456,7 +456,7 @@ public final class R { public static final int abc_textfield_search_activated_mtrl_alpha = 0x7f070042; public static final int abc_textfield_search_default_mtrl_alpha = 0x7f070043; public static final int abc_textfield_search_material = 0x7f070044; - public static final int notification_template_icon_bg = 0x7f070072; + public static final int notification_template_icon_bg = 0x7f070070; } public static final class id { public static final int action0 = 0x7f080000; @@ -619,7 +619,7 @@ public final class R { public static final int abc_shareactionprovider_share_with = 0x7f0d0010; public static final int abc_shareactionprovider_share_with_application = 0x7f0d0011; public static final int abc_toolbar_collapse_description = 0x7f0d0012; - public static final int status_bar_notification_info_overflow = 0x7f0d0064; + public static final int status_bar_notification_info_overflow = 0x7f0d0066; } public static final class style { public static final int AlertDialog_AppCompat = 0x7f0e0000; diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml index b0f8146..4060f96 100644 --- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1390,12 +1390,16 @@ @drawable/abc_text_cursor_material