julian/EndlessRoll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Introduced scalable obstacles, even though the texture could be polished a bit more

Browse Source
This commit is contained in:
= 2017-08-04 17:34:38 +02:00
parent 0437b0178e
commit 472c36aec7
22 changed files with 2026 additions and 1598 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
View File

@ -586,18 +586,18 @@ public final class R {
public static final int abc_search_dropdown_item_icons_2line = 0x7f040016;
public static final int abc_search_view = 0x7f040017;
public static final int abc_select_dialog_material = 0x7f040018;
public static final int notification_media_action = 0x7f04001e;
public static final int notification_media_cancel_action = 0x7f04001f;
public static final int notification_template_big_media = 0x7f040020;
public static final int notification_template_big_media_narrow = 0x7f040021;
public static final int notification_template_lines = 0x7f040022;
public static final int notification_template_media = 0x7f040023;
public static final int notification_template_part_chronometer = 0x7f040024;
public static final int notification_template_part_time = 0x7f040025;
public static final int select_dialog_item_material = 0x7f040028;
public static final int select_dialog_multichoice_material = 0x7f040029;
public static final int select_dialog_singlechoice_material = 0x7f04002a;
public static final int support_simple_spinner_dropdown_item = 0x7f04002d;
public static final int notification_media_action = 0x7f04001f;
public static final int notification_media_cancel_action = 0x7f040020;
public static final int notification_template_big_media = 0x7f040021;
public static final int notification_template_big_media_narrow = 0x7f040022;
public static final int notification_template_lines = 0x7f040023;
public static final int notification_template_media = 0x7f040024;
public static final int notification_template_part_chronometer = 0x7f040025;
public static final int notification_template_part_time = 0x7f040026;
public static final int select_dialog_item_material = 0x7f040029;
public static final int select_dialog_multichoice_material = 0x7f04002a;
public static final int select_dialog_singlechoice_material = 0x7f04002b;
public static final int support_simple_spinner_dropdown_item = 0x7f04002e;
}
public static final class string {
public static final int abc_action_bar_home_description = 0x7f070000;

2
app/build/intermediates/assets/debug/levelpacks/Grasslands.xml
View File

@ -177,7 +177,7 @@
<obstacleData floating="false" moving="false" deadly="false" leftEdge="6.166328" rightEdge="7.1603284" height="0.293" y="-0.45350003">
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="16.936665" rightEdge="19.076664" height="0.217" y="0.30666652">
<obstacleData floating="true" moving="false" deadly="false" leftEdge="16.929998" rightEdge="19.069998" height="0.217" y="0.28666654">
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="7.203003" rightEdge="8.6170025" height="0.127" y="-0.41333312">

2557
app/build/intermediates/blame/res/debug/multi/values.json
View File

File diff suppressed because it is too large Load Diff

300
app/build/intermediates/blame/res/debug/single/drawable.json
View File

@ -7,26 +7,10 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_selector_gamebutton.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_selector_gamebutton.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_bomb.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_bomb.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_cab_background_internal_bg.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_cab_background_internal_bg.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\backgrounds_game_grass.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\backgrounds_game_grass.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_toolshop_all_tools.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_toolshop_all_tools.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\playershapes_hypno_spiral.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\playershapes_hypno_spiral.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_toolshop_select_buy_spring.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_toolshop_select_buy_spring.png"
@ -35,14 +19,6 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_place_ramp_air_1.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_place_ramp_air_1.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_dialog_material_background_dark.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_dialog_material_background_dark.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_tab_indicator_material.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_tab_indicator_material.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_borderless_material.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_btn_borderless_material.xml"
@ -51,6 +27,154 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_holo_dark.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_list_selector_holo_dark.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_to_toolshop.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_to_toolshop.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_place_ramp_obstacle.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_place_ramp_obstacle.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tick.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tick.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\purple.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\purple.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\guis_pausebutton.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\guis_pausebutton.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_rampbutton.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_rampbutton.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\obstacles_mountains.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\obstacles_mountains.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\lock_locked.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\lock_locked.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_lockedbutton.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_lockedbutton.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\terrain_c_grass.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\terrain_c_grass.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_layers_toolprogressbar.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_layers_toolprogressbar.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_edit_text_material.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_edit_text_material.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_item_background_holo_light.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_item_background_holo_light.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_toolshop_equip_spring.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_toolshop_equip_spring.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_star_empty.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_star_empty.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\backgrounds_game_mountains.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\backgrounds_game_mountains.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_toolshop_toolbar.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_toolshop_toolbar.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_ramp.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_ramp.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_background_transition_holo_dark.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_list_selector_background_transition_holo_dark.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_spring.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_spring.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tip_icon.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tip_icon.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_cab_background_top_material.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_cab_background_top_material.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_text_cursor_material.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_text_cursor_material.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_switch_thumb_material.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_switch_thumb_material.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_background_bountymessage.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_background_bountymessage.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_energy.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_energy.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_background_worldbutton.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_background_worldbutton.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_star.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_star.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_seekbar_track_material.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_seekbar_track_material.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\backgrounds_menu_shortmenu.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\backgrounds_menu_shortmenu.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\obstacles_cave.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\obstacles_cave.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_bomb.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_bomb.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_cab_background_internal_bg.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_cab_background_internal_bg.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_toolshop_all_tools.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_toolshop_all_tools.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\playershapes_hypno_spiral.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\playershapes_hypno_spiral.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_dialog_material_background_dark.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_dialog_material_background_dark.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_tab_indicator_material.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_tab_indicator_material.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_seekbar_thumb_material.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_seekbar_thumb_material.xml"
@ -63,21 +187,13 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_background_tutorialtextview.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_background_tutorialtextview.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_spinner_textfield_background_material.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_spinner_textfield_background_material.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_textfield_search_material.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_textfield_search_material.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_place_ramp_obstacle.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_place_ramp_obstacle.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_to_toolshop.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_to_toolshop.png"
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_spinner_textfield_background_material.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_spinner_textfield_background_material.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\lock_unlocked.png",
@ -91,22 +207,10 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_selector_pricebutton.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_selector_pricebutton.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tick.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tick.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_springbutton.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_springbutton.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\purple.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\purple.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\guis_pausebutton.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\guis_pausebutton.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_toolbar.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_toolbar.png"
@ -115,26 +219,14 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_place_ramp_gap.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_place_ramp_gap.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_rampbutton.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_rampbutton.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\goal.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\goal.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\obstacles_mountains.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\obstacles_mountains.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_colored_material.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_btn_colored_material.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\lock_locked.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\lock_locked.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\radius.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\radius.png"
@ -163,14 +255,6 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\terrain_t_grass.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\terrain_t_grass.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_lockedbutton.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_lockedbutton.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\terrain_c_grass.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\terrain_c_grass.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_magnet.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_magnet.png"
@ -187,18 +271,10 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_energy_empty.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_energy_empty.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_layers_toolprogressbar.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_layers_toolprogressbar.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\backgrounds_menu_grass.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\backgrounds_menu_grass.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_edit_text_material.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_edit_text_material.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_selector_sound.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_selector_sound.xml"
@ -207,22 +283,10 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\playershapes_pacman.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\playershapes_pacman.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_item_background_holo_light.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_item_background_holo_light.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_toolshop_inspector.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_toolshop_inspector.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_toolshop_equip_spring.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_toolshop_equip_spring.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_star_empty.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_star_empty.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\magnet_field.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\magnet_field.png"
@ -235,14 +299,6 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\arrow_green.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\arrow_green.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\backgrounds_game_mountains.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\backgrounds_game_mountains.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tutorial_toolshop_toolbar.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tutorial_toolshop_toolbar.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_unlockedbutton.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_unlockedbutton.png"
@ -255,38 +311,14 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_ratingbar_full_material.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_ratingbar_full_material.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_ramp.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_ramp.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_background_transition_holo_dark.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_list_selector_background_transition_holo_dark.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\splitter.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\splitter.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_spring.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_spring.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tip_icon.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tip_icon.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_cab_background_top_material.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_cab_background_top_material.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_emptybutton.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_emptybutton.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_text_cursor_material.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_text_cursor_material.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_background_transition_holo_light.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_list_selector_background_transition_holo_light.xml"
@ -303,18 +335,10 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_holo_light.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_list_selector_holo_light.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_switch_thumb_material.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_switch_thumb_material.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_bombbutton.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_bombbutton.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_background_bountymessage.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_background_bountymessage.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\playershapes_clock.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\playershapes_clock.png"
@ -323,34 +347,10 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\guis_sound_off.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\guis_sound_off.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_energy.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_energy.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_background_worldbutton.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_background_worldbutton.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_magnetbutton.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_magnetbutton.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\currency_star.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\currency_star.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_seekbar_track_material.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\drawable\\abc_seekbar_track_material.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\backgrounds_menu_shortmenu.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\backgrounds_menu_shortmenu.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\obstacles_cave.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\obstacles_cave.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\backgrounds_game_cave.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\backgrounds_game_cave.png"

4
app/build/intermediates/blame/res/debug/single/layout.json
View File

@ -223,6 +223,10 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_alert_dialog_button_bar_material.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\abc_alert_dialog_button_bar_material.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\gl_test_screen.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\gl_test_screen.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_action_menu_item_layout.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\abc_action_menu_item_layout.xml"

2
app/build/intermediates/incremental/mergeDebugAssets/merger.xml
View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="output"><source path="C:\Users\Julian\.android\build-cache\7988038707870a182a4d2c219c6a86a58ec3478f\output\assets"/></dataSet><dataSet config="output"><source path="C:\Users\Julian\.android\build-cache\2232000db64551c7682d41127fbc27c912efcc3d\output\assets"/></dataSet><dataSet config="main"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets"><file name="fontBaron.ttf" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\fontBaron.ttf"/><file name="levelpacks/Grasslands.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Grasslands.xml"/><file name="particleEffects/collectEnergy.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\collectEnergy.pe"/><file name="particleEffects/collectStar.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\collectStar.pe"/><file name="particleEffects/explosion.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\explosion.pe"/><file name="particleEffects/magnet.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\magnet.pe"/><file name="particleEffects/particle.png" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\particle.png"/><file name="particleEffects/star.png" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\star.png"/><file name="shader/entityFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\entityFragmentShader.glsl"/><file name="shader/entityVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\entityVertexShader.glsl"/><file name="shader/particleFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\particleFragmentShader.glsl"/><file name="shader/simpleFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\simpleFragmentShader.glsl"/><file name="shader/simpleVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\simpleVertexShader.glsl"/><file name="shader/terrainVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\terrainVertexShader.glsl"/><file name="particleEffects/firework.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\firework.pe"/></source><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\build\generated\assets\shaders\debug"/></dataSet><dataSet config="debug"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\debug\assets"/></dataSet></merger>
<merger version="3"><dataSet config="output"><source path="C:\Users\Julian\.android\build-cache\7988038707870a182a4d2c219c6a86a58ec3478f\output\assets"/></dataSet><dataSet config="output"><source path="C:\Users\Julian\.android\build-cache\2232000db64551c7682d41127fbc27c912efcc3d\output\assets"/></dataSet><dataSet config="main"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets"><file name="fontBaron.ttf" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\fontBaron.ttf"/><file name="levelpacks/Grasslands.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Grasslands.xml"/><file name="particleEffects/collectEnergy.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\collectEnergy.pe"/><file name="particleEffects/collectStar.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\collectStar.pe"/><file name="particleEffects/explosion.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\explosion.pe"/><file name="particleEffects/magnet.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\magnet.pe"/><file name="particleEffects/particle.png" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\particle.png"/><file name="particleEffects/star.png" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\star.png"/><file name="shader/entityFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\entityFragmentShader.glsl"/><file name="shader/entityVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\entityVertexShader.glsl"/><file name="shader/particleFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\particleFragmentShader.glsl"/><file name="shader/simpleFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\simpleFragmentShader.glsl"/><file name="shader/simpleVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\simpleVertexShader.glsl"/><file name="shader/terrainVertexShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\terrainVertexShader.glsl"/><file name="particleEffects/firework.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\firework.pe"/><file name="shader/obstacleFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\obstacleFragmentShader.glsl"/></source><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\build\generated\assets\shaders\debug"/></dataSet><dataSet config="debug"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\debug\assets"/></dataSet></merger>

4
app/build/intermediates/incremental/mergeDebugResources/merger.xml
View File

File diff suppressed because one or more lines are too long

32
app/build/intermediates/res/merged/debug/layout/start_screen.xml
View File

@ -7,12 +7,12 @@
android:id="@+id/startscreen_sound"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/xml_selector_sound"
android:textOff=""
android:textOn=""
android:layout_alignEnd="@+id/startscreen_play"
android:layout_alignParentBottom="true"
android:layout_alignRight="@+id/startscreen_play"
android:layout_alignEnd="@+id/startscreen_play"/>
android:background="@drawable/xml_selector_sound"
android:textOff=""
android:textOn=""/>
<Button
android:id="@+id/startscreen_play"
@ -33,20 +33,30 @@
style="@style/GameButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/start_screen_unlock_all_levels"
android:visibility="visible"
android:layout_alignParentRight="true"
android:layout_below="@+id/startscreen_play"
android:layout_alignParentRight="true"/>
android:text="@string/start_screen_unlock_all_levels"
android:visibility="visible"/>
<Button
android:id="@+id/startscreen_gain_90_ep"
style="@style/GameButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/start_screen_gain_90_ep"
android:visibility="visible"
android:layout_below="@+id/startscreen_play"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"/>
android:layout_alignParentStart="true"
android:layout_below="@+id/startscreen_play"
android:text="@string/start_screen_gain_90_ep"
android:visibility="visible"/>
<Button
android:id="@+id/startscreen_to_gl_test_screen"
style="@style/GameButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:text="@string/start_screen_to_gl_test_screen"
android:visibility="visible"/>
</RelativeLayout>

5
app/build/intermediates/res/merged/debug/values/values.xml
View File

@ -234,12 +234,12 @@
<string name="app_name">Endless Roll</string>
<string name="bounty_message_resource_format_s">%s</string>
<string name="bounty_message_tool_format_s">%s unlocked!</string>
<string name="bounty_message_tool_slot">You unlocked a ToolSlot</string>
<string name="bounty_message_tool_slot">You unlocked a Toolslot</string>
<string name="button_placeholder">Click me!</string>
<string name="game_countdown_placeholder">3</string>
<string name="game_fps_format_d">Fps: %d</string>
<string name="game_fps_placeholder">Fps: 00</string>
<string name="game_playerprogress_format_f">%.2fm</string>
<string name="game_playerprogress_format_f">%.1fm</string>
<string name="game_playerprogress_placeholder">0.0m</string>
<string name="game_playerspeed_format_f">%.1fm/s</string>
<string name="game_playerspeed_placeholder">0.0m/s</string>
@ -262,6 +262,7 @@
<string name="short_menu_restart">Restart</string>
<string name="start_screen_gain_90_ep">Gain 90 ep (Nope! No magic at all!)</string>
<string name="start_screen_play">Play</string>
<string name="start_screen_to_gl_test_screen">Test GL Stuff!!!</string>
<string name="start_screen_unlock_all_levels">Unlock all levels (Yes! It\'s magic!)</string>
<string name="status_bar_notification_info_overflow">999+</string>
<string name="textview_placeholder">I\'m a text!</string>

BIN
app/build/intermediates/res/resources-debug.ap_
View File

Binary file not shown.

255
app/build/intermediates/symbols/debug/R.txt
View File

@ -585,14 +585,14 @@ int id icon 0x7f0e0029
int id ifRoom 0x7f0e001d
int id image 0x7f0e0026
int id imageView 0x7f0e0065
int id imageView4 0x7f0e00ba
int id imageView4 0x7f0e00bb
int id info 0x7f0e0077
int id levelbutton_energy 0x7f0e005c
int id levelbutton_lock 0x7f0e005d
int id levelbutton_star1 0x7f0e0059
int id levelbutton_star2 0x7f0e005a
int id levelbutton_star3 0x7f0e005b
int id levelbutton_starView 0x7f0e00b7
int id levelbutton_starView 0x7f0e00b8
int id levelbutton_textview 0x7f0e0058
int id levels_bottomRow 0x7f0e0061
int id levels_topRow 0x7f0e0060
@ -604,8 +604,8 @@ int id levelup_unlocklist 0x7f0e0066
int id line1 0x7f0e0071
int id line3 0x7f0e0075
int id linearLayout 0x7f0e0079
int id linearLayout3 0x7f0e0086
int id linearLayout4 0x7f0e009c
int id linearLayout3 0x7f0e0087
int id linearLayout4 0x7f0e009d
int id listMode 0x7f0e0009
int id list_item 0x7f0e0028
int id media_actions 0x7f0e006f
@ -657,6 +657,7 @@ int id src_over 0x7f0e0017
int id startscreen_gain_90_ep 0x7f0e0084
int id startscreen_play 0x7f0e0082
int id startscreen_sound 0x7f0e0081
int id startscreen_to_gl_test_screen 0x7f0e0085
int id startscreen_unlock_levels 0x7f0e0083
int id status_bar_latest_event_content 0x7f0e006e
int id submit_area 0x7f0e004c
@ -667,63 +668,63 @@ int id textSpacerNoButtons 0x7f0e0034
int id time 0x7f0e0072
int id title 0x7f0e002a
int id title_template 0x7f0e002f
int id toolProgressBar 0x7f0e0095
int id toolProgressBarView 0x7f0e0093
int id toolProgressButtonAnimation 0x7f0e0094
int id tool_inspector_imageview 0x7f0e0087
int id tool_inspector_pricebutton 0x7f0e0088
int id tool_inspector_title 0x7f0e0085
int id tool_inspector_toolupgrade0 0x7f0e0089
int id tool_inspector_toolupgrade1 0x7f0e008a
int id tool_upgrade_imageview 0x7f0e008f
int id tool_upgrade_pricebutton 0x7f0e0092
int id tool_upgrade_title 0x7f0e008e
int id tool_upgrade_value_new 0x7f0e0091
int id tool_upgrade_value_old 0x7f0e0090
int id toolbutton_1 0x7f0e0096
int id toolbutton_2 0x7f0e0097
int id toolbutton_3 0x7f0e0098
int id toolbutton_4 0x7f0e0099
int id toolofferslot_slot 0x7f0e008c
int id toolofferslot_title 0x7f0e008b
int id toolshop_slot1 0x7f0e009d
int id toolshop_slot2 0x7f0e009e
int id toolshop_slot3 0x7f0e009f
int id toolshop_slot4 0x7f0e00a0
int id toolshop_tool_offer_layout 0x7f0e00a1
int id toolshop_toolinspector 0x7f0e009b
int id toolshop_topbar 0x7f0e009a
int id toolslot_image 0x7f0e008d
int id toolProgressBar 0x7f0e0096
int id toolProgressBarView 0x7f0e0094
int id toolProgressButtonAnimation 0x7f0e0095
int id tool_inspector_imageview 0x7f0e0088
int id tool_inspector_pricebutton 0x7f0e0089
int id tool_inspector_title 0x7f0e0086
int id tool_inspector_toolupgrade0 0x7f0e008a
int id tool_inspector_toolupgrade1 0x7f0e008b
int id tool_upgrade_imageview 0x7f0e0090
int id tool_upgrade_pricebutton 0x7f0e0093
int id tool_upgrade_title 0x7f0e008f
int id tool_upgrade_value_new 0x7f0e0092
int id tool_upgrade_value_old 0x7f0e0091
int id toolbutton_1 0x7f0e0097
int id toolbutton_2 0x7f0e0098
int id toolbutton_3 0x7f0e0099
int id toolbutton_4 0x7f0e009a
int id toolofferslot_slot 0x7f0e008d
int id toolofferslot_title 0x7f0e008c
int id toolshop_slot1 0x7f0e009e
int id toolshop_slot2 0x7f0e009f
int id toolshop_slot3 0x7f0e00a0
int id toolshop_slot4 0x7f0e00a1
int id toolshop_tool_offer_layout 0x7f0e00a2
int id toolshop_toolinspector 0x7f0e009c
int id toolshop_topbar 0x7f0e009b
int id toolslot_image 0x7f0e008e
int id topPanel 0x7f0e002e
int id topbar_energycount 0x7f0e00a9
int id topbar_energycount_decrease 0x7f0e00ad
int id topbar_energyview 0x7f0e00a8
int id topbar_layout 0x7f0e00a2
int id topbar_leveldisplay 0x7f0e00a4
int id topbar_levellayout 0x7f0e00a3
int id topbar_levelprogress 0x7f0e00a5
int id topbar_resetButton 0x7f0e00ae
int id topbar_soundtoggle 0x7f0e00aa
int id topbar_starcount 0x7f0e00a7
int id topbar_starcount_decrease 0x7f0e00ac
int id topbar_starview 0x7f0e00a6
int id topbar_toolshop 0x7f0e00ab
int id tutorial_image_view 0x7f0e00b0
int id tutorial_text_view 0x7f0e00af
int id unlockmessage_message 0x7f0e00b2
int id unlockmessage_toolimage 0x7f0e00b1
int id topbar_energycount 0x7f0e00aa
int id topbar_energycount_decrease 0x7f0e00ae
int id topbar_energyview 0x7f0e00a9
int id topbar_layout 0x7f0e00a3
int id topbar_leveldisplay 0x7f0e00a5
int id topbar_levellayout 0x7f0e00a4
int id topbar_levelprogress 0x7f0e00a6
int id topbar_resetButton 0x7f0e00af
int id topbar_soundtoggle 0x7f0e00ab
int id topbar_starcount 0x7f0e00a8
int id topbar_starcount_decrease 0x7f0e00ad
int id topbar_starview 0x7f0e00a7
int id topbar_toolshop 0x7f0e00ac
int id tutorial_image_view 0x7f0e00b1
int id tutorial_text_view 0x7f0e00b0
int id unlockmessage_message 0x7f0e00b3
int id unlockmessage_toolimage 0x7f0e00b2
int id up 0x7f0e0008
int id useLogo 0x7f0e0012
int id withText 0x7f0e001f
int id worldbutton_energycount 0x7f0e00b9
int id worldbutton_levelcount 0x7f0e00b6
int id worldbutton_lock 0x7f0e00bb
int id worldbutton_preview 0x7f0e00b4
int id worldbutton_starcount 0x7f0e00b8
int id worldbutton_tickView 0x7f0e00b5
int id worldbutton_title 0x7f0e00b3
int id worlds_layout 0x7f0e00bd
int id worlds_topbar 0x7f0e00bc
int id worldbutton_energycount 0x7f0e00ba
int id worldbutton_levelcount 0x7f0e00b7
int id worldbutton_lock 0x7f0e00bc
int id worldbutton_preview 0x7f0e00b5
int id worldbutton_starcount 0x7f0e00b9
int id worldbutton_tickView 0x7f0e00b6
int id worldbutton_title 0x7f0e00b4
int id worlds_layout 0x7f0e00be
int id worlds_topbar 0x7f0e00bd
int id wrap_content 0x7f0e0020
int integer abc_config_activityDefaultDur 0x7f0b0001
int integer abc_config_activityShortDur 0x7f0b0002
@ -756,38 +757,39 @@ int layout abc_search_dropdown_item_icons_2line 0x7f040016
int layout abc_search_view 0x7f040017
int layout abc_select_dialog_material 0x7f040018
int layout game 0x7f040019
int layout levelbutton 0x7f04001a
int layout levels 0x7f04001b
int layout levelup_message 0x7f04001c
int layout message 0x7f04001d
int layout notification_media_action 0x7f04001e
int layout notification_media_cancel_action 0x7f04001f
int layout notification_template_big_media 0x7f040020
int layout notification_template_big_media_narrow 0x7f040021
int layout notification_template_lines 0x7f040022
int layout notification_template_media 0x7f040023
int layout notification_template_part_chronometer 0x7f040024
int layout notification_template_part_time 0x7f040025
int layout pre_start_screen 0x7f040026
int layout price_button 0x7f040027
int layout select_dialog_item_material 0x7f040028
int layout select_dialog_multichoice_material 0x7f040029
int layout select_dialog_singlechoice_material 0x7f04002a
int layout short_menu 0x7f04002b
int layout start_screen 0x7f04002c
int layout support_simple_spinner_dropdown_item 0x7f04002d
int layout tool_inspector 0x7f04002e
int layout tool_offer_slot 0x7f04002f
int layout tool_slot 0x7f040030
int layout tool_upgrade 0x7f040031
int layout toolbutton 0x7f040032
int layout toolbuttonbar 0x7f040033
int layout toolshop 0x7f040034
int layout topbar 0x7f040035
int layout tutorial 0x7f040036
int layout unlock_message 0x7f040037
int layout world_button 0x7f040038
int layout worlds 0x7f040039
int layout gl_test_screen 0x7f04001a
int layout levelbutton 0x7f04001b
int layout levels 0x7f04001c
int layout levelup_message 0x7f04001d
int layout message 0x7f04001e
int layout notification_media_action 0x7f04001f
int layout notification_media_cancel_action 0x7f040020
int layout notification_template_big_media 0x7f040021
int layout notification_template_big_media_narrow 0x7f040022
int layout notification_template_lines 0x7f040023
int layout notification_template_media 0x7f040024
int layout notification_template_part_chronometer 0x7f040025
int layout notification_template_part_time 0x7f040026
int layout pre_start_screen 0x7f040027
int layout price_button 0x7f040028
int layout select_dialog_item_material 0x7f040029
int layout select_dialog_multichoice_material 0x7f04002a
int layout select_dialog_singlechoice_material 0x7f04002b
int layout short_menu 0x7f04002c
int layout start_screen 0x7f04002d
int layout support_simple_spinner_dropdown_item 0x7f04002e
int layout tool_inspector 0x7f04002f
int layout tool_offer_slot 0x7f040030
int layout tool_slot 0x7f040031
int layout tool_upgrade 0x7f040032
int layout toolbutton 0x7f040033
int layout toolbuttonbar 0x7f040034
int layout toolshop 0x7f040035
int layout topbar 0x7f040036
int layout tutorial 0x7f040037
int layout unlock_message 0x7f040038
int layout world_button 0x7f040039
int layout worlds 0x7f04003a
int mipmap ic_launcher 0x7f030000
int raw background 0x7f060000
int raw ramp 0x7f060001
@ -841,44 +843,45 @@ int string short_menu_exit 0x7f07002f
int string short_menu_restart 0x7f070030
int string start_screen_gain_90_ep 0x7f070031
int string start_screen_play 0x7f070032
int string start_screen_unlock_all_levels 0x7f070033
int string start_screen_to_gl_test_screen 0x7f070033
int string start_screen_unlock_all_levels 0x7f070034
int string status_bar_notification_info_overflow 0x7f070013
int string textview_placeholder 0x7f070034
int string tool_name_bomb 0x7f070035
int string tool_name_magnet 0x7f070036
int string tool_name_ramp 0x7f070037
int string tool_name_spring 0x7f070038
int string tool_name_unknown 0x7f070039
int string tool_upgrade_force 0x7f07003a
int string tool_upgrade_none 0x7f07003b
int string tool_upgrade_radius 0x7f07003c
int string tool_upgrade_time 0x7f07003d
int string tool_upgrade_title_format_sd 0x7f07003e
int string tool_upgrade_title_placeholder 0x7f07003f
int string tool_upgrade_value_max 0x7f070040
int string topbar_level_format_d 0x7f070041
int string topbar_level_placeholder 0x7f070042
int string topbar_reset 0x7f070043
int string topbar_toolshop 0x7f070044
int string tutorial_leveled_up 0x7f070045
int string tutorial_place_ramp_air 0x7f070046
int string tutorial_place_ramp_air_2 0x7f070047
int string tutorial_place_ramp_gap 0x7f070048
int string tutorial_place_ramp_obstacle 0x7f070049
int string tutorial_place_tools 0x7f07004a
int string tutorial_placeholder 0x7f07004b
int string tutorial_to_toolshop 0x7f07004c
int string tutorial_toolbar 0x7f07004d
int string tutorial_toolshop_all_tools 0x7f07004e
int string tutorial_toolshop_equip_spring 0x7f07004f
int string tutorial_toolshop_inspector 0x7f070050
int string tutorial_toolshop_select_buy_spring 0x7f070051
int string tutorial_toolshop_toolbar 0x7f070052
int string tutorial_toolshop_welcome 0x7f070053
int string tutorial_welcome 0x7f070054
int string unlock_message_placeholder 0x7f070055
int string world_button_progress_placeholder 0x7f070056
int string world_button_title_placeholder 0x7f070057
int string textview_placeholder 0x7f070035
int string tool_name_bomb 0x7f070036
int string tool_name_magnet 0x7f070037
int string tool_name_ramp 0x7f070038
int string tool_name_spring 0x7f070039
int string tool_name_unknown 0x7f07003a
int string tool_upgrade_force 0x7f07003b
int string tool_upgrade_none 0x7f07003c
int string tool_upgrade_radius 0x7f07003d
int string tool_upgrade_time 0x7f07003e
int string tool_upgrade_title_format_sd 0x7f07003f
int string tool_upgrade_title_placeholder 0x7f070040
int string tool_upgrade_value_max 0x7f070041
int string topbar_level_format_d 0x7f070042
int string topbar_level_placeholder 0x7f070043
int string topbar_reset 0x7f070044
int string topbar_toolshop 0x7f070045
int string tutorial_leveled_up 0x7f070046
int string tutorial_place_ramp_air 0x7f070047
int string tutorial_place_ramp_air_2 0x7f070048
int string tutorial_place_ramp_gap 0x7f070049
int string tutorial_place_ramp_obstacle 0x7f07004a
int string tutorial_place_tools 0x7f07004b
int string tutorial_placeholder 0x7f07004c
int string tutorial_to_toolshop 0x7f07004d
int string tutorial_toolbar 0x7f07004e
int string tutorial_toolshop_all_tools 0x7f07004f
int string tutorial_toolshop_equip_spring 0x7f070050
int string tutorial_toolshop_inspector 0x7f070051
int string tutorial_toolshop_select_buy_spring 0x7f070052
int string tutorial_toolshop_toolbar 0x7f070053
int string tutorial_toolshop_welcome 0x7f070054
int string tutorial_welcome 0x7f070055
int string unlock_message_placeholder 0x7f070056
int string world_button_progress_placeholder 0x7f070057
int string world_button_title_placeholder 0x7f070058
int style AlertDialog_AppCompat 0x7f0a007d
int style AlertDialog_AppCompat_Light 0x7f0a007e
int style Animation_AppCompat_Dialog 0x7f0a007f

2
app/src/main/assets/levelpacks/Grasslands.xml
View File

@ -177,7 +177,7 @@
<obstacleData floating="false" moving="false" deadly="false" leftEdge="6.166328" rightEdge="7.1603284" height="0.293" y="-0.45350003">
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="16.936665" rightEdge="19.076664" height="0.217" y="0.30666652">
<obstacleData floating="true" moving="false" deadly="false" leftEdge="16.929998" rightEdge="19.069998" height="0.217" y="0.28666654">
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="false" leftEdge="7.203003" rightEdge="8.6170025" height="0.127" y="-0.41333312">

97
app/src/main/assets/shader/obstacleFragmentShader.glsl Normal file
View File

@ -0,0 +1,97 @@
precision mediump float;
uniform sampler2D texture;
uniform float alpha;
uniform vec2 texAtlasSize;
uniform vec2 gridSize;
uniform float deadly;
uniform float floating;
varying vec2 pass_TexCoords;
const float clampBorder = 0.05;
float itermod(in float x, in float y);
vec2 getInGridPos();
vec2 getTexCoordsInGridSquare();
vec2 getTexCoordsInAtlas(in vec2 texCoords, in float atlasIndex);
void main() {
vec2 gridPos = getInGridPos();
float index = 0.0;
bool top = gridPos.y == 0.0;
bool bottom = gridPos.y == gridSize.y - 1.0;
bool left = gridPos.x == 0.0;
bool right = gridPos.x == gridSize.x - 1.0;
if(top){
if(left)
index = 5.0 + itermod(gridSize.x, 2.0) + itermod(gridSize.y, 2.0);
else if(right)
index = 21.0 + itermod(gridSize.x, 2.0) + itermod(gridSize.y, 2.0);
else
index = itermod(gridPos.x, 3.0);
if(deadly == 1.0)
index += 8.0;
} else if(bottom){
if(left)
index = 37.0 + itermod(gridSize.x, 2.0) + itermod(gridSize.y, 2.0);
else if(right)
index = 53.0 + itermod(gridSize.x, 2.0) + itermod(gridSize.y, 2.0);
else
index = 16.0 + itermod(gridPos.x, 3.0);
if(floating == 1.0)
index += 8.0;
} else if(left){
index = 32.0 + itermod(gridPos.y, 3.0);
} else if(gridPos.x == gridSize.x - 1.0){
index = 40.0 + itermod(gridPos.y, 3.0);
} else{
index = 48.0 + itermod(gridPos.x, 2.0) + itermod(gridPos.y, 2.0);
}
vec2 texCoordsInGridSquare = getTexCoordsInGridSquare();
texCoordsInGridSquare = clamp(texCoordsInGridSquare, clampBorder, 1.0 - clampBorder);
vec2 texCoordsInAtlas = getTexCoordsInAtlas(texCoordsInGridSquare, index);
gl_FragColor = texture2D(texture, texCoordsInAtlas);
gl_FragColor.a = min(gl_FragColor.a, alpha);
}
float itermod(in float x, in float y){
while(x - y >= 0.0){
x -= y;
}
return x;
}
vec2 getInGridPos(){
float gridX = floor(pass_TexCoords.x * gridSize.x);
float gridY = floor(pass_TexCoords.y * gridSize.y);
return vec2(gridX, gridY);
}
vec2 getTexCoordsInGridSquare(){
float x = mod(pass_TexCoords.x, 1.0 / gridSize.x) * gridSize.x;
float y = mod(pass_TexCoords.y, 1.0 / gridSize.y) * gridSize.y;
return vec2(x, y);
}
vec2 getTexCoordsInAtlas(in vec2 texCoords, in float atlasIndex){
vec2 texAtlasCoords = vec2(0.0, 0.0);
texAtlasCoords.x = mod(texCoords.x, 1.0) / texAtlasSize.x;
texAtlasCoords.x += mod(atlasIndex, texAtlasSize.x) / texAtlasSize.x;
texAtlasCoords.y = mod(texCoords.y, 1.0) / texAtlasSize.y;
texAtlasCoords.y += floor(atlasIndex / texAtlasSize.y) / texAtlasSize.y;
return texAtlasCoords;
}

101
app/src/main/java/de/frajul/endlessroll/entities/Obstacle.java Normal file
View File

@ -0,0 +1,101 @@
package de.frajul.endlessroll.entities;
import java.util.Random;
import de.frajul.endlessroll.data.Vector;
import de.frajul.endlessroll.entities.textures.Texture;
import de.frajul.endlessroll.levels.MoveComponent;
import de.frajul.endlessroll.levels.ObstacleData;
import de.frajul.endlessroll.levels.worlds.World;
/**
* Created by Julian on 20.11.2015.
*/
public class Obstacle extends Entity {
private boolean deadly;
private boolean floating;
private boolean moving;
private final float GRID_SQUARE_SIZE = 0.1f;
private Vector gridSize;
private MoveComponent moveComponent;
private Vertex zeroPoint;
private boolean clockwise;
private float totalMoveDistance;
private float moveProgress;
public Obstacle(World world, ObstacleData data, float terrainEdge) {
super(world.getObstacleTexture(), new Vector(data.getX(), data.getY()), data.getWidth(), data.getHeight());
this.deadly = data.isDeadly();
this.floating = data.isFloating();
this.moving = data.isMoving();
this.moveComponent = data.getMoveComponent();
if (moveComponent != null)
moveComponent.shrink(new Vector(super.getWidth(), super.getHeight()));
if (!floating)
super.setToTerrain(terrainEdge);
if (moving)
randomMovementData();
gridSize = calcGridSize();
}
private Vector calcGridSize(){
int gridWidth = (int) (width / GRID_SQUARE_SIZE);
int gridHeight = (int) (height / GRID_SQUARE_SIZE);
gridWidth = Math.max(gridWidth, 2);
gridHeight = Math.max(gridHeight, 2);
return new Vector(gridWidth, gridHeight);
}
public void moveWithMoveComponent(float value) {
float distance = value * moveComponent.getSpeed() * 0.001f;
moveProgress += distance / totalMoveDistance;
moveProgress %= 1.0f;
setPositionForMoveProgress();
}
private void setPositionForMoveProgress() {
float distance = 0;
Vertex lastVertex = zeroPoint;
while (true) {
Vertex nextVertex = lastVertex.getNext(clockwise);
float nextDistance = distance + (Math.abs(lastVertex.getX() - nextVertex.getX()) * 0.5f * moveComponent.getWidth()) + (Math.abs(lastVertex.getY() - nextVertex.getY()) * 0.5f * moveComponent.getHeight());
if (nextDistance >= moveProgress * totalMoveDistance) {
float distanceLeft = moveProgress * totalMoveDistance - distance;
Vector direction = new Vector(nextVertex.getX(), nextVertex.getY()).translate(new Vector(lastVertex.getX(), lastVertex.getY()).negate());
direction = direction.mul(0.5f * distanceLeft);
super.setPosition(moveComponent.getPositionOfVertex(lastVertex).translate(direction));
return;
}
distance = nextDistance;
lastVertex = nextVertex;
}
}
private void randomMovementData() {
Random random = new Random();
int index = random.nextInt(4);
zeroPoint = Vertex.values()[index];
clockwise = random.nextBoolean();
totalMoveDistance = moveComponent.getWidth() * 2 + moveComponent.getHeight() * 2;
}
public boolean isMoving() {
return moving;
}
public boolean isDeadly() {
return deadly;
}
public boolean isFloating() {
return floating;
}
public Vector getGridSize(){
return gridSize;
}
}

37
app/src/main/java/de/frajul/endlessroll/main/game/TestScreenScene.java Normal file
View File

@ -0,0 +1,37 @@
package de.frajul.endlessroll.main.game;
import de.frajul.endlessroll.entities.Entity;
import de.frajul.endlessroll.entities.Obstacle;
import de.frajul.endlessroll.entities.particles.ParticleSystem;
import de.frajul.endlessroll.entities.textures.TexturePack;
import de.frajul.endlessroll.levels.ObstacleData;
import de.frajul.endlessroll.levels.worlds.World;
public class TestScreenScene extends Scene {
private Obstacle testObstacle;
public TestScreenScene(TexturePack texturePack, ParticleSystem particleSystem) {
super(texturePack, particleSystem);
terrain.createEndless(World.ICY_MOUNTAINS, -.8f);
testObstacle = createObstacle(-1f, 1.139f, 0, 0.217f, true, false);
obstacles.add(testObstacle);
obstacles.add(createObstacle(-1f, 1.139f, 0, 0.217f, false, false));
}
private Obstacle createObstacle(float leftEdge, float rightEdge, float y, float height, boolean floating, boolean deadly){
ObstacleData data = new ObstacleData();
data.setLeftEdge(leftEdge);
data.setRightEdge(rightEdge);
data.setY(y);
data.setHeight(height);
data.setFloating(floating);
data.setDeadly(deadly);
return new Obstacle(World.GRASSLANDS, data, -.8f);
}
@Override
protected void removeEntityFromAllLists(Entity entity) {
}
}

34
app/src/main/java/de/frajul/endlessroll/main/screens/GLTestScreen.java Normal file
View File

@ -0,0 +1,34 @@
package de.frajul.endlessroll.main.screens;
import android.support.annotation.LayoutRes;
import android.widget.RelativeLayout;
import de.frajul.endlessroll.R;
import de.frajul.endlessroll.main.GameActivity;
import de.frajul.endlessroll.main.MyGlSurfaceView;
import de.frajul.endlessroll.rendering.Rendering;
/**
* Created by Julian on 03.08.2017.
*/
public class GLTestScreen extends GLScreen<RelativeLayout> {
private Rendering rendering;
public GLTestScreen(GameActivity gameActivity, MyGlSurfaceView glView) throws Exception{
super(ScreenType.GL_TEST, gameActivity, R.layout.gl_test_screen, glView);
rendering = new TestScreenRendering(gameActivity);
glView.addRendering(rendering);
}
@Override
public void prepareToBeShown() {
glView.setCurrentRendering(rendering);
}
@Override
public void onBackKeyDown() {
gameActivity.flipToScreen(ScreenType.START);
}
}

57
app/src/main/java/de/frajul/endlessroll/main/screens/TestScreenRendering.java Normal file
View File

@ -0,0 +1,57 @@
package de.frajul.endlessroll.main.screens;
import android.view.MotionEvent;
import android.view.View;
import de.frajul.endlessroll.entities.particles.ParticleSystem;
import de.frajul.endlessroll.entities.textures.TexturePack;
import de.frajul.endlessroll.main.GameActivity;
import de.frajul.endlessroll.main.GameLog;
import de.frajul.endlessroll.main.game.Game;
import de.frajul.endlessroll.main.game.TestScreenScene;
import de.frajul.endlessroll.main.game.Timer;
import de.frajul.endlessroll.rendering.Rendering;
/**
* Created by Julian on 20.07.2016.
*/
public class TestScreenRendering extends Rendering<TestScreenScene> {
private Timer timer;
private ParticleSystem particleSystem;
public TestScreenRendering(GameActivity gameActivity) throws Exception{
super(gameActivity);
particleSystem = new ParticleSystem(gameActivity);
}
@Override
public TestScreenScene init(TexturePack texturePack, Timer timer, boolean isFirstTime) {
this.timer = timer;
try {
if (isFirstTime)
scene = new TestScreenScene(texturePack, particleSystem);
else
scene.setTexturePack(texturePack);
}catch (Exception e){
GameLog.e(e);
}
try {
particleSystem.loadTextures();
} catch (Exception e) {
}
return scene;
}
@Override
public void update() {
particleSystem.update(timer);
scene.update(timer);
}
@Override
public boolean onTouch(View v, MotionEvent event) {
return false;
}
}

71
app/src/main/java/de/frajul/endlessroll/rendering/shader/ObstacleShader.java Normal file
View File

@ -0,0 +1,71 @@
package de.frajul.endlessroll.rendering.shader;
import android.content.Context;
import android.opengl.GLES20;
import de.frajul.endlessroll.data.Vector;
import de.frajul.endlessroll.entities.Entity;
import de.frajul.endlessroll.entities.textures.Texture;
import de.frajul.endlessroll.main.game.Camera;
import de.frajul.endlessroll.rendering.MatrixCreator;
/**
* Created by Julian on 10.08.2016.
*/
public class ObstacleShader extends ShaderProgram {
private int location_mvpMatrix;
private int location_transformationMatrix;
private int location_alpha;
private int location_texAtlasSize;
private int location_gridSize;
private int location_deadly;
private int location_floating;
public ObstacleShader(Context context) throws Exception {
super(context, "shader/entityVertexShader.glsl", "shader/obstacleFragmentShader.glsl");
}
@Override
protected void loadUniformLocations() {
location_mvpMatrix = super.getUniformLocation("mvpMatrix");
location_transformationMatrix = super.getUniformLocation("transformationMatrix");
location_alpha = super.getUniformLocation("alpha");
location_texAtlasSize = super.getUniformLocation("texAtlasSize");
location_gridSize = super.getUniformLocation("gridSize");
location_deadly = super.getUniformLocation("deadly");
location_floating = super.getUniformLocation("floating");
}
public void loadMVPMatrix(MatrixCreator matrixCreator, Camera camera) {
float[] mvpMatrix = matrixCreator.createModelViewProjectionMatrix(camera);
GLES20.glUniformMatrix4fv(location_mvpMatrix, 1, false, mvpMatrix, 0);
}
public void loadTransformationMatrix(MatrixCreator matrixCreator, Entity entity) {
float[] transformationMatrix = matrixCreator.createTransformationMatrix(entity);
GLES20.glUniformMatrix4fv(location_transformationMatrix, 1, false, transformationMatrix, 0);
}
public void loadAlpha(float alpha) {
GLES20.glUniform1f(location_alpha, alpha);
}
public void loadTextureAtlasInfos(Texture texture) {
GLES20.glUniform2f(location_texAtlasSize, texture.getAtlasWidth(),
texture.getAtlasHeight());
}
public void loadGridSize(Vector gridSize) {
GLES20.glUniform2f(location_gridSize, gridSize.getX(), gridSize.getY());
}
public void loadDeadly(boolean deadly) {
GLES20.glUniform1f(location_deadly, deadly ? 1 : 0);
}
public void loadFloating(boolean floating) {
GLES20.glUniform1f(location_floating, floating ? 1 : 0);
}
}

BIN
app/src/main/res/drawable/obstacles_grass.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 201 KiB

After

Width:  |  Height:  |  Size: 40 KiB

5
app/src/main/res/layout/gl_test_screen.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_height="match_parent">
</RelativeLayout>

32
app/src/main/res/layout/start_screen.xml
View File

@ -7,12 +7,12 @@
android:id="@+id/startscreen_sound"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/xml_selector_sound"
android:textOff=""
android:textOn=""
android:layout_alignEnd="@+id/startscreen_play"
android:layout_alignParentBottom="true"
android:layout_alignRight="@+id/startscreen_play"
android:layout_alignEnd="@+id/startscreen_play"/>
android:background="@drawable/xml_selector_sound"
android:textOff=""
android:textOn=""/>
<Button
android:id="@+id/startscreen_play"
@ -33,20 +33,30 @@
style="@style/GameButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/start_screen_unlock_all_levels"
android:visibility="visible"
android:layout_alignParentRight="true"
android:layout_below="@+id/startscreen_play"
android:layout_alignParentRight="true"/>
android:text="@string/start_screen_unlock_all_levels"
android:visibility="visible"/>
<Button
android:id="@+id/startscreen_gain_90_ep"
style="@style/GameButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/start_screen_gain_90_ep"
android:visibility="visible"
android:layout_below="@+id/startscreen_play"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"/>
android:layout_alignParentStart="true"
android:layout_below="@+id/startscreen_play"
android:text="@string/start_screen_gain_90_ep"
android:visibility="visible"/>
<Button
android:id="@+id/startscreen_to_gl_test_screen"
style="@style/GameButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:text="@string/start_screen_to_gl_test_screen"
android:visibility="visible"/>
</RelativeLayout>

3
app/src/main/res/values/strings.xml
View File

@ -6,7 +6,7 @@
<string name="percent_placeholder">85.1%</string>
<string name="game_playerprogress_placeholder">0.0m</string>
<string name="game_playerprogress_format_f">%.2fm</string>
<string name="game_playerprogress_format_f">%.1fm</string>
<string name="game_playerspeed_placeholder">0.0m/s</string>
<string name="game_playerspeed_format_f">%.1fm/s</string>
<string name="game_fps_placeholder">Fps: 00</string>
@ -27,6 +27,7 @@
<string name="start_screen_play">Play</string>
<string name="start_screen_unlock_all_levels">Unlock all levels (Yes! It\'s magic!)</string>
<string name="start_screen_gain_90_ep">Gain 90 ep (Nope! No magic at all!)</string>
<string name="start_screen_to_gl_test_screen">Test GL Stuff!!!</string>
<string name="tool_upgrade_title_placeholder">Time (Lv12)</string>
<string name="topbar_level_placeholder">Level: 24</string>
<string name="topbar_level_format_d">Level: %d</string>