testCommit
This commit is contained in:
=
@ -456,7 +456,7 @@ public final class R {
|
||||
public static final int abc_textfield_search_activated_mtrl_alpha = 0x7f070042;
|
||||
public static final int abc_textfield_search_default_mtrl_alpha = 0x7f070043;
|
||||
public static final int abc_textfield_search_material = 0x7f070044;
|
||||
public static final int notification_template_icon_bg = 0x7f070062;
|
||||
public static final int notification_template_icon_bg = 0x7f070063;
|
||||
}
|
||||
public static final class id {
|
||||
public static final int action0 = 0x7f080000;
|
||||
|
||||
@ -11,9 +11,9 @@ vec3 saturateColor(in vec3 color, in float a);
|
||||
void main() {
|
||||
|
||||
float a = texture2D(texture, pass_TexCoords).a * alpha;
|
||||
gl_FragColor = vec4(color, a);
|
||||
vec3 black = vec3(0.0, 0.0, 0.0);
|
||||
gl_FragColor.rgb = mix(color, black, 1.0 - gl_FragColor.a);
|
||||
gl_FragColor.rgb = mix(color, black, 1.0 - a);
|
||||
gl_FragColor.a = a;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><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/firework.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\firework.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/obstacleFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\obstacleFragmentShader.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/test_fire.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\test_fire.pe"/><file name="particleEffects/stasis.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\stasis.pe"/><file name="particleEffects/superPower.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\superPower.pe"/><file name="levelpacks/Icy Mountains.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Icy Mountains.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="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/firework.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\firework.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/obstacleFragmentShader.glsl" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\shader\obstacleFragmentShader.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/test_fire.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\test_fire.pe"/><file name="particleEffects/stasis.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\stasis.pe"/><file name="particleEffects/superPower.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\superPower.pe"/><file name="levelpacks/Icy Mountains.xml" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\levelpacks\Icy Mountains.xml"/><file name="particleEffects/colorChange.pe" path="C:\Users\Julian\AndroidStudioProjects\EndlessRoll\app\src\main\assets\particleEffects\colorChange.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>
|
||||
File diff suppressed because one or more lines are too long
@ -477,87 +477,88 @@ int drawable backgrounds_game_cave 0x7f070045
|
||||
int drawable backgrounds_game_grass 0x7f070046
|
||||
int drawable backgrounds_game_mountains 0x7f070047
|
||||
int drawable backgrounds_menu_grass 0x7f070048
|
||||
int drawable currency_energy 0x7f070049
|
||||
int drawable currency_energy_atlas 0x7f07004a
|
||||
int drawable currency_energy_empty 0x7f07004b
|
||||
int drawable currency_star 0x7f07004c
|
||||
int drawable currency_star_empty 0x7f07004d
|
||||
int drawable guis_arrow_green 0x7f07004e
|
||||
int drawable guis_checkbox_checked 0x7f07004f
|
||||
int drawable guis_checkbox_unchecked 0x7f070050
|
||||
int drawable guis_clock 0x7f070051
|
||||
int drawable guis_goal 0x7f070052
|
||||
int drawable guis_lock_locked 0x7f070053
|
||||
int drawable guis_magnet_field 0x7f070054
|
||||
int drawable guis_pausebutton 0x7f070055
|
||||
int drawable guis_playerarrow 0x7f070056
|
||||
int drawable guis_radius 0x7f070057
|
||||
int drawable guis_settings_disabled 0x7f070058
|
||||
int drawable guis_settings_enabled 0x7f070059
|
||||
int drawable guis_shape_shop_disabled 0x7f07005a
|
||||
int drawable guis_shape_shop_enabled 0x7f07005b
|
||||
int drawable guis_sound_off 0x7f07005c
|
||||
int drawable guis_sound_on 0x7f07005d
|
||||
int drawable guis_splitter 0x7f07005e
|
||||
int drawable guis_tick 0x7f07005f
|
||||
int drawable guis_tool_shop_disabled 0x7f070060
|
||||
int drawable guis_tool_shop_enabled 0x7f070061
|
||||
int drawable notification_template_icon_bg 0x7f070062
|
||||
int drawable obstacles_grass 0x7f070063
|
||||
int drawable playershapes_ball 0x7f070064
|
||||
int drawable playershapes_clock 0x7f070065
|
||||
int drawable playershapes_hypno_spiral 0x7f070066
|
||||
int drawable playershapes_locked 0x7f070067
|
||||
int drawable playershapes_pacman 0x7f070068
|
||||
int drawable playershapes_smiley 0x7f070069
|
||||
int drawable playershapes_sun 0x7f07006a
|
||||
int drawable playershapes_wheel 0x7f07006b
|
||||
int drawable terrain_c_grass 0x7f07006c
|
||||
int drawable terrain_t_grass 0x7f07006d
|
||||
int drawable tools_bomb 0x7f07006e
|
||||
int drawable tools_bomb_button 0x7f07006f
|
||||
int drawable tools_button_empty 0x7f070070
|
||||
int drawable tools_button_locked 0x7f070071
|
||||
int drawable tools_button_unlocked 0x7f070072
|
||||
int drawable tools_magnet 0x7f070073
|
||||
int drawable tools_magnet_button 0x7f070074
|
||||
int drawable tools_power_mushroom 0x7f070075
|
||||
int drawable tools_power_mushroom_button 0x7f070076
|
||||
int drawable tools_ramp 0x7f070077
|
||||
int drawable tools_ramp_button 0x7f070078
|
||||
int drawable tools_spring 0x7f070079
|
||||
int drawable tools_spring_button 0x7f07007a
|
||||
int drawable tools_stasis 0x7f07007b
|
||||
int drawable tools_stasis_button 0x7f07007c
|
||||
int drawable tutorial_place_ramp_air_1 0x7f07007d
|
||||
int drawable tutorial_place_ramp_air_2 0x7f07007e
|
||||
int drawable tutorial_place_ramp_gap 0x7f07007f
|
||||
int drawable tutorial_place_ramp_obstacle 0x7f070080
|
||||
int drawable tutorial_place_tools 0x7f070081
|
||||
int drawable tutorial_to_toolshop 0x7f070082
|
||||
int drawable tutorial_toolshop_all_tools 0x7f070083
|
||||
int drawable tutorial_toolshop_equip_spring 0x7f070084
|
||||
int drawable tutorial_toolshop_inspector 0x7f070085
|
||||
int drawable tutorial_toolshop_select_buy_spring 0x7f070086
|
||||
int drawable tutorial_toolshop_toolbar 0x7f070087
|
||||
int drawable world_previews_grass 0x7f070088
|
||||
int drawable xml_background_bountymessage 0x7f070089
|
||||
int drawable xml_background_dialog_button 0x7f07008a
|
||||
int drawable xml_background_exit_confirm_dialog 0x7f07008b
|
||||
int drawable xml_background_game_over_message_button 0x7f07008c
|
||||
int drawable xml_background_levelbutton 0x7f07008d
|
||||
int drawable xml_background_toolslot 0x7f07008e
|
||||
int drawable xml_background_toolupgrade 0x7f07008f
|
||||
int drawable xml_background_tutorialtextview 0x7f070090
|
||||
int drawable xml_background_worldbutton 0x7f070091
|
||||
int drawable xml_layers_toolprogressbar 0x7f070092
|
||||
int drawable xml_selector_gamebutton 0x7f070093
|
||||
int drawable xml_selector_pricebutton 0x7f070094
|
||||
int drawable xml_selector_settingsbutton 0x7f070095
|
||||
int drawable xml_selector_shapeshopbutton 0x7f070096
|
||||
int drawable xml_selector_sound 0x7f070097
|
||||
int drawable xml_selector_toolshopbutton 0x7f070098
|
||||
int drawable xml_shape_inspector_checkbox 0x7f070099
|
||||
int drawable black 0x7f070049
|
||||
int drawable currency_energy 0x7f07004a
|
||||
int drawable currency_energy_atlas 0x7f07004b
|
||||
int drawable currency_energy_empty 0x7f07004c
|
||||
int drawable currency_star 0x7f07004d
|
||||
int drawable currency_star_empty 0x7f07004e
|
||||
int drawable guis_arrow_green 0x7f07004f
|
||||
int drawable guis_checkbox_checked 0x7f070050
|
||||
int drawable guis_checkbox_unchecked 0x7f070051
|
||||
int drawable guis_clock 0x7f070052
|
||||
int drawable guis_goal 0x7f070053
|
||||
int drawable guis_lock_locked 0x7f070054
|
||||
int drawable guis_magnet_field 0x7f070055
|
||||
int drawable guis_pausebutton 0x7f070056
|
||||
int drawable guis_playerarrow 0x7f070057
|
||||
int drawable guis_radius 0x7f070058
|
||||
int drawable guis_settings_disabled 0x7f070059
|
||||
int drawable guis_settings_enabled 0x7f07005a
|
||||
int drawable guis_shape_shop_disabled 0x7f07005b
|
||||
int drawable guis_shape_shop_enabled 0x7f07005c
|
||||
int drawable guis_sound_off 0x7f07005d
|
||||
int drawable guis_sound_on 0x7f07005e
|
||||
int drawable guis_splitter 0x7f07005f
|
||||
int drawable guis_tick 0x7f070060
|
||||
int drawable guis_tool_shop_disabled 0x7f070061
|
||||
int drawable guis_tool_shop_enabled 0x7f070062
|
||||
int drawable notification_template_icon_bg 0x7f070063
|
||||
int drawable obstacles_grass 0x7f070064
|
||||
int drawable playershapes_ball 0x7f070065
|
||||
int drawable playershapes_clock 0x7f070066
|
||||
int drawable playershapes_hypno_spiral 0x7f070067
|
||||
int drawable playershapes_locked 0x7f070068
|
||||
int drawable playershapes_pacman 0x7f070069
|
||||
int drawable playershapes_smiley 0x7f07006a
|
||||
int drawable playershapes_sun 0x7f07006b
|
||||
int drawable playershapes_wheel 0x7f07006c
|
||||
int drawable terrain_c_grass 0x7f07006d
|
||||
int drawable terrain_t_grass 0x7f07006e
|
||||
int drawable tools_bomb 0x7f07006f
|
||||
int drawable tools_bomb_button 0x7f070070
|
||||
int drawable tools_button_empty 0x7f070071
|
||||
int drawable tools_button_locked 0x7f070072
|
||||
int drawable tools_button_unlocked 0x7f070073
|
||||
int drawable tools_magnet 0x7f070074
|
||||
int drawable tools_magnet_button 0x7f070075
|
||||
int drawable tools_power_mushroom 0x7f070076
|
||||
int drawable tools_power_mushroom_button 0x7f070077
|
||||
int drawable tools_ramp 0x7f070078
|
||||
int drawable tools_ramp_button 0x7f070079
|
||||
int drawable tools_spring 0x7f07007a
|
||||
int drawable tools_spring_button 0x7f07007b
|
||||
int drawable tools_stasis 0x7f07007c
|
||||
int drawable tools_stasis_button 0x7f07007d
|
||||
int drawable tutorial_place_ramp_air_1 0x7f07007e
|
||||
int drawable tutorial_place_ramp_air_2 0x7f07007f
|
||||
int drawable tutorial_place_ramp_gap 0x7f070080
|
||||
int drawable tutorial_place_ramp_obstacle 0x7f070081
|
||||
int drawable tutorial_place_tools 0x7f070082
|
||||
int drawable tutorial_to_toolshop 0x7f070083
|
||||
int drawable tutorial_toolshop_all_tools 0x7f070084
|
||||
int drawable tutorial_toolshop_equip_spring 0x7f070085
|
||||
int drawable tutorial_toolshop_inspector 0x7f070086
|
||||
int drawable tutorial_toolshop_select_buy_spring 0x7f070087
|
||||
int drawable tutorial_toolshop_toolbar 0x7f070088
|
||||
int drawable world_previews_grass 0x7f070089
|
||||
int drawable xml_background_bountymessage 0x7f07008a
|
||||
int drawable xml_background_dialog_button 0x7f07008b
|
||||
int drawable xml_background_exit_confirm_dialog 0x7f07008c
|
||||
int drawable xml_background_game_over_message_button 0x7f07008d
|
||||
int drawable xml_background_levelbutton 0x7f07008e
|
||||
int drawable xml_background_toolslot 0x7f07008f
|
||||
int drawable xml_background_toolupgrade 0x7f070090
|
||||
int drawable xml_background_tutorialtextview 0x7f070091
|
||||
int drawable xml_background_worldbutton 0x7f070092
|
||||
int drawable xml_layers_toolprogressbar 0x7f070093
|
||||
int drawable xml_selector_gamebutton 0x7f070094
|
||||
int drawable xml_selector_pricebutton 0x7f070095
|
||||
int drawable xml_selector_settingsbutton 0x7f070096
|
||||
int drawable xml_selector_shapeshopbutton 0x7f070097
|
||||
int drawable xml_selector_sound 0x7f070098
|
||||
int drawable xml_selector_toolshopbutton 0x7f070099
|
||||
int drawable xml_shape_inspector_checkbox 0x7f07009a
|
||||
int id action0 0x7f080000
|
||||
int id action_bar 0x7f080001
|
||||
int id action_bar_activity_content 0x7f080002
|
||||
|
||||
Reference in New Issue
Block a user