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

Removed Toolpreview feature

Browse Source 
Added Power Mushroom + functionality
This commit is contained in:
=
2017-10-03 01:13:37 +02:00
parent 6c49f21b74
commit 974633233d
13 changed files with 1531 additions and 1308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -456,7 +456,7 @@ public final class R {
public static final int abc_textfield_search_activated_mtrl_alpha = 0x7f020042;
public static final int abc_textfield_search_default_mtrl_alpha = 0x7f020043;
public static final int abc_textfield_search_material = 0x7f020044;
public static final int notification_template_icon_bg = 0x7f020090;
public static final int notification_template_icon_bg = 0x7f020092;
}
public static final class id {
public static final int action0 = 0x7f0e006c;

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

File diff suppressed because it is too large Load Diff

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

@ -27,14 +27,14 @@
"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_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\\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"
@ -203,6 +203,10 @@
"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\\tools_power_mushroom_button.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_power_mushroom_button.png"
},
{
"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"
@ -255,6 +259,10 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\xml_background_toolupgrade.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_background_toolupgrade.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\tools_power_mushroom.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_power_mushroom.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\backgrounds_menu_levelup.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\backgrounds_menu_levelup.png"

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"/><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>
<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"/><file name="particleEffects/fire.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\fire.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>

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

File diff suppressed because one or more lines are too long

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

@ -269,6 +269,7 @@
<string name="textview_placeholder">I\'m a text!</string>
<string name="tool_name_bomb">Bomb</string>
<string name="tool_name_magnet">Magnet</string>
<string name="tool_name_power_mushroom">Power Mushroom</string>
<string name="tool_name_ramp">Ramp</string>
<string name="tool_name_spring">Spring</string>
<string name="tool_name_unknown">\?\?\?</string>

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

Binary file not shown.

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

@ -486,7 +486,7 @@ int drawable guis_sound_on 0x7f020056
int drawable lock_locked 0x7f020057
int drawable lock_unlocked 0x7f020058
int drawable magnet_field 0x7f020059
int drawable notification_template_icon_bg 0x7f020090
int drawable notification_template_icon_bg 0x7f020092
int drawable obstacles_cave 0x7f02005a
int drawable obstacles_grass 0x7f02005b
int drawable obstacles_mountains 0x7f02005c
@ -513,34 +513,36 @@ int drawable tools_emptybutton 0x7f020070
int drawable tools_lockedbutton 0x7f020071
int drawable tools_magnet 0x7f020072
int drawable tools_magnetbutton 0x7f020073
int drawable tools_ramp 0x7f020074
int drawable tools_rampbutton 0x7f020075
int drawable tools_spring 0x7f020076
int drawable tools_springbutton 0x7f020077
int drawable tools_unlockedbutton 0x7f020078
int drawable tutorial_place_ramp_air_1 0x7f020079
int drawable tutorial_place_ramp_gap 0x7f02007a
int drawable tutorial_place_ramp_obstacle 0x7f02007b
int drawable tutorial_place_tools 0x7f02007c
int drawable tutorial_to_toolshop 0x7f02007d
int drawable tutorial_toolbar 0x7f02007e
int drawable tutorial_toolshop_all_tools 0x7f02007f
int drawable tutorial_toolshop_equip_spring 0x7f020080
int drawable tutorial_toolshop_inspector 0x7f020081
int drawable tutorial_toolshop_select_buy_spring 0x7f020082
int drawable tutorial_toolshop_toolbar 0x7f020083
int drawable xml_background_bountymessage 0x7f020084
int drawable xml_background_levelbutton 0x7f020085
int drawable xml_background_toolslot 0x7f020086
int drawable xml_background_toolupgrade 0x7f020087
int drawable xml_background_tutorialtextview 0x7f020088
int drawable xml_background_worldbutton 0x7f020089
int drawable xml_layers_toolprogressbar 0x7f02008a
int drawable xml_selector_gamebutton 0x7f02008b
int drawable xml_selector_pricebutton 0x7f02008c
int drawable xml_selector_settingsbutton 0x7f02008d
int drawable xml_selector_shopbutton 0x7f02008e
int drawable xml_selector_sound 0x7f02008f
int drawable tools_power_mushroom 0x7f020074
int drawable tools_power_mushroom_button 0x7f020075
int drawable tools_ramp 0x7f020076
int drawable tools_rampbutton 0x7f020077
int drawable tools_spring 0x7f020078
int drawable tools_springbutton 0x7f020079
int drawable tools_unlockedbutton 0x7f02007a
int drawable tutorial_place_ramp_air_1 0x7f02007b
int drawable tutorial_place_ramp_gap 0x7f02007c
int drawable tutorial_place_ramp_obstacle 0x7f02007d
int drawable tutorial_place_tools 0x7f02007e
int drawable tutorial_to_toolshop 0x7f02007f
int drawable tutorial_toolbar 0x7f020080
int drawable tutorial_toolshop_all_tools 0x7f020081
int drawable tutorial_toolshop_equip_spring 0x7f020082
int drawable tutorial_toolshop_inspector 0x7f020083
int drawable tutorial_toolshop_select_buy_spring 0x7f020084
int drawable tutorial_toolshop_toolbar 0x7f020085
int drawable xml_background_bountymessage 0x7f020086
int drawable xml_background_levelbutton 0x7f020087
int drawable xml_background_toolslot 0x7f020088
int drawable xml_background_toolupgrade 0x7f020089
int drawable xml_background_tutorialtextview 0x7f02008a
int drawable xml_background_worldbutton 0x7f02008b
int drawable xml_layers_toolprogressbar 0x7f02008c
int drawable xml_selector_gamebutton 0x7f02008d
int drawable xml_selector_pricebutton 0x7f02008e
int drawable xml_selector_settingsbutton 0x7f02008f
int drawable xml_selector_shopbutton 0x7f020090
int drawable xml_selector_sound 0x7f020091
int id action0 0x7f0e006c
int id action_bar 0x7f0e0041
int id action_bar_activity_content 0x7f0e0000
@ -859,38 +861,39 @@ int string status_bar_notification_info_overflow 0x7f070013
int string textview_placeholder 0x7f070036
int string tool_name_bomb 0x7f070037
int string tool_name_magnet 0x7f070038
int string tool_name_ramp 0x7f070039
int string tool_name_spring 0x7f07003a
int string tool_name_unknown 0x7f07003b
int string tool_upgrade_force 0x7f07003c
int string tool_upgrade_none 0x7f07003d
int string tool_upgrade_radius 0x7f07003e
int string tool_upgrade_time 0x7f07003f
int string tool_upgrade_title_format_sd 0x7f070040
int string tool_upgrade_title_placeholder 0x7f070041
int string tool_upgrade_value_max 0x7f070042
int string topbar_level_format_d 0x7f070043
int string topbar_level_placeholder 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 string tool_name_power_mushroom 0x7f070039
int string tool_name_ramp 0x7f07003a
int string tool_name_spring 0x7f07003b
int string tool_name_unknown 0x7f07003c
int string tool_upgrade_force 0x7f07003d
int string tool_upgrade_none 0x7f07003e
int string tool_upgrade_radius 0x7f07003f
int string tool_upgrade_time 0x7f070040
int string tool_upgrade_title_format_sd 0x7f070041
int string tool_upgrade_title_placeholder 0x7f070042
int string tool_upgrade_value_max 0x7f070043
int string topbar_level_format_d 0x7f070044
int string topbar_level_placeholder 0x7f070045
int string topbar_toolshop 0x7f070046
int string tutorial_leveled_up 0x7f070047
int string tutorial_place_ramp_air 0x7f070048
int string tutorial_place_ramp_air_2 0x7f070049
int string tutorial_place_ramp_gap 0x7f07004a
int string tutorial_place_ramp_obstacle 0x7f07004b
int string tutorial_place_tools 0x7f07004c
int string tutorial_placeholder 0x7f07004d
int string tutorial_to_toolshop 0x7f07004e
int string tutorial_toolbar 0x7f07004f
int string tutorial_toolshop_all_tools 0x7f070050
int string tutorial_toolshop_equip_spring 0x7f070051
int string tutorial_toolshop_inspector 0x7f070052
int string tutorial_toolshop_select_buy_spring 0x7f070053
int string tutorial_toolshop_toolbar 0x7f070054
int string tutorial_toolshop_welcome 0x7f070055
int string tutorial_welcome 0x7f070056
int string unlock_message_placeholder 0x7f070057
int string world_button_progress_placeholder 0x7f070058
int string world_button_title_placeholder 0x7f070059
int style AlertDialog_AppCompat 0x7f0a007d
int style AlertDialog_AppCompat_Light 0x7f0a007e
int style Animation_AppCompat_Dialog 0x7f0a007f