From 2e24ef619dcdff1fc6004eb3f00eaff00790ee1d Mon Sep 17 00:00:00 2001 From: = <=> Date: Sun, 6 May 2018 18:19:00 +0200 Subject: [PATCH] Added juris graphics Changed layout of shape-shop and tool-shop --- .../debug/android/support/v7/appcompat/R.java | 4 +- .../mergeDebugResources/merger.xml | 4 +- app/build/intermediates/symbols/debug/R.txt | 268 +++++++++--------- .../endlessroll/entities/Background.java | 59 ++-- .../endlessroll/entities/BackgroundLayer.java | 49 ++++ .../entities/shapes/PlayerShape.java | 4 +- .../endlessroll/levels/worlds/World.java | 33 ++- .../endlessroll/main/game/GameScene.java | 2 +- .../frajul/endlessroll/main/game/Scene.java | 4 +- .../endlessroll/main/game/StartScene.java | 2 +- .../main/game/TestScreenScene.java | 4 +- .../main/screens/PlayerShapeShopScreen.java | 15 +- .../main/screens/ToolShopScreen.java | 4 +- .../rendering/renderer/GameRenderer.java | 12 +- .../endlessroll/views/PlayerShapeButton.java | 11 +- .../drawable/juri_background_game_grass_2.png | Bin 0 -> 39707 bytes .../drawable/juri_background_game_grass_3.png | Bin 0 -> 21789 bytes .../drawable/juri_background_game_snow_2.png | Bin 0 -> 21352 bytes .../drawable/juri_background_game_snow_3.png | Bin 0 -> 27453 bytes .../res/drawable/juri_obstacles_grass.png | Bin 0 -> 44837 bytes .../jury_playershapes_ball_omg_im_blue.png | Bin 0 -> 11074 bytes app/src/main/res/layout/shape_shop.xml | 19 +- app/src/main/res/layout/toolshop.xml | 68 +++-- app/src/main/res/values-de/strings.xml | 2 + app/src/main/res/values/strings.xml | 2 + 25 files changed, 335 insertions(+), 231 deletions(-) create mode 100644 app/src/main/java/de/frajul/endlessroll/entities/BackgroundLayer.java create mode 100644 app/src/main/res/drawable/juri_background_game_grass_2.png create mode 100644 app/src/main/res/drawable/juri_background_game_grass_3.png create mode 100644 app/src/main/res/drawable/juri_background_game_snow_2.png create mode 100644 app/src/main/res/drawable/juri_background_game_snow_3.png create mode 100644 app/src/main/res/drawable/juri_obstacles_grass.png create 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 c31cff9..e6f9e65 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 = 0x7f070061; + public static final int notification_template_icon_bg = 0x7f070067; } 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 = 0x7f0d005b; + public static final int status_bar_notification_info_overflow = 0x7f0d005d; } 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 3b76d45..2b82696 100644 --- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1351,7 +1351,7 @@ Grasslands Icy Mountains Testcave - #17b3f5#1791f5#ffb637#ffeb37#ff8e37#e2ffb637#57ffb637#ff0000#000000#00000000#daf10d#db911c0f#dbfff200#e5dc1522#db41e42b#db494b49#715f5f#60715f#db41e42b#b3d700#f41602#f47b02#f4d802#9d000000#5b000000#3d00000030dp170dp170dp70dp60dpEndless RollClick me!I\'m a text!997.5Show FpsBoost performanceSet the bomb on an obstacle0.0m%.1fm0.0m/s%.1fm/sFps: 00Fps: %d3Level UpGAME OVERLEVEL FINISHEDTo menuTry againRestartRestart level %dNext level: %dNext world:\n%sLOADING...ContinueExitPlayUnlock all levelsGain 90 epFinish the first world!Test GL Stuff!!!Level: 24Level: %dReset progressCreditsMusicSoundsRamp unlockedGreat world21/15%s%s unlocked!New slot unlockedNew shape unlockedLevel: %dBuyUpgradeBallClockHypnoPacmanSmileyWheelSun\?\?\?Keep calm and roll onTick tack!Hypnotizes you for more funPACMAN!Don\'t worry, roll happy!A nice car without the... carShine bright like the sunA new shape for more funEmpty taskCollect %d stars (%d/%d)Collect %d energy (%d/%d)Collect %d starsCollect %d energyFinish the %d. world%d/%dYou will unlock this mysterious tool at level %dRoll up the ramp to gain heightShoots you in the airYou are pulled towards it. Just try it out!Blow up all obstacles near the bombThis will give you super-powers for a few secondsFreezes a certain area which leads to longer in-air time\?\?\?RampSpringMagnetBombMushroomStasisLevel: %dYesNoThis is a beautiful ConfirmDialog placeholder!Do you really want to exit the game?Do you really want to reset ALL your progress?Do you really want to finish the first world?\nYour old progress will be DELETED!This is a multiline placeholder\nfor all the tutorials I made!!!\nAwesome! - Isn\'t it?Welcome to Endless Roll!\nHave fun!Click anywhere on the screen to place the rampTry to place your ramp in front of the gapGreat job!\nNow place it in front of the obstacleYou can even set a Tool in mid-air.\nTime carefully!Now try again!Congratulations! You have leveled up!\nNow go to the toolshopWell done! Now you can start the next levelFor this level you will need two tools equippedTo select a tool just click on itENDLESS ROLLby FrajulTESTERSTester1\nTester2\nTester3\nTester4SOUNDS„Fruit-collected“, „Glocken-good“, „Carillon-02-a“, „Carillon-02-b“, „Fireball-02“, „Fruit-appearance“, „Voltage-hum“ (noiseforfun.com)MUSIC\"Balloon Game\", \"Bit Shift\", \"Digital Lemonade\"\nKevin MacLeod (incompetech.com)\nLicensed under Creative Commons: By Attribution 3.0\nhttp://creativecommons.org/licenses/by/3.0/