restore include paths for cross-platform builds because i messed absolutely every #include up. dont worry that everything is modified, all i did was normalize line endings because CLRF snuck into the repo and this prevents fake diffs
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:src="@drawable/bg32"
|
||||
android:tileMode="repeat"
|
||||
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:src="@drawable/bg32"
|
||||
android:tileMode="repeat"
|
||||
android:dither="false" />
|
||||
@@ -1,5 +1,5 @@
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/cancel_1_3"
|
||||
android:state_pressed="true" />
|
||||
<item android:drawable="@drawable/cancel_0_3" />
|
||||
</selector>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/cancel_1_3"
|
||||
android:state_pressed="true" />
|
||||
<item android:drawable="@drawable/cancel_0_3" />
|
||||
</selector>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/create_1_3"
|
||||
android:state_pressed="true" />
|
||||
<item android:drawable="@drawable/create_0_3" />
|
||||
</selector>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/create_1_3"
|
||||
android:state_pressed="true" />
|
||||
<item android:drawable="@drawable/create_0_3" />
|
||||
</selector>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_checked="true"
|
||||
android:drawable="@drawable/survival_3" />
|
||||
<item android:drawable="@drawable/creative_3" />
|
||||
</selector>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_checked="true"
|
||||
android:drawable="@drawable/survival_3" />
|
||||
<item android:drawable="@drawable/creative_3" />
|
||||
</selector>
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:background="@drawable/bgtiled"
|
||||
android:tileMode="repeat" >
|
||||
<TextView android:text="Multiplayer username"
|
||||
android:layout_width="540px"
|
||||
android:layout_height="24dp" />
|
||||
<EditText android:id="@+id/editText_options_mpusername"
|
||||
android:text=""
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="48dp"
|
||||
android:singleLine="true"
|
||||
android:inputType="textNoSuggestions"
|
||||
>
|
||||
</EditText>
|
||||
</LinearLayout>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:background="@drawable/bgtiled"
|
||||
android:tileMode="repeat" >
|
||||
<TextView android:text="Multiplayer username"
|
||||
android:layout_width="540px"
|
||||
android:layout_height="24dp" />
|
||||
<EditText android:id="@+id/editText_options_mpusername"
|
||||
android:text=""
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="48dp"
|
||||
android:singleLine="true"
|
||||
android:inputType="textNoSuggestions"
|
||||
>
|
||||
</EditText>
|
||||
</LinearLayout>
|
||||
|
||||
@@ -1,29 +1,29 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/bgtiled"
|
||||
android:tileMode="repeat"
|
||||
android:gravity="center_horizontal"
|
||||
>
|
||||
<TextView android:text = "@string/renameworld_title"
|
||||
android:layout_width="360dp"
|
||||
android:layout_height="24dp"
|
||||
android:typeface="monospace"
|
||||
/>
|
||||
<com.mojang.android.EditTextAscii
|
||||
android:id="@+id/editText_worldNameRename"
|
||||
android:text="@string/renameworld_saved_world"
|
||||
android:layout_width="360dp"
|
||||
android:layout_height="48dp"
|
||||
android:singleLine="true"
|
||||
android:typeface="monospace"
|
||||
android:maxLength="64"
|
||||
android:imeActionLabel="Ok"
|
||||
android:inputType="textNoSuggestions"
|
||||
android:imeOptions="actionDone" />
|
||||
<View
|
||||
android:layout_width="360dp"
|
||||
android:layout_height="10px" />
|
||||
</LinearLayout>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@drawable/bgtiled"
|
||||
android:tileMode="repeat"
|
||||
android:gravity="center_horizontal"
|
||||
>
|
||||
<TextView android:text = "@string/renameworld_title"
|
||||
android:layout_width="360dp"
|
||||
android:layout_height="24dp"
|
||||
android:typeface="monospace"
|
||||
/>
|
||||
<com.mojang.android.EditTextAscii
|
||||
android:id="@+id/editText_worldNameRename"
|
||||
android:text="@string/renameworld_saved_world"
|
||||
android:layout_width="360dp"
|
||||
android:layout_height="48dp"
|
||||
android:singleLine="true"
|
||||
android:typeface="monospace"
|
||||
android:maxLength="64"
|
||||
android:imeActionLabel="Ok"
|
||||
android:inputType="textNoSuggestions"
|
||||
android:imeOptions="actionDone" />
|
||||
<View
|
||||
android:layout_width="360dp"
|
||||
android:layout_height="10px" />
|
||||
</LinearLayout>
|
||||
|
||||
@@ -1,40 +1,40 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">Minecraft - Pocket Edition</string>
|
||||
<string name="app_name_demo">Minecraft - Pocket Edition Demo</string>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">Minecraft - Pocket Edition</string>
|
||||
<string name="app_name_demo">Minecraft - Pocket Edition Demo</string>
|
||||
<string name="xperiaplayoptimized_content">true</string>
|
||||
<string name="app_name_short">Minecraft PE</string>
|
||||
<string name="app_name_short_demo">Minecraft PE Demo</string>
|
||||
|
||||
<!-- CREATE NEW WORLD -->
|
||||
<string name="createworld_name">World name</string>
|
||||
<string name="createworld_new_world">Unnamed world</string>
|
||||
<string name="createworld_seed">World Generator seed. Leave blank for random.</string>
|
||||
<string name="createworld_seed_info">Leave blank for random seed</string>
|
||||
<string name="gamemode_survival_summary">Mobs, health and gather resources</string>
|
||||
<string name="gamemode_creative_summary">Unlimited resources and flying</string>
|
||||
|
||||
<!-- RENAME WORLD -->
|
||||
<string name="renameworld_title">Save world as</string>
|
||||
<string name="renameworld_saved_world">Saved World</string>
|
||||
|
||||
<!-- MAIN MENU OPTIONS -->
|
||||
<string name="mmoptions_mp_username_title">Username</string>
|
||||
<string name="mmoptions_mp_username_dialog">Enter your username</string>
|
||||
<string name="mmoptions_mp_server_visible_default_title">Server visible by default</string>
|
||||
<string name="mmoptions_ctrl_sensitivity_title">Sensitivity</string>
|
||||
<string name="mmoptions_ctrl_invertmouse_title">Invert Y-axis</string>
|
||||
<string name="mmoptions_ctrl_islefthanded_title">Lefty</string>
|
||||
<string name="mmoptions_ctrl_usetouchscreen_title">Use touch screen</string>
|
||||
<string name="mmoptions_ctrl_usetouchjoypad_title">Split touch controls</string>
|
||||
<string name="mmoptions_feedback_vibration_title">Vibration</string>
|
||||
<string name="mmoptions_feedback_vibration_summary">Slight vibration when blocks are destroyed</string>
|
||||
<string name="mmoptions_gfx_fancygraphics_title">Fancy graphics</string>
|
||||
<string name="mmoptions_gfx_fancygraphics_summary"></string>
|
||||
<string name="mmoptions_gfx_fancygraphics_summary_powervr"></string>
|
||||
<string name="mmoptions_gfx_lowquality_title">Lower graphics quality</string>
|
||||
<string name="mmoptions_gfx_lowquality_summary">Shorter view distance and disables fancy rendering</string>
|
||||
<string name="mmoptions_game_difficultypeaceful_title">Peaceful mode</string>
|
||||
<string name="mmoptions_game_difficultypeaceful_summary">No hostile mobs, heal automatically</string>
|
||||
|
||||
</resources>
|
||||
<string name="app_name_short">Minecraft PE</string>
|
||||
<string name="app_name_short_demo">Minecraft PE Demo</string>
|
||||
|
||||
<!-- CREATE NEW WORLD -->
|
||||
<string name="createworld_name">World name</string>
|
||||
<string name="createworld_new_world">Unnamed world</string>
|
||||
<string name="createworld_seed">World Generator seed. Leave blank for random.</string>
|
||||
<string name="createworld_seed_info">Leave blank for random seed</string>
|
||||
<string name="gamemode_survival_summary">Mobs, health and gather resources</string>
|
||||
<string name="gamemode_creative_summary">Unlimited resources and flying</string>
|
||||
|
||||
<!-- RENAME WORLD -->
|
||||
<string name="renameworld_title">Save world as</string>
|
||||
<string name="renameworld_saved_world">Saved World</string>
|
||||
|
||||
<!-- MAIN MENU OPTIONS -->
|
||||
<string name="mmoptions_mp_username_title">Username</string>
|
||||
<string name="mmoptions_mp_username_dialog">Enter your username</string>
|
||||
<string name="mmoptions_mp_server_visible_default_title">Server visible by default</string>
|
||||
<string name="mmoptions_ctrl_sensitivity_title">Sensitivity</string>
|
||||
<string name="mmoptions_ctrl_invertmouse_title">Invert Y-axis</string>
|
||||
<string name="mmoptions_ctrl_islefthanded_title">Lefty</string>
|
||||
<string name="mmoptions_ctrl_usetouchscreen_title">Use touch screen</string>
|
||||
<string name="mmoptions_ctrl_usetouchjoypad_title">Split touch controls</string>
|
||||
<string name="mmoptions_feedback_vibration_title">Vibration</string>
|
||||
<string name="mmoptions_feedback_vibration_summary">Slight vibration when blocks are destroyed</string>
|
||||
<string name="mmoptions_gfx_fancygraphics_title">Fancy graphics</string>
|
||||
<string name="mmoptions_gfx_fancygraphics_summary"></string>
|
||||
<string name="mmoptions_gfx_fancygraphics_summary_powervr"></string>
|
||||
<string name="mmoptions_gfx_lowquality_title">Lower graphics quality</string>
|
||||
<string name="mmoptions_gfx_lowquality_summary">Shorter view distance and disables fancy rendering</string>
|
||||
<string name="mmoptions_game_difficultypeaceful_title">Peaceful mode</string>
|
||||
<string name="mmoptions_game_difficultypeaceful_summary">No hostile mobs, heal automatically</string>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -1,105 +1,105 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<PreferenceCategory
|
||||
android:title="Multiplayer">
|
||||
|
||||
<EditTextPreference
|
||||
android:key="mp_username"
|
||||
android:title="@string/mmoptions_mp_username_title"
|
||||
android:summary=""
|
||||
android:dialogTitle="@string/mmoptions_mp_username_dialog"
|
||||
android:defaultValue="Steve"
|
||||
android:singleLine="true" />
|
||||
<CheckBoxPreference
|
||||
android:key="mp_server_visible_default"
|
||||
android:title="@string/mmoptions_mp_server_visible_default_title"
|
||||
android:summary=""
|
||||
android:defaultValue="true"
|
||||
/>
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="category_graphics"
|
||||
android:title="Graphics">
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="gfx_fancygraphics"
|
||||
android:title="@string/mmoptions_gfx_fancygraphics_title"
|
||||
android:summary="@string/mmoptions_gfx_fancygraphics_summary"
|
||||
android:defaultValue="false"
|
||||
/>
|
||||
<CheckBoxPreference
|
||||
android:key="gfx_lowquality"
|
||||
android:title="@string/mmoptions_gfx_lowquality_title"
|
||||
android:summary="@string/mmoptions_gfx_lowquality_summary"
|
||||
android:defaultValue="false"
|
||||
/>
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:title="Controls">
|
||||
|
||||
<com.mojang.android.preferences.SliderPreference
|
||||
android:key="ctrl_sensitivity"
|
||||
android:title="@string/mmoptions_ctrl_sensitivity_title"
|
||||
android:max="100"
|
||||
android:summary=""
|
||||
android:defaultValue="50"
|
||||
android:enabled="true"
|
||||
/>
|
||||
<CheckBoxPreference
|
||||
android:key="ctrl_invertmouse"
|
||||
android:title="@string/mmoptions_ctrl_invertmouse_title"
|
||||
android:summary=""
|
||||
android:defaultValue="false"
|
||||
android:enabled="true"
|
||||
/>
|
||||
<CheckBoxPreference
|
||||
android:key="ctrl_islefthanded"
|
||||
android:title="@string/mmoptions_ctrl_islefthanded_title"
|
||||
android:summary=""
|
||||
android:defaultValue="false"
|
||||
android:enabled="true"
|
||||
/>
|
||||
<CheckBoxPreference
|
||||
android:key="ctrl_usetouchscreen"
|
||||
android:title="@string/mmoptions_ctrl_usetouchscreen_title"
|
||||
android:summary=""
|
||||
android:defaultValue="true"
|
||||
android:enabled="false"
|
||||
/>
|
||||
<CheckBoxPreference
|
||||
android:key="ctrl_usetouchjoypad"
|
||||
android:title="@string/mmoptions_ctrl_usetouchjoypad_title"
|
||||
android:summary=""
|
||||
android:defaultValue="false"
|
||||
android:enabled="true"
|
||||
/>
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:title="Feedback">
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="feedback_vibration"
|
||||
android:title="@string/mmoptions_feedback_vibration_title"
|
||||
android:summary="@string/mmoptions_feedback_vibration_summary"
|
||||
android:defaultValue="true"
|
||||
android:enabled="true"
|
||||
/>
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:title="Game">
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="game_difficultypeaceful"
|
||||
android:title="@string/mmoptions_game_difficultypeaceful_title"
|
||||
android:summary="@string/mmoptions_game_difficultypeaceful_summary"
|
||||
android:defaultValue="false"
|
||||
/>
|
||||
</PreferenceCategory>
|
||||
|
||||
</PreferenceScreen>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<PreferenceCategory
|
||||
android:title="Multiplayer">
|
||||
|
||||
<EditTextPreference
|
||||
android:key="mp_username"
|
||||
android:title="@string/mmoptions_mp_username_title"
|
||||
android:summary=""
|
||||
android:dialogTitle="@string/mmoptions_mp_username_dialog"
|
||||
android:defaultValue="Steve"
|
||||
android:singleLine="true" />
|
||||
<CheckBoxPreference
|
||||
android:key="mp_server_visible_default"
|
||||
android:title="@string/mmoptions_mp_server_visible_default_title"
|
||||
android:summary=""
|
||||
android:defaultValue="true"
|
||||
/>
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:key="category_graphics"
|
||||
android:title="Graphics">
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="gfx_fancygraphics"
|
||||
android:title="@string/mmoptions_gfx_fancygraphics_title"
|
||||
android:summary="@string/mmoptions_gfx_fancygraphics_summary"
|
||||
android:defaultValue="false"
|
||||
/>
|
||||
<CheckBoxPreference
|
||||
android:key="gfx_lowquality"
|
||||
android:title="@string/mmoptions_gfx_lowquality_title"
|
||||
android:summary="@string/mmoptions_gfx_lowquality_summary"
|
||||
android:defaultValue="false"
|
||||
/>
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:title="Controls">
|
||||
|
||||
<com.mojang.android.preferences.SliderPreference
|
||||
android:key="ctrl_sensitivity"
|
||||
android:title="@string/mmoptions_ctrl_sensitivity_title"
|
||||
android:max="100"
|
||||
android:summary=""
|
||||
android:defaultValue="50"
|
||||
android:enabled="true"
|
||||
/>
|
||||
<CheckBoxPreference
|
||||
android:key="ctrl_invertmouse"
|
||||
android:title="@string/mmoptions_ctrl_invertmouse_title"
|
||||
android:summary=""
|
||||
android:defaultValue="false"
|
||||
android:enabled="true"
|
||||
/>
|
||||
<CheckBoxPreference
|
||||
android:key="ctrl_islefthanded"
|
||||
android:title="@string/mmoptions_ctrl_islefthanded_title"
|
||||
android:summary=""
|
||||
android:defaultValue="false"
|
||||
android:enabled="true"
|
||||
/>
|
||||
<CheckBoxPreference
|
||||
android:key="ctrl_usetouchscreen"
|
||||
android:title="@string/mmoptions_ctrl_usetouchscreen_title"
|
||||
android:summary=""
|
||||
android:defaultValue="true"
|
||||
android:enabled="false"
|
||||
/>
|
||||
<CheckBoxPreference
|
||||
android:key="ctrl_usetouchjoypad"
|
||||
android:title="@string/mmoptions_ctrl_usetouchjoypad_title"
|
||||
android:summary=""
|
||||
android:defaultValue="false"
|
||||
android:enabled="true"
|
||||
/>
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:title="Feedback">
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="feedback_vibration"
|
||||
android:title="@string/mmoptions_feedback_vibration_title"
|
||||
android:summary="@string/mmoptions_feedback_vibration_summary"
|
||||
android:defaultValue="true"
|
||||
android:enabled="true"
|
||||
/>
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory
|
||||
android:title="Game">
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="game_difficultypeaceful"
|
||||
android:title="@string/mmoptions_game_difficultypeaceful_title"
|
||||
android:summary="@string/mmoptions_game_difficultypeaceful_summary"
|
||||
android:defaultValue="false"
|
||||
/>
|
||||
</PreferenceCategory>
|
||||
|
||||
</PreferenceScreen>
|
||||
|
||||
Reference in New Issue
Block a user