Different distribution of safed user data

New currency (Energy) -> once each level
Levelpacks are shown by their names in WorldsScreen and also ordered by their id
Stars and Energy don't have their sizes safed in levelpacks because they are static
Different Ramp size and Spring effect
Lv up can be shown on every Screen
If clicked on Tool-Bounty on lv-up screen, transfer to Toolshop
This commit is contained in:
=
2017-02-19 15:05:43 +01:00
parent aea336d850
commit 0bad3e064c
98 changed files with 1662 additions and 1110 deletions

View File

@ -456,10 +456,10 @@ 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 = 0x7f020074;
public static final int notification_template_icon_bg = 0x7f020070;
}
public static final class id {
public static final int action0 = 0x7f0d006b;
public static final int action0 = 0x7f0d006a;
public static final int action_bar = 0x7f0d0041;
public static final int action_bar_activity_content = 0x7f0d0000;
public static final int action_bar_container = 0x7f0d0040;
@ -468,7 +468,7 @@ public final class R {
public static final int action_bar_subtitle = 0x7f0d0022;
public static final int action_bar_title = 0x7f0d0021;
public static final int action_context_bar = 0x7f0d0042;
public static final int action_divider = 0x7f0d006f;
public static final int action_divider = 0x7f0d006e;
public static final int action_menu_divider = 0x7f0d0002;
public static final int action_menu_presenter = 0x7f0d0003;
public static final int action_mode_bar = 0x7f0d003e;
@ -479,9 +479,9 @@ public final class R {
public static final int always = 0x7f0d001b;
public static final int beginning = 0x7f0d0018;
public static final int buttonPanel = 0x7f0d002b;
public static final int cancel_action = 0x7f0d006c;
public static final int cancel_action = 0x7f0d006b;
public static final int checkbox = 0x7f0d0039;
public static final int chronometer = 0x7f0d0072;
public static final int chronometer = 0x7f0d0071;
public static final int collapseActionView = 0x7f0d001c;
public static final int contentPanel = 0x7f0d0031;
public static final int custom = 0x7f0d0037;
@ -491,7 +491,7 @@ public final class R {
public static final int disableHome = 0x7f0d000c;
public static final int edit_query = 0x7f0d0043;
public static final int end = 0x7f0d0019;
public static final int end_padder = 0x7f0d0077;
public static final int end_padder = 0x7f0d0076;
public static final int expand_activities_button = 0x7f0d0025;
public static final int expanded_menu = 0x7f0d0038;
public static final int home = 0x7f0d0004;
@ -499,12 +499,12 @@ public final class R {
public static final int icon = 0x7f0d0029;
public static final int ifRoom = 0x7f0d001d;
public static final int image = 0x7f0d0026;
public static final int info = 0x7f0d0076;
public static final int line1 = 0x7f0d0070;
public static final int line3 = 0x7f0d0074;
public static final int info = 0x7f0d0075;
public static final int line1 = 0x7f0d006f;
public static final int line3 = 0x7f0d0073;
public static final int listMode = 0x7f0d0009;
public static final int list_item = 0x7f0d0028;
public static final int media_actions = 0x7f0d006e;
public static final int media_actions = 0x7f0d006d;
public static final int middle = 0x7f0d001a;
public static final int multiply = 0x7f0d0013;
public static final int never = 0x7f0d001e;
@ -538,13 +538,13 @@ public final class R {
public static final int src_atop = 0x7f0d0015;
public static final int src_in = 0x7f0d0016;
public static final int src_over = 0x7f0d0017;
public static final int status_bar_latest_event_content = 0x7f0d006d;
public static final int status_bar_latest_event_content = 0x7f0d006c;
public static final int submit_area = 0x7f0d004c;
public static final int tabMode = 0x7f0d000b;
public static final int text = 0x7f0d0075;
public static final int text2 = 0x7f0d0073;
public static final int text = 0x7f0d0074;
public static final int text2 = 0x7f0d0072;
public static final int textSpacerNoButtons = 0x7f0d0034;
public static final int time = 0x7f0d0071;
public static final int time = 0x7f0d0070;
public static final int title = 0x7f0d002a;
public static final int title_template = 0x7f0d002f;
public static final int topPanel = 0x7f0d002e;

View File

@ -1628,44 +1628,40 @@ containing a value of this type.
public static final int guis_sound_on=0x7f02004f;
public static final int lock_locked=0x7f020050;
public static final int lock_unlocked=0x7f020051;
public static final int notification_template_icon_bg=0x7f020074;
public static final int obstacle=0x7f020052;
public static final int obstacles_cave=0x7f020053;
public static final int obstacles_grass=0x7f020054;
public static final int obstacles_mountains=0x7f020055;
public static final int playershapes_ball=0x7f020056;
public static final int previews_grass=0x7f020057;
public static final int purple=0x7f020058;
public static final int ramp=0x7f020059;
public static final int rampbutton=0x7f02005a;
public static final int splitter=0x7f02005b;
public static final int star=0x7f02005c;
public static final int star_empty=0x7f02005d;
public static final int star_icon=0x7f02005e;
public static final int stars_0=0x7f02005f;
public static final int stars_1=0x7f020060;
public static final int stars_2=0x7f020061;
public static final int stars_3=0x7f020062;
public static final int terrain_t_grass=0x7f020063;
public static final int tools_bomb=0x7f020064;
public static final int tools_bombbutton=0x7f020065;
public static final int tools_emptybutton=0x7f020066;
public static final int tools_lockedbutton=0x7f020067;
public static final int tools_magnet=0x7f020068;
public static final int tools_magnetbutton=0x7f020069;
public static final int tools_spring=0x7f02006a;
public static final int tools_springbutton=0x7f02006b;
public static final int tools_unlockedbutton=0x7f02006c;
public static final int xml_custom_button=0x7f02006d;
public static final int xml_levelbutton_background=0x7f02006e;
public static final int xml_sound_toggle=0x7f02006f;
public static final int xml_tool_slot_background=0x7f020070;
public static final int xml_toolprogressbarlayers=0x7f020071;
public static final int xml_unlock_message_background=0x7f020072;
public static final int xml_worldbutton_background=0x7f020073;
public static final int notification_template_icon_bg=0x7f020070;
public static final int obstacles_cave=0x7f020052;
public static final int obstacles_grass=0x7f020053;
public static final int obstacles_mountains=0x7f020054;
public static final int playershapes_ball=0x7f020055;
public static final int previews_grass=0x7f020056;
public static final int purple=0x7f020057;
public static final int ramp=0x7f020058;
public static final int rampbutton=0x7f020059;
public static final int splitter=0x7f02005a;
public static final int star=0x7f02005b;
public static final int star_empty=0x7f02005c;
public static final int star_icon=0x7f02005d;
public static final int terrain_c_grass=0x7f02005e;
public static final int terrain_t_grass=0x7f02005f;
public static final int tools_bomb=0x7f020060;
public static final int tools_bombbutton=0x7f020061;
public static final int tools_emptybutton=0x7f020062;
public static final int tools_lockedbutton=0x7f020063;
public static final int tools_magnet=0x7f020064;
public static final int tools_magnetbutton=0x7f020065;
public static final int tools_spring=0x7f020066;
public static final int tools_springbutton=0x7f020067;
public static final int tools_unlockedbutton=0x7f020068;
public static final int xml_custom_button=0x7f020069;
public static final int xml_levelbutton_background=0x7f02006a;
public static final int xml_sound_toggle=0x7f02006b;
public static final int xml_tool_slot_background=0x7f02006c;
public static final int xml_toolprogressbarlayers=0x7f02006d;
public static final int xml_unlock_message_background=0x7f02006e;
public static final int xml_worldbutton_background=0x7f02006f;
}
public static final class id {
public static final int action0=0x7f0d006b;
public static final int action0=0x7f0d006a;
public static final int action_bar=0x7f0d0041;
public static final int action_bar_activity_content=0x7f0d0000;
public static final int action_bar_container=0x7f0d0040;
@ -1674,7 +1670,7 @@ containing a value of this type.
public static final int action_bar_subtitle=0x7f0d0022;
public static final int action_bar_title=0x7f0d0021;
public static final int action_context_bar=0x7f0d0042;
public static final int action_divider=0x7f0d006f;
public static final int action_divider=0x7f0d006e;
public static final int action_menu_divider=0x7f0d0002;
public static final int action_menu_presenter=0x7f0d0003;
public static final int action_mode_bar=0x7f0d003e;
@ -1686,9 +1682,9 @@ containing a value of this type.
public static final int beginning=0x7f0d0018;
public static final int button3=0x7f0d007f;
public static final int buttonPanel=0x7f0d002b;
public static final int cancel_action=0x7f0d006c;
public static final int cancel_action=0x7f0d006b;
public static final int checkbox=0x7f0d0039;
public static final int chronometer=0x7f0d0072;
public static final int chronometer=0x7f0d0071;
public static final int collapseActionView=0x7f0d001c;
public static final int contentPanel=0x7f0d0031;
public static final int custom=0x7f0d0037;
@ -1698,12 +1694,11 @@ containing a value of this type.
public static final int disableHome=0x7f0d000c;
public static final int edit_query=0x7f0d0043;
public static final int end=0x7f0d0019;
public static final int end_padder=0x7f0d0077;
public static final int end_padder=0x7f0d0076;
public static final int expand_activities_button=0x7f0d0025;
public static final int expanded_menu=0x7f0d0038;
public static final int game_countdown=0x7f0d0058;
public static final int game_countdown=0x7f0d0057;
public static final int game_fps=0x7f0d0054;
public static final int game_levelup=0x7f0d0057;
public static final int game_message=0x7f0d0056;
public static final int game_pausebutton=0x7f0d0050;
public static final int game_playerprogress=0x7f0d0052;
@ -1712,35 +1707,35 @@ containing a value of this type.
public static final int game_toolbuttonbar=0x7f0d0051;
public static final int home=0x7f0d0004;
public static final int homeAsUp=0x7f0d000d;
public static final int horizontalScrollView=0x7f0d005f;
public static final int horizontalScrollView=0x7f0d005e;
public static final int icon=0x7f0d0029;
public static final int ifRoom=0x7f0d001d;
public static final int image=0x7f0d0026;
public static final int imageView=0x7f0d0065;
public static final int imageView=0x7f0d0064;
public static final int imageView2=0x7f0d00a4;
public static final int imageView3=0x7f0d00a2;
public static final int info=0x7f0d0076;
public static final int levelbutton_lock=0x7f0d005d;
public static final int levelbutton_star1=0x7f0d005a;
public static final int levelbutton_star2=0x7f0d005b;
public static final int levelbutton_star3=0x7f0d005c;
public static final int levelbutton_textview=0x7f0d0059;
public static final int levels_bottomRow=0x7f0d0061;
public static final int levels_topRow=0x7f0d0060;
public static final int levels_topbar=0x7f0d005e;
public static final int levelup_level=0x7f0d0063;
public static final int levelup_mainlayout=0x7f0d0062;
public static final int levelup_text=0x7f0d0064;
public static final int levelup_unlocklist=0x7f0d0066;
public static final int line1=0x7f0d0070;
public static final int line3=0x7f0d0074;
public static final int info=0x7f0d0075;
public static final int levelbutton_lock=0x7f0d005c;
public static final int levelbutton_star1=0x7f0d0059;
public static final int levelbutton_star2=0x7f0d005a;
public static final int levelbutton_star3=0x7f0d005b;
public static final int levelbutton_textview=0x7f0d0058;
public static final int levels_bottomRow=0x7f0d0060;
public static final int levels_topRow=0x7f0d005f;
public static final int levels_topbar=0x7f0d005d;
public static final int levelup_level=0x7f0d0062;
public static final int levelup_mainlayout=0x7f0d0061;
public static final int levelup_text=0x7f0d0063;
public static final int levelup_unlocklist=0x7f0d0065;
public static final int line1=0x7f0d006f;
public static final int line3=0x7f0d0073;
public static final int listMode=0x7f0d0009;
public static final int list_item=0x7f0d0028;
public static final int media_actions=0x7f0d006e;
public static final int message_exitbutton=0x7f0d0069;
public static final int message_leftbutton=0x7f0d0068;
public static final int message_title=0x7f0d0067;
public static final int message_tryagainbutton=0x7f0d006a;
public static final int media_actions=0x7f0d006d;
public static final int message_exitbutton=0x7f0d0068;
public static final int message_leftbutton=0x7f0d0067;
public static final int message_title=0x7f0d0066;
public static final int message_tryagainbutton=0x7f0d0069;
public static final int middle=0x7f0d001a;
public static final int multiply=0x7f0d0013;
public static final int never=0x7f0d001e;
@ -1766,10 +1761,10 @@ containing a value of this type.
public static final int search_voice_btn=0x7f0d004e;
public static final int select_dialog_listview=0x7f0d004f;
public static final int shortcut=0x7f0d003a;
public static final int shortmenu_continue=0x7f0d0079;
public static final int shortmenu_exit=0x7f0d007b;
public static final int shortmenu_restart=0x7f0d007a;
public static final int shortmenu_topbar=0x7f0d0078;
public static final int shortmenu_continue=0x7f0d0078;
public static final int shortmenu_exit=0x7f0d007a;
public static final int shortmenu_restart=0x7f0d0079;
public static final int shortmenu_topbar=0x7f0d0077;
public static final int showCustom=0x7f0d000f;
public static final int showHome=0x7f0d0010;
public static final int showTitle=0x7f0d0011;
@ -1779,15 +1774,16 @@ containing a value of this type.
public static final int src_in=0x7f0d0016;
public static final int src_over=0x7f0d0017;
public static final int startscreen_comingsoon=0x7f0d007d;
public static final int startscreen_maxcheat=0x7f0d007e;
public static final int startscreen_play=0x7f0d007c;
public static final int startscreen_sound=0x7f0d007e;
public static final int status_bar_latest_event_content=0x7f0d006d;
public static final int startscreen_sound=0x7f0d007b;
public static final int status_bar_latest_event_content=0x7f0d006c;
public static final int submit_area=0x7f0d004c;
public static final int tabMode=0x7f0d000b;
public static final int text=0x7f0d0075;
public static final int text2=0x7f0d0073;
public static final int text=0x7f0d0074;
public static final int text2=0x7f0d0072;
public static final int textSpacerNoButtons=0x7f0d0034;
public static final int time=0x7f0d0071;
public static final int time=0x7f0d0070;
public static final int title=0x7f0d002a;
public static final int title_template=0x7f0d002f;
public static final int toolProgressBar=0x7f0d0085;

View File

@ -1,7 +1,7 @@
<levelPack>
<world>GRASSLANDS</world>
<levelPack id="0">
<theme>GRASSLANDS</theme>
<levels class="java.util.ArrayList">
<level number="1" goalX="22.606565" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<level packId="0" id="1" goalX="22.606565" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="0.5854988" width="7.1709976"/>
<tileData x="10.153494" width="10.408993"/>
@ -15,12 +15,12 @@
<obstacleData floating="false" moving="false" deadly="false" leftEdge="22.166656" rightEdge="22.666656" height="0.639" y="-0.28050002"/>
</obstacles>
<stars class="java.util.ArrayList">
<starData index="1" x="11.159975" y="-0.15999995" width="0.25" height="0.25"/>
<starData index="2" x="15.106676" y="-0.14000002" width="0.25" height="0.25"/>
<starData index="3" x="22.043303" y="-0.20666662" width="0.25" height="0.25"/>
<positionData x="11.159975" y="-0.15999995"/>
<positionData x="15.106676" y="-0.14000002"/>
<positionData x="22.043303" y="-0.20666662"/>
</stars>
</level>
<level number="2" goalX="22.366613" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<level packId="0" id="2" goalX="22.366613" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="0.9448314" width="7.8896627"/>
<tileData x="8.345928" width="4.4445295"/>
@ -42,12 +42,12 @@
<obstacleData floating="false" moving="false" deadly="false" leftEdge="20.123379" rightEdge="20.623379" height="0.5" y="-0.35000002"/>
</obstacles>
<stars class="java.util.ArrayList">
<starData index="1" x="10.94335" y="-0.61999965" width="0.25" height="0.25"/>
<starData index="2" x="15.7367" y="0.3199999" width="0.25" height="0.25"/>
<starData index="3" x="18.893328" y="-0.12666662" width="0.25" height="0.25"/>
<positionData x="10.94335" y="-0.61999965"/>
<positionData x="15.7367" y="0.3199999"/>
<positionData x="18.893328" y="-0.12666662"/>
</stars>
</level>
<level number="3" goalX="19.200012" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<level packId="0" id="3" goalX="19.200012" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="-0.4151678" width="5.1696644"/>
<tileData x="7.1337633" width="8.020197"/>
@ -63,12 +63,12 @@
<obstacleData floating="false" moving="false" deadly="false" leftEdge="18.396694" rightEdge="18.896694" height="0.789" y="-0.20550004"/>
</obstacles>
<stars class="java.util.ArrayList">
<starData index="1" x="2.6399994" y="0.10666669" width="0.25" height="0.25"/>
<starData index="2" x="8.793346" y="-0.4733331" width="0.25" height="0.25"/>
<starData index="3" x="12.253348" y="-0.13333318" width="0.25" height="0.25"/>
<positionData x="2.6399994" y="0.10666669"/>
<positionData x="8.793346" y="-0.4733331"/>
<positionData x="12.253348" y="-0.13333318"/>
</stars>
</level>
<level number="4" goalX="23.933224" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<level packId="0" id="4" goalX="23.933224" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="6.06402" width="18.12804"/>
<tileData x="19.269924" width="3.0757751"/>
@ -87,12 +87,12 @@
<obstacleData floating="false" moving="false" deadly="false" leftEdge="5.79467" rightEdge="8.37867" height="0.544" y="-0.328"/>
</obstacles>
<stars class="java.util.ArrayList">
<starData index="1" x="11.560022" y="-0.26000002" width="0.25" height="0.25"/>
<starData index="2" x="16.310017" y="0.80666655" width="0.25" height="0.25"/>
<starData index="3" x="21.9833" y="-0.099999994" width="0.25" height="0.25"/>
<positionData x="11.560022" y="-0.26000002"/>
<positionData x="16.310017" y="0.80666655"/>
<positionData x="21.9833" y="-0.099999994"/>
</stars>
</level>
<level number="5" goalX="16.249996" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<level packId="0" id="5" goalX="16.249996" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="1.9915047" width="9.983009"/>
<tileData x="12.045149" width="7.65627"/>
@ -105,12 +105,12 @@
<obstacleData floating="false" moving="false" deadly="false" leftEdge="15.29672" rightEdge="15.79672" height="1.539" y="0.1695"/>
</obstacles>
<stars class="java.util.ArrayList">
<starData index="1" x="2.5799987" y="0.62" width="0.25" height="0.25"/>
<starData index="2" x="7.5566673" y="0.26000008" width="0.25" height="0.25"/>
<starData index="3" x="11.85002" y="-0.4533334" width="0.25" height="0.25"/>
<positionData x="2.5799987" y="0.62"/>
<positionData x="7.5566673" y="0.26000008"/>
<positionData x="11.85002" y="-0.4533334"/>
</stars>
</level>
<level number="6" goalX="27.539873" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<level packId="0" id="6" goalX="27.539873" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="0.4867487" width="6.9734974"/>
<tileData x="7.8615937" width="5.390193"/>
@ -135,12 +135,12 @@
<obstacleData floating="false" moving="false" deadly="false" leftEdge="24.34991" rightEdge="24.84991" height="0.5" y="-0.35000002"/>
</obstacles>
<stars class="java.util.ArrayList">
<starData index="1" x="4.586666" y="-0.5866665" width="0.25" height="0.25"/>
<starData index="2" x="10.696706" y="-0.46666694" width="0.25" height="0.25"/>
<starData index="3" x="20.64665" y="0.39999995" width="0.25" height="0.25"/>
<positionData x="4.586666" y="-0.5866665"/>
<positionData x="10.696706" y="-0.46666694"/>
<positionData x="20.64665" y="0.39999995"/>
</stars>
</level>
<level number="7" goalX="25.866587" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<level packId="0" id="7" goalX="25.866587" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="2.1916704" width="10.383341"/>
<tileData x="11.639271" width="7.31187"/>
@ -166,12 +166,12 @@
<obstacleData floating="false" moving="false" deadly="false" leftEdge="24.1271" rightEdge="24.886099" height="0.694" y="-0.25300002"/>
</obstacles>
<stars class="java.util.ArrayList">
<starData index="1" x="6.6800065" y="-0.38666666" width="0.25" height="0.25"/>
<starData index="2" x="13.066695" y="0.48666692" width="0.25" height="0.25"/>
<starData index="3" x="20.679989" y="0.85333335" width="0.25" height="0.25"/>
<positionData x="6.6800065" y="-0.38666666"/>
<positionData x="13.066695" y="0.48666692"/>
<positionData x="20.679989" y="0.85333335"/>
</stars>
</level>
<level number="8" goalX="17.896662" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<level packId="0" id="8" goalX="17.896662" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="-2.0766673" width="1.8466654"/>
<tileData x="2.5266657" width="0.7200012"/>
@ -192,10 +192,94 @@
<obstacleData floating="true" moving="false" deadly="false" leftEdge="-1.0233328" rightEdge="1.9766672" height="0.136" y="-0.86666656"/>
</obstacles>
<stars class="java.util.ArrayList">
<starData index="1" x="2.543333" y="0.3933335" width="0.25" height="0.25"/>
<starData index="2" x="14.12338" y="-0.79999965" width="0.25" height="0.25"/>
<starData index="3" x="17.523336" y="0.4799996" width="0.25" height="0.25"/>
<positionData x="2.543333" y="0.3933335"/>
<positionData x="14.12338" y="-0.79999965"/>
<positionData x="17.523336" y="0.4799996"/>
</stars>
</level>
<level packId="0" id="9" goalX="3.0" startSpeed="0.0" endSpeed="0.0" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="0.0" width="6.0"/>
</terrainTiles>
<ceilingTiles class="java.util.ArrayList">
<tileData x="0.0" width="6.0"/>
</ceilingTiles>
<obstacles class="java.util.ArrayList">
<obstacleData floating="false" moving="false" deadly="false" leftEdge="0.45000017" rightEdge="0.95000017" height="0.5" y="-0.35000002">
<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="-0.103333026" rightEdge="0.39666697" height="0.5" y="0.22666666">
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="true" leftEdge="-1.7966661" rightEdge="-1.2966661" height="0.5" y="-0.35000002">
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
</obstacleData>
<obstacleData floating="true" moving="false" deadly="true" leftEdge="-0.7099999" rightEdge="-0.20999992" height="0.5" y="0.21999998">
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
</obstacleData>
</obstacles>
<stars class="java.util.ArrayList"/>
</level>
<level packId="0" id="10" goalX="3.0" startSpeed="0.0" endSpeed="0.0" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="0.0" width="6.0"/>
</terrainTiles>
<ceilingTiles class="java.util.ArrayList">
<tileData x="0.0" width="6.0"/>
</ceilingTiles>
<obstacles class="java.util.ArrayList">
<obstacleData floating="false" moving="false" deadly="false" leftEdge="-0.68833333" rightEdge="0.82166666" height="1.541" y="0.17049998">
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
</obstacleData>
</obstacles>
<stars class="java.util.ArrayList"/>
</level>
<level packId="0" id="11" goalX="22.569973" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="0.23241591" width="6.464832"/>
<tileData x="8.307598" width="7.651533"/>
<tileData x="18.551668" width="8.036609"/>
</terrainTiles>
<ceilingTiles class="java.util.ArrayList">
<tileData x="9.7849865" width="25.569973"/>
</ceilingTiles>
<obstacles class="java.util.ArrayList">
<obstacleData floating="false" moving="false" deadly="false" leftEdge="8.3666725" rightEdge="8.8666725" height="0.344" y="-0.42800003">
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="19.186697" rightEdge="19.606695" height="0.4" y="-0.40000004">
<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="3.026669" rightEdge="6.026669" height="0.229" y="0.7399997">
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
</obstacleData>
</obstacles>
<stars class="java.util.ArrayList"/>
</level>
<level packId="0" id="12" goalX="28.746628" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="-0.34033322" width="5.3193336"/>
<tileData x="9.0306835" width="10.206701"/>
<tileData x="22.446331" width="12.600594"/>
</terrainTiles>
<ceilingTiles class="java.util.ArrayList">
<tileData x="12.873314" width="31.746628"/>
</ceilingTiles>
<obstacles class="java.util.ArrayList">
<obstacleData floating="false" moving="false" deadly="false" leftEdge="8.236673" rightEdge="8.736673" height="0.8" y="-0.20000002">
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
</obstacleData>
<obstacleData floating="false" moving="false" deadly="false" leftEdge="21.91664" rightEdge="22.41664" height="0.968" y="-0.11600003">
<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="1.5333319" rightEdge="4.533332" height="0.344" y="0.5999999">
<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="4.538332" rightEdge="5.6083317" height="0.306" y="0.59999996">
<moveComponent width="0.0" height="0.0" x="0.0" y="0.0" speed="0.0"/>
</obstacleData>
</obstacles>
<stars class="java.util.ArrayList"/>
</level>
</levels>
</levelPack>

View File

@ -1,7 +1,7 @@
<levelPack>
<world>TESTCAVE</world>
<levelPack id="1">
<theme>TESTCAVE</theme>
<levels class="java.util.ArrayList">
<level number="1" goalX="33.663338" startSpeed="0.6" endSpeed="0.6" terrainEdge="-0.979" ceilingEdge="1.0">
<level packId="1" id="1" goalX="33.663338" startSpeed="0.6" endSpeed="0.6" terrainEdge="-0.979" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="15.331669" width="36.663338"/>
</terrainTiles>
@ -24,7 +24,7 @@
</obstacles>
<stars class="java.util.ArrayList"/>
</level>
<level number="2" goalX="13.38005" startSpeed="0.5" endSpeed="0.6" terrainEdge="-0.6" ceilingEdge="1.0">
<level packId="1" id="2" goalX="13.38005" startSpeed="0.5" endSpeed="0.6" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="2.2557545" width="10.511509"/>
<tileData x="8.660347" width="0.8236685"/>
@ -51,12 +51,12 @@
<obstacleData floating="true" moving="false" deadly="false" leftEdge="11.386221" rightEdge="13.067221" height="0.34" y="0.07999999"/>
</obstacles>
<stars class="java.util.ArrayList">
<starData index="1" x="3.0633316" y="-0.43333337" width="0.25" height="0.25"/>
<starData index="2" x="9.686677" y="-0.76000005" width="0.25" height="0.25"/>
<starData index="3" x="13.110031" y="0.8466663" width="0.25" height="0.25"/>
<positionData x="3.0633316" y="-0.43333337"/>
<positionData x="9.686677" y="-0.76000005"/>
<positionData x="13.110031" y="0.8466663"/>
</stars>
</level>
<level number="3" goalX="16.630037" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="0.692">
<level packId="1" id="3" goalX="16.630037" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="0.692">
<terrainTiles class="java.util.ArrayList">
<tileData x="6.8150187" width="19.630037"/>
</terrainTiles>
@ -80,7 +80,7 @@
</obstacles>
<stars class="java.util.ArrayList"/>
</level>
<level number="4" goalX="3.0" startSpeed="0.0" endSpeed="0.0" terrainEdge="-0.6" ceilingEdge="1.0">
<level packId="1" id="4" goalX="3.0" startSpeed="0.0" endSpeed="0.0" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="0.0" width="6.0"/>
</terrainTiles>
@ -97,5 +97,15 @@
</obstacles>
<stars class="java.util.ArrayList"/>
</level>
<level packId="1" id="9" goalX="3.0" startSpeed="0.5" endSpeed="0.5" terrainEdge="-0.6" ceilingEdge="1.0">
<terrainTiles class="java.util.ArrayList">
<tileData x="0.0" width="6.0"/>
</terrainTiles>
<ceilingTiles class="java.util.ArrayList">
<tileData x="0.0" width="6.0"/>
</ceilingTiles>
<obstacles class="java.util.ArrayList"/>
<stars class="java.util.ArrayList"/>
</level>
</levels>
</levelPack>

View File

@ -67,10 +67,6 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\lock_unlocked.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\lock_unlocked.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\obstacle.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\obstacle.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"
@ -91,10 +87,6 @@
"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\\stars_2.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\stars_2.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"
@ -103,14 +95,14 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_colored_material.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\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\\xml_toolprogressbarlayers.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\xml_toolprogressbarlayers.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\\backgrounds_menu_levelup.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\backgrounds_menu_levelup.png"
@ -128,12 +120,12 @@
"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\\tools_magnet.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\tools_magnet.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\\stars_1.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\stars_1.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"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\playershapes_ball.png",
@ -203,10 +195,6 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_cab_background_top_material.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_cab_background_top_material.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\stars_3.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\stars_3.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_text_cursor_material.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_text_cursor_material.xml"
@ -220,17 +208,13 @@
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\obstacles_grass.png"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\stars_0.png",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\drawable\\stars_0.png"
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_switch_thumb_material.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\res\\drawable\\abc_switch_thumb_material.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_list_selector_holo_light.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\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\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\exploded-aar\\com.android.support\\appcompat-v7\\23.1.1\\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"

View File

@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="23.1.1"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.1.1\assets"/></dataSet><dataSet config="23.1.1"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\build\intermediates\exploded-aar\com.android.support\appcompat-v7\23.1.1\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="levelpacks/Icy Mountains.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Icy Mountains.xml"/><file name="levelpacks/Testcave.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Testcave.xml"/><file name="levelpack_01.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpack_01.xml"/><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="testlevelpack.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\testlevelpack.xml"/></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="23.1.1"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\build\intermediates\exploded-aar\com.android.support\support-v4\23.1.1\assets"/></dataSet><dataSet config="23.1.1"><source path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\build\intermediates\exploded-aar\com.android.support\appcompat-v7\23.1.1\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="Grasslands.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\Grasslands.xml"/><file name="Icy Mountains.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\Icy Mountains.xml"/><file name="levelpacks/Testcave.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Testcave.xml"/><file name="levelpack_01.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpack_01.xml"/><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="testlevelpack.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\testlevelpack.xml"/><file name="levelpacks/Beginning.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Beginning.xml"/><file name="levelpacks/Icy Mountains.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Icy Mountains.xml"/><file name="levelpacks/Grasslands.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Grasslands.xml"/></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>

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

View File

@ -73,15 +73,6 @@
android:layout_centerVertical="true"
android:visibility="invisible"/>
<include
android:id="@+id/game_levelup"
android:layout_width="match_parent"
android:layout_height="match_parent"
layout="@layout/levelup_message"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true"
android:visibility="invisible"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"

View File

@ -1,41 +1,51 @@
<?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"
android:orientation="vertical">
<Button
android:id="@+id/startscreen_play"
android:layout_width="110dp"
android:layout_height="110dp"
android:text="Play"
android:background="@drawable/playershapes_ball"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="44dp"
android:textSize="25sp" />
<Button
android:id="@+id/startscreen_comingsoon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Coming Soon"
style="@style/customButton"
android:layout_alignBottom="@+id/startscreen_sound"
android:layout_toLeftOf="@+id/startscreen_play"
android:layout_toStartOf="@+id/startscreen_play" />
android:layout_height="match_parent">
<ToggleButton
android:id="@+id/startscreen_sound"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/xml_sound_toggle"
android:textOff=""
android:textOn=""
android:layout_below="@+id/startscreen_play"
android:layout_toRightOf="@+id/startscreen_play"
android:layout_marginTop="26dp"
android:layout_toEndOf="@+id/startscreen_play"
android:layout_marginTop="26dp" />
android:layout_toRightOf="@+id/startscreen_play"
android:background="@drawable/xml_sound_toggle"
android:textOff=""
android:textOn="" />
<Button
android:id="@+id/startscreen_play"
android:layout_width="110dp"
android:layout_height="110dp"
android:layout_marginTop="40dp"
android:background="@drawable/playershapes_ball"
android:text="Play"
android:textSize="25sp"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" />
<Button
android:id="@+id/startscreen_comingsoon"
style="@style/customButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Level Up"
android:layout_alignTop="@+id/startscreen_play"
android:layout_toRightOf="@+id/startscreen_sound"
android:layout_toEndOf="@+id/startscreen_sound" />
<Button
android:id="@+id/startscreen_maxcheat"
style="@style/customButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Lv to 100"
android:layout_below="@+id/startscreen_play"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginLeft="48dp"
android:layout_marginStart="48dp" />
</RelativeLayout>

View File

@ -476,42 +476,38 @@ int drawable guis_sound_off 0x7f02004e
int drawable guis_sound_on 0x7f02004f
int drawable lock_locked 0x7f020050
int drawable lock_unlocked 0x7f020051
int drawable notification_template_icon_bg 0x7f020074
int drawable obstacle 0x7f020052
int drawable obstacles_cave 0x7f020053
int drawable obstacles_grass 0x7f020054
int drawable obstacles_mountains 0x7f020055
int drawable playershapes_ball 0x7f020056
int drawable previews_grass 0x7f020057
int drawable purple 0x7f020058
int drawable ramp 0x7f020059
int drawable rampbutton 0x7f02005a
int drawable splitter 0x7f02005b
int drawable star 0x7f02005c
int drawable star_empty 0x7f02005d
int drawable star_icon 0x7f02005e
int drawable stars_0 0x7f02005f
int drawable stars_1 0x7f020060
int drawable stars_2 0x7f020061
int drawable stars_3 0x7f020062
int drawable terrain_t_grass 0x7f020063
int drawable tools_bomb 0x7f020064
int drawable tools_bombbutton 0x7f020065
int drawable tools_emptybutton 0x7f020066
int drawable tools_lockedbutton 0x7f020067
int drawable tools_magnet 0x7f020068
int drawable tools_magnetbutton 0x7f020069
int drawable tools_spring 0x7f02006a
int drawable tools_springbutton 0x7f02006b
int drawable tools_unlockedbutton 0x7f02006c
int drawable xml_custom_button 0x7f02006d
int drawable xml_levelbutton_background 0x7f02006e
int drawable xml_sound_toggle 0x7f02006f
int drawable xml_tool_slot_background 0x7f020070
int drawable xml_toolprogressbarlayers 0x7f020071
int drawable xml_unlock_message_background 0x7f020072
int drawable xml_worldbutton_background 0x7f020073
int id action0 0x7f0d006b
int drawable notification_template_icon_bg 0x7f020070
int drawable obstacles_cave 0x7f020052
int drawable obstacles_grass 0x7f020053
int drawable obstacles_mountains 0x7f020054
int drawable playershapes_ball 0x7f020055
int drawable previews_grass 0x7f020056
int drawable purple 0x7f020057
int drawable ramp 0x7f020058
int drawable rampbutton 0x7f020059
int drawable splitter 0x7f02005a
int drawable star 0x7f02005b
int drawable star_empty 0x7f02005c
int drawable star_icon 0x7f02005d
int drawable terrain_c_grass 0x7f02005e
int drawable terrain_t_grass 0x7f02005f
int drawable tools_bomb 0x7f020060
int drawable tools_bombbutton 0x7f020061
int drawable tools_emptybutton 0x7f020062
int drawable tools_lockedbutton 0x7f020063
int drawable tools_magnet 0x7f020064
int drawable tools_magnetbutton 0x7f020065
int drawable tools_spring 0x7f020066
int drawable tools_springbutton 0x7f020067
int drawable tools_unlockedbutton 0x7f020068
int drawable xml_custom_button 0x7f020069
int drawable xml_levelbutton_background 0x7f02006a
int drawable xml_sound_toggle 0x7f02006b
int drawable xml_tool_slot_background 0x7f02006c
int drawable xml_toolprogressbarlayers 0x7f02006d
int drawable xml_unlock_message_background 0x7f02006e
int drawable xml_worldbutton_background 0x7f02006f
int id action0 0x7f0d006a
int id action_bar 0x7f0d0041
int id action_bar_activity_content 0x7f0d0000
int id action_bar_container 0x7f0d0040
@ -520,7 +516,7 @@ int id action_bar_spinner 0x7f0d0001
int id action_bar_subtitle 0x7f0d0022
int id action_bar_title 0x7f0d0021
int id action_context_bar 0x7f0d0042
int id action_divider 0x7f0d006f
int id action_divider 0x7f0d006e
int id action_menu_divider 0x7f0d0002
int id action_menu_presenter 0x7f0d0003
int id action_mode_bar 0x7f0d003e
@ -532,9 +528,9 @@ int id always 0x7f0d001b
int id beginning 0x7f0d0018
int id button3 0x7f0d007f
int id buttonPanel 0x7f0d002b
int id cancel_action 0x7f0d006c
int id cancel_action 0x7f0d006b
int id checkbox 0x7f0d0039
int id chronometer 0x7f0d0072
int id chronometer 0x7f0d0071
int id collapseActionView 0x7f0d001c
int id contentPanel 0x7f0d0031
int id custom 0x7f0d0037
@ -544,12 +540,11 @@ int id default_activity_button 0x7f0d0027
int id disableHome 0x7f0d000c
int id edit_query 0x7f0d0043
int id end 0x7f0d0019
int id end_padder 0x7f0d0077
int id end_padder 0x7f0d0076
int id expand_activities_button 0x7f0d0025
int id expanded_menu 0x7f0d0038
int id game_countdown 0x7f0d0058
int id game_countdown 0x7f0d0057
int id game_fps 0x7f0d0054
int id game_levelup 0x7f0d0057
int id game_message 0x7f0d0056
int id game_pausebutton 0x7f0d0050
int id game_playerprogress 0x7f0d0052
@ -558,35 +553,35 @@ int id game_shortmenu 0x7f0d0055
int id game_toolbuttonbar 0x7f0d0051
int id home 0x7f0d0004
int id homeAsUp 0x7f0d000d
int id horizontalScrollView 0x7f0d005f
int id horizontalScrollView 0x7f0d005e
int id icon 0x7f0d0029
int id ifRoom 0x7f0d001d
int id image 0x7f0d0026
int id imageView 0x7f0d0065
int id imageView 0x7f0d0064
int id imageView2 0x7f0d00a4
int id imageView3 0x7f0d00a2
int id info 0x7f0d0076
int id levelbutton_lock 0x7f0d005d
int id levelbutton_star1 0x7f0d005a
int id levelbutton_star2 0x7f0d005b
int id levelbutton_star3 0x7f0d005c
int id levelbutton_textview 0x7f0d0059
int id levels_bottomRow 0x7f0d0061
int id levels_topRow 0x7f0d0060
int id levels_topbar 0x7f0d005e
int id levelup_level 0x7f0d0063
int id levelup_mainlayout 0x7f0d0062
int id levelup_text 0x7f0d0064
int id levelup_unlocklist 0x7f0d0066
int id line1 0x7f0d0070
int id line3 0x7f0d0074
int id info 0x7f0d0075
int id levelbutton_lock 0x7f0d005c
int id levelbutton_star1 0x7f0d0059
int id levelbutton_star2 0x7f0d005a
int id levelbutton_star3 0x7f0d005b
int id levelbutton_textview 0x7f0d0058
int id levels_bottomRow 0x7f0d0060
int id levels_topRow 0x7f0d005f
int id levels_topbar 0x7f0d005d
int id levelup_level 0x7f0d0062
int id levelup_mainlayout 0x7f0d0061
int id levelup_text 0x7f0d0063
int id levelup_unlocklist 0x7f0d0065
int id line1 0x7f0d006f
int id line3 0x7f0d0073
int id listMode 0x7f0d0009
int id list_item 0x7f0d0028
int id media_actions 0x7f0d006e
int id message_exitbutton 0x7f0d0069
int id message_leftbutton 0x7f0d0068
int id message_title 0x7f0d0067
int id message_tryagainbutton 0x7f0d006a
int id media_actions 0x7f0d006d
int id message_exitbutton 0x7f0d0068
int id message_leftbutton 0x7f0d0067
int id message_title 0x7f0d0066
int id message_tryagainbutton 0x7f0d0069
int id middle 0x7f0d001a
int id multiply 0x7f0d0013
int id never 0x7f0d001e
@ -612,10 +607,10 @@ int id search_src_text 0x7f0d004a
int id search_voice_btn 0x7f0d004e
int id select_dialog_listview 0x7f0d004f
int id shortcut 0x7f0d003a
int id shortmenu_continue 0x7f0d0079
int id shortmenu_exit 0x7f0d007b
int id shortmenu_restart 0x7f0d007a
int id shortmenu_topbar 0x7f0d0078
int id shortmenu_continue 0x7f0d0078
int id shortmenu_exit 0x7f0d007a
int id shortmenu_restart 0x7f0d0079
int id shortmenu_topbar 0x7f0d0077
int id showCustom 0x7f0d000f
int id showHome 0x7f0d0010
int id showTitle 0x7f0d0011
@ -625,15 +620,16 @@ int id src_atop 0x7f0d0015
int id src_in 0x7f0d0016
int id src_over 0x7f0d0017
int id startscreen_comingsoon 0x7f0d007d
int id startscreen_maxcheat 0x7f0d007e
int id startscreen_play 0x7f0d007c
int id startscreen_sound 0x7f0d007e
int id status_bar_latest_event_content 0x7f0d006d
int id startscreen_sound 0x7f0d007b
int id status_bar_latest_event_content 0x7f0d006c
int id submit_area 0x7f0d004c
int id tabMode 0x7f0d000b
int id text 0x7f0d0075
int id text2 0x7f0d0073
int id text 0x7f0d0074
int id text2 0x7f0d0072
int id textSpacerNoButtons 0x7f0d0034
int id time 0x7f0d0071
int id time 0x7f0d0070
int id title 0x7f0d002a
int id title_template 0x7f0d002f
int id toolProgressBar 0x7f0d0085