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

Fixed Obstacle-Move-Component bug, when offsets were set

Browse Source 
Countdown now played as three seperate sounds, though not perfect yet (neither timing, nor high pitches)
Added lv 12
This commit is contained in:
=
2018-04-30 19:04:01 +02:00
parent 1871979b41
commit 66b3b1d55e
17 changed files with 435 additions and 125 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

@ -619,7 +619,7 @@ public final class R {
public static final int abc_shareactionprovider_share_with = 0x7f0d0010;
public static final int abc_shareactionprovider_share_with_application = 0x7f0d0011;
public static final int abc_toolbar_collapse_description = 0x7f0d0012;
public static final int status_bar_notification_info_overflow = 0x7f0d0059;
public static final int status_bar_notification_info_overflow = 0x7f0d005b;
}
public static final class style {
public static final int AlertDialog_AppCompat = 0x7f0e0000;

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

File diff suppressed because one or more lines are too long

1
app/build/intermediates/manifests/full/debug/AndroidManifest.xml
View File

@ -18,6 +18,7 @@
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:testOnly="true"
android:theme="@style/AppTheme" >
<activity
android:name="de.frajul.endlessroll.main.GameActivity"

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

@ -872,16 +872,17 @@ int raw music_game_3 0x7f0c0002
int raw music_menu 0x7f0c0003
int raw sound_collect_energy 0x7f0c0004
int raw sound_collect_star 0x7f0c0005
int raw sound_countdown 0x7f0c0006
int raw sound_die 0x7f0c0007
int raw sound_explosion 0x7f0c0008
int raw sound_firework 0x7f0c0009
int raw sound_goal 0x7f0c000a
int raw sound_magnet 0x7f0c000b
int raw sound_mushroom 0x7f0c000c
int raw sound_place_tool 0x7f0c000d
int raw sound_spring 0x7f0c000e
int raw sound_stasis 0x7f0c000f
int raw sound_countdown_last 0x7f0c0006
int raw sound_countdown_single 0x7f0c0007
int raw sound_die 0x7f0c0008
int raw sound_explosion 0x7f0c0009
int raw sound_firework 0x7f0c000a
int raw sound_goal 0x7f0c000b
int raw sound_magnet 0x7f0c000c
int raw sound_mushroom 0x7f0c000d
int raw sound_place_tool 0x7f0c000e
int raw sound_spring 0x7f0c000f
int raw sound_stasis 0x7f0c0010
int string abc_action_bar_home_description 0x7f0d0000
int string abc_action_bar_home_description_format 0x7f0d0001
int string abc_action_bar_home_subtitle_description_format 0x7f0d0002
@ -960,56 +961,58 @@ int string playershape_name_wheel 0x7f0d004a
int string pre_start_screen_loading 0x7f0d004b
int string price_button_buy 0x7f0d004c
int string price_button_upgrade 0x7f0d004d
int string settings_credits 0x7f0d004e
int string settings_music 0x7f0d004f
int string settings_reset 0x7f0d0050
int string settings_sounds 0x7f0d0051
int string short_menu_continue 0x7f0d0052
int string short_menu_exit 0x7f0d0053
int string start_screen_finish_world_1 0x7f0d0054
int string start_screen_gain_90_ep 0x7f0d0055
int string start_screen_play 0x7f0d0056
int string start_screen_to_gl_test_screen 0x7f0d0057
int string start_screen_unlock_all_levels 0x7f0d0058
int string status_bar_notification_info_overflow 0x7f0d0059
int string task_collect_energy_format_d 0x7f0d005a
int string task_collect_energy_progress_format_ddd 0x7f0d005b
int string task_collect_stars_format_d 0x7f0d005c
int string task_collect_stars_progress_format_ddd 0x7f0d005d
int string task_complete_world_format_d 0x7f0d005e
int string task_empty 0x7f0d005f
int string tool_description_bomb 0x7f0d0060
int string tool_description_locked_format_d 0x7f0d0061
int string tool_description_magnet 0x7f0d0062
int string tool_description_power_mushroom 0x7f0d0063
int string tool_description_ramp 0x7f0d0064
int string tool_description_spring 0x7f0d0065
int string tool_description_stasis 0x7f0d0066
int string tool_level_format_d 0x7f0d0067
int string tool_name_bomb 0x7f0d0068
int string tool_name_locked 0x7f0d0069
int string tool_name_magnet 0x7f0d006a
int string tool_name_power_mushroom 0x7f0d006b
int string tool_name_ramp 0x7f0d006c
int string tool_name_spring 0x7f0d006d
int string tool_name_stasis 0x7f0d006e
int string topbar_level_format_d 0x7f0d006f
int string topbar_level_placeholder 0x7f0d0070
int string tutorial_leveled_up_to_toolshop 0x7f0d0071
int string tutorial_place_ramp_air 0x7f0d0072
int string tutorial_place_ramp_air_2 0x7f0d0073
int string tutorial_place_ramp_gap 0x7f0d0074
int string tutorial_place_ramp_obstacle 0x7f0d0075
int string tutorial_place_tools 0x7f0d0076
int string tutorial_placeholder 0x7f0d0077
int string tutorial_spring_equipped 0x7f0d0078
int string tutorial_switch_tools_switch 0x7f0d0079
int string tutorial_switch_tools_two_neccessary 0x7f0d007a
int string tutorial_welcome 0x7f0d007b
int string unlock_message_placeholder 0x7f0d007c
int string world_button_count_format_dd 0x7f0d007d
int string world_button_progress_placeholder 0x7f0d007e
int string world_button_title_placeholder 0x7f0d007f
int string settings_boost_performance 0x7f0d004e
int string settings_credits 0x7f0d004f
int string settings_music 0x7f0d0050
int string settings_reset 0x7f0d0051
int string settings_show_fps 0x7f0d0052
int string settings_sounds 0x7f0d0053
int string short_menu_continue 0x7f0d0054
int string short_menu_exit 0x7f0d0055
int string start_screen_finish_world_1 0x7f0d0056
int string start_screen_gain_90_ep 0x7f0d0057
int string start_screen_play 0x7f0d0058
int string start_screen_to_gl_test_screen 0x7f0d0059
int string start_screen_unlock_all_levels 0x7f0d005a
int string status_bar_notification_info_overflow 0x7f0d005b
int string task_collect_energy_format_d 0x7f0d005c
int string task_collect_energy_progress_format_ddd 0x7f0d005d
int string task_collect_stars_format_d 0x7f0d005e
int string task_collect_stars_progress_format_ddd 0x7f0d005f
int string task_complete_world_format_d 0x7f0d0060
int string task_empty 0x7f0d0061
int string tool_description_bomb 0x7f0d0062
int string tool_description_locked_format_d 0x7f0d0063
int string tool_description_magnet 0x7f0d0064
int string tool_description_power_mushroom 0x7f0d0065
int string tool_description_ramp 0x7f0d0066
int string tool_description_spring 0x7f0d0067
int string tool_description_stasis 0x7f0d0068
int string tool_level_format_d 0x7f0d0069
int string tool_name_bomb 0x7f0d006a
int string tool_name_locked 0x7f0d006b
int string tool_name_magnet 0x7f0d006c
int string tool_name_power_mushroom 0x7f0d006d
int string tool_name_ramp 0x7f0d006e
int string tool_name_spring 0x7f0d006f
int string tool_name_stasis 0x7f0d0070
int string topbar_level_format_d 0x7f0d0071
int string topbar_level_placeholder 0x7f0d0072
int string tutorial_leveled_up_to_toolshop 0x7f0d0073
int string tutorial_place_ramp_air 0x7f0d0074
int string tutorial_place_ramp_air_2 0x7f0d0075
int string tutorial_place_ramp_gap 0x7f0d0076
int string tutorial_place_ramp_obstacle 0x7f0d0077
int string tutorial_place_tools 0x7f0d0078
int string tutorial_placeholder 0x7f0d0079
int string tutorial_spring_equipped 0x7f0d007a
int string tutorial_switch_tools_switch 0x7f0d007b
int string tutorial_switch_tools_two_neccessary 0x7f0d007c
int string tutorial_welcome 0x7f0d007d
int string unlock_message_placeholder 0x7f0d007e
int string world_button_count_format_dd 0x7f0d007f
int string world_button_progress_placeholder 0x7f0d0080
int string world_button_title_placeholder 0x7f0d0081
int style AlertDialog_AppCompat 0x7f0e0000
int style AlertDialog_AppCompat_Light 0x7f0e0001
int style Animation_AppCompat_Dialog 0x7f0e0002

20
app/build/outputs/logs/manifest-merger-debug-report.txt
View File

@ -4,8 +4,8 @@ ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\Androi
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\cd1b4326e553e1450693e41a7d2a2378\AndroidManifest.xml:17:1-24:12
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\68d3d050c1785dea090a9bf78cc08c64\AndroidManifest.xml:17:1-24:12
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\d874715e6054e786cbcfdf9c2b37e7ce\AndroidManifest.xml:17:1-24:12
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\73b2b88e0673fce2821db6e163719bff\AndroidManifest.xml:17:1-24:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:2:1-28:12
@ -31,10 +31,10 @@ ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\Androi
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:7:9-32
application
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:9:5-26:19
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\cd1b4326e553e1450693e41a7d2a2378\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\cd1b4326e553e1450693e41a7d2a2378\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\68d3d050c1785dea090a9bf78cc08c64\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\68d3d050c1785dea090a9bf78cc08c64\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\d874715e6054e786cbcfdf9c2b37e7ce\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\d874715e6054e786cbcfdf9c2b37e7ce\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\73b2b88e0673fce2821db6e163719bff\AndroidManifest.xml:22:5-20
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\73b2b88e0673fce2821db6e163719bff\AndroidManifest.xml:22:5-20
android:supportsRtl
ADDED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml:13:9-35
android:label
@ -67,10 +67,10 @@ uses-sdk
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\cd1b4326e553e1450693e41a7d2a2378\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\cd1b4326e553e1450693e41a7d2a2378\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\68d3d050c1785dea090a9bf78cc08c64\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\68d3d050c1785dea090a9bf78cc08c64\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\d874715e6054e786cbcfdf9c2b37e7ce\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:appcompat-v7:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\appcompat-v7-23.1.1.aar\d874715e6054e786cbcfdf9c2b37e7ce\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\73b2b88e0673fce2821db6e163719bff\AndroidManifest.xml:20:5-43
MERGED from [com.android.support:support-v4:23.1.1] C:\Users\Julian\.gradle\caches\transforms-1\files-1.1\support-v4-23.1.1.aar\73b2b88e0673fce2821db6e163719bff\AndroidManifest.xml:20:5-43
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\AndroidManifest.xml
android:targetSdkVersion