diff --git a/app/app.iml b/app/app.iml index 8b0fc7d..7cef00a 100644 --- a/app/app.iml +++ b/app/app.iml @@ -98,6 +98,7 @@ + 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 bf1c670..4c075a1 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 @@ -484,74 +484,74 @@ public final class R { public static final int chronometer = 0x7f08001c; public static final int collapseActionView = 0x7f08001d; public static final int contentPanel = 0x7f080021; - public static final int custom = 0x7f08002c; - public static final int customPanel = 0x7f08002d; - public static final int decor_content_parent = 0x7f08002e; - public static final int default_activity_button = 0x7f08002f; - public static final int disableHome = 0x7f080030; - public static final int edit_query = 0x7f080031; - public static final int end = 0x7f080032; - public static final int end_padder = 0x7f080033; - public static final int expand_activities_button = 0x7f080034; - public static final int expanded_menu = 0x7f080035; - public static final int home = 0x7f08004c; - public static final int homeAsUp = 0x7f08004d; - public static final int icon = 0x7f08004e; - public static final int ifRoom = 0x7f080050; - public static final int image = 0x7f080051; - public static final int info = 0x7f080052; - public static final int line1 = 0x7f080061; - public static final int line3 = 0x7f080062; - public static final int listMode = 0x7f080064; - public static final int list_item = 0x7f080065; - public static final int media_actions = 0x7f080066; - public static final int middle = 0x7f080067; - public static final int multiply = 0x7f080068; - public static final int never = 0x7f080069; - public static final int none = 0x7f08006a; - public static final int normal = 0x7f08006b; - public static final int parentPanel = 0x7f08006f; - public static final int progress_circular = 0x7f080074; - public static final int progress_horizontal = 0x7f080075; - public static final int radio = 0x7f080076; - public static final int screen = 0x7f080079; - public static final int scrollIndicatorDown = 0x7f08007a; - public static final int scrollIndicatorUp = 0x7f08007b; - public static final int scrollView = 0x7f08007c; - public static final int search_badge = 0x7f08007d; - public static final int search_bar = 0x7f08007e; - public static final int search_button = 0x7f08007f; - public static final int search_close_btn = 0x7f080080; - public static final int search_edit_frame = 0x7f080081; - public static final int search_go_btn = 0x7f080082; - public static final int search_mag_icon = 0x7f080083; - public static final int search_plate = 0x7f080084; - public static final int search_src_text = 0x7f080085; - public static final int search_voice_btn = 0x7f080086; - public static final int select_dialog_listview = 0x7f080087; - public static final int shortcut = 0x7f08009c; - public static final int showCustom = 0x7f0800a1; - public static final int showHome = 0x7f0800a2; - public static final int showTitle = 0x7f0800a3; - public static final int spacer = 0x7f0800a4; - public static final int split_action_bar = 0x7f0800a5; - public static final int src_atop = 0x7f0800a6; - public static final int src_in = 0x7f0800a7; - public static final int src_over = 0x7f0800a8; - public static final int status_bar_latest_event_content = 0x7f0800ae; - public static final int submit_area = 0x7f0800af; - public static final int tabMode = 0x7f0800b0; - public static final int text = 0x7f0800b2; - public static final int text2 = 0x7f0800b3; - public static final int textSpacerNoButtons = 0x7f0800b4; - public static final int time = 0x7f0800b5; - public static final int title = 0x7f0800b6; - public static final int title_template = 0x7f0800b7; - public static final int topPanel = 0x7f0800c8; - public static final int up = 0x7f0800da; - public static final int useLogo = 0x7f0800db; - public static final int withText = 0x7f0800dc; - public static final int wrap_content = 0x7f0800e5; + public static final int custom = 0x7f08002d; + public static final int customPanel = 0x7f08002e; + public static final int decor_content_parent = 0x7f08002f; + public static final int default_activity_button = 0x7f080030; + public static final int disableHome = 0x7f080031; + public static final int edit_query = 0x7f080032; + public static final int end = 0x7f080033; + public static final int end_padder = 0x7f080034; + public static final int expand_activities_button = 0x7f080035; + public static final int expanded_menu = 0x7f080036; + public static final int home = 0x7f08004d; + public static final int homeAsUp = 0x7f08004e; + public static final int icon = 0x7f08004f; + public static final int ifRoom = 0x7f080051; + public static final int image = 0x7f080052; + public static final int info = 0x7f080053; + public static final int line1 = 0x7f080062; + public static final int line3 = 0x7f080063; + public static final int listMode = 0x7f080065; + public static final int list_item = 0x7f080066; + public static final int media_actions = 0x7f080067; + public static final int middle = 0x7f080068; + public static final int multiply = 0x7f080069; + public static final int never = 0x7f08006a; + public static final int none = 0x7f08006b; + public static final int normal = 0x7f08006c; + public static final int parentPanel = 0x7f080070; + public static final int progress_circular = 0x7f080075; + public static final int progress_horizontal = 0x7f080076; + public static final int radio = 0x7f080077; + public static final int screen = 0x7f08007a; + public static final int scrollIndicatorDown = 0x7f08007b; + public static final int scrollIndicatorUp = 0x7f08007c; + public static final int scrollView = 0x7f08007d; + public static final int search_badge = 0x7f08007e; + public static final int search_bar = 0x7f08007f; + public static final int search_button = 0x7f080080; + public static final int search_close_btn = 0x7f080081; + public static final int search_edit_frame = 0x7f080082; + public static final int search_go_btn = 0x7f080083; + public static final int search_mag_icon = 0x7f080084; + public static final int search_plate = 0x7f080085; + public static final int search_src_text = 0x7f080086; + public static final int search_voice_btn = 0x7f080087; + public static final int select_dialog_listview = 0x7f080088; + public static final int shortcut = 0x7f08009d; + public static final int showCustom = 0x7f0800a2; + public static final int showHome = 0x7f0800a3; + public static final int showTitle = 0x7f0800a4; + public static final int spacer = 0x7f0800a5; + public static final int split_action_bar = 0x7f0800a6; + public static final int src_atop = 0x7f0800a7; + public static final int src_in = 0x7f0800a8; + public static final int src_over = 0x7f0800a9; + public static final int status_bar_latest_event_content = 0x7f0800af; + public static final int submit_area = 0x7f0800b0; + public static final int tabMode = 0x7f0800b1; + public static final int text = 0x7f0800b3; + public static final int text2 = 0x7f0800b4; + public static final int textSpacerNoButtons = 0x7f0800b5; + public static final int time = 0x7f0800b6; + public static final int title = 0x7f0800b7; + public static final int title_template = 0x7f0800b8; + public static final int topPanel = 0x7f0800c9; + public static final int up = 0x7f0800db; + public static final int useLogo = 0x7f0800dc; + public static final int withText = 0x7f0800dd; + public static final int wrap_content = 0x7f0800e6; } public static final class integer { public static final int abc_config_activityDefaultDur = 0x7f090000; diff --git a/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml b/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml index 2688355..b3c7840 100644 --- a/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml +++ b/app/build/intermediates/assets/debug/levelpacks/Grasslands.xml @@ -510,9 +510,6 @@ - - - @@ -522,9 +519,6 @@ - - - @@ -795,16 +789,13 @@ - - - - + @@ -819,9 +810,6 @@ - - - @@ -867,7 +855,7 @@ - + diff --git a/app/build/intermediates/incremental/mergeDebugResources/merger.xml b/app/build/intermediates/incremental/mergeDebugResources/merger.xml index c0b5310..5620850 100644 --- a/app/build/intermediates/incremental/mergeDebugResources/merger.xml +++ b/app/build/intermediates/incremental/mergeDebugResources/merger.xml @@ -1395,7 +1395,7 @@ Grasslands Icy Mountains Testcave - #17b3f5#1791f5#ffb637#ffeb37#ff8e37#e2ffb637#57ffb637#ff0000#000000#00000000#daf10d#c7b7b7b7#715f5f#60715f#db41e42b#b3d700#9d000000#5b000000#3d00000030dp170dp170dp70dp60dpEndless RollClick me!I\'m a text!997.5Show FpsSet 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: %dBuyUpgradeBallClockHypnoPacmanSmileyWheelSunI\'m blue\?\?\?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 sunWhy am I blue?A 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 equippedChoose which tool to use by clicking 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/