diff --git a/mods/mods_here.txt b/mods/mods_here.txt deleted file mode 100644 index e105fbd1a..000000000 --- a/mods/mods_here.txt +++ /dev/null @@ -1,4 +0,0 @@ -You can install Minetest mods by copying (and extracting) them into this folder. -To enable them, go to the configure world window in the main menu or write - load_mod_ = true -in world.mt in the world directory. diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index e5c8559e8..afc06d5e5 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -125,7 +125,11 @@ void set_default_settings(Settings *settings) settings->setDefault("screenshot_path", "."); settings->setDefault("view_bobbing_amount", "1.0"); settings->setDefault("fall_bobbing_amount", "0.0"); +#ifdef __ANDROID__ + settings->setDefault("enable_3d_clouds", "false"); +#else settings->setDefault("enable_3d_clouds", "true"); +#endif settings->setDefault("cloud_height", "120"); settings->setDefault("cloud_radius", "12"); settings->setDefault("menu_clouds", "true"); @@ -140,9 +144,13 @@ void set_default_settings(Settings *settings) settings->setDefault("gui_scaling", "1.0"); settings->setDefault("gui_scaling_filter", "false"); settings->setDefault("gui_scaling_filter_txr2img", "true"); +#ifdef __ANDROID__ + settings->setDefault("mouse_sensitivity", "0.05"); +#else settings->setDefault("mouse_sensitivity", "0.2"); +#endif settings->setDefault("enable_sound", "true"); - settings->setDefault("sound_volume", "0.8"); + settings->setDefault("sound_volume", "1"); settings->setDefault("desynchronize_mapblock_texture_animation", "true"); settings->setDefault("selectionbox_width","2"); settings->setDefault("hud_hotbar_max_width","1.0"); diff --git a/textures/base/pack/background.png b/textures/base/pack/background.png new file mode 100644 index 000000000..1f2e5bed6 Binary files /dev/null and b/textures/base/pack/background.png differ diff --git a/textures/base/pack/camera_btn.png b/textures/base/pack/camera_btn.png index f61b0cc4a..e3db7ba80 100644 Binary files a/textures/base/pack/camera_btn.png and b/textures/base/pack/camera_btn.png differ diff --git a/textures/base/pack/chat_btn.png b/textures/base/pack/chat_btn.png index a452bd0b9..8ccdc7d43 100644 Binary files a/textures/base/pack/chat_btn.png and b/textures/base/pack/chat_btn.png differ diff --git a/textures/base/pack/debug_btn.png b/textures/base/pack/debug_btn.png deleted file mode 100644 index 66bd41f7a..000000000 Binary files a/textures/base/pack/debug_btn.png and /dev/null differ diff --git a/textures/base/pack/dirt_bg.png b/textures/base/pack/dirt_bg.png index 7cb9c89a6..29df43912 100644 Binary files a/textures/base/pack/dirt_bg.png and b/textures/base/pack/dirt_bg.png differ diff --git a/textures/base/pack/disable_img.png b/textures/base/pack/disable_img.png index 4d3a1b45d..e53b265ed 100644 Binary files a/textures/base/pack/disable_img.png and b/textures/base/pack/disable_img.png differ diff --git a/textures/base/pack/down.png b/textures/base/pack/down.png index 7d13857ca..c16d02db8 100644 Binary files a/textures/base/pack/down.png and b/textures/base/pack/down.png differ diff --git a/textures/base/pack/down_arrow.png b/textures/base/pack/down_arrow.png index 7b34b1b3a..29075124b 100644 Binary files a/textures/base/pack/down_arrow.png and b/textures/base/pack/down_arrow.png differ diff --git a/textures/base/pack/drop_btn.png b/textures/base/pack/drop_btn.png index 58789e458..6a957df2f 100644 Binary files a/textures/base/pack/drop_btn.png and b/textures/base/pack/drop_btn.png differ diff --git a/textures/base/pack/enable_img.png b/textures/base/pack/enable_img.png index e07f4e9dd..8529fa89e 100644 Binary files a/textures/base/pack/enable_img.png and b/textures/base/pack/enable_img.png differ diff --git a/textures/base/pack/fast_btn.png b/textures/base/pack/fast_btn.png index 4572a7b54..1310e2eb4 100644 Binary files a/textures/base/pack/fast_btn.png and b/textures/base/pack/fast_btn.png differ diff --git a/textures/base/pack/fly_btn.png b/textures/base/pack/fly_btn.png index a095b92a7..498bffdc7 100644 Binary files a/textures/base/pack/fly_btn.png and b/textures/base/pack/fly_btn.png differ diff --git a/textures/base/pack/halo.png b/textures/base/pack/halo.png index 852ef76b8..e13b54419 100644 Binary files a/textures/base/pack/halo.png and b/textures/base/pack/halo.png differ diff --git a/textures/base/pack/header.png b/textures/base/pack/header.png new file mode 100644 index 000000000..f2ff5a69e Binary files /dev/null and b/textures/base/pack/header.png differ diff --git a/textures/base/pack/inventory_btn.png b/textures/base/pack/inventory_btn.png index 58f892b55..32f283be3 100644 Binary files a/textures/base/pack/inventory_btn.png and b/textures/base/pack/inventory_btn.png differ diff --git a/textures/base/pack/jump_btn.png b/textures/base/pack/jump_btn.png index 573fd1a10..b4297f398 100644 Binary files a/textures/base/pack/jump_btn.png and b/textures/base/pack/jump_btn.png differ diff --git a/textures/base/pack/left_arrow.png b/textures/base/pack/left_arrow.png index 30ec327a2..615774aa2 100644 Binary files a/textures/base/pack/left_arrow.png and b/textures/base/pack/left_arrow.png differ diff --git a/textures/base/pack/logo.png b/textures/base/pack/logo.png deleted file mode 100644 index 89be884a2..000000000 Binary files a/textures/base/pack/logo.png and /dev/null differ diff --git a/textures/base/pack/menu_button.png b/textures/base/pack/menu_button.png index 20f50a4d2..6503505a6 100644 Binary files a/textures/base/pack/menu_button.png and b/textures/base/pack/menu_button.png differ diff --git a/textures/base/pack/menu_button_b.png b/textures/base/pack/menu_button_b.png index 6c4ab347d..4db870df8 100644 Binary files a/textures/base/pack/menu_button_b.png and b/textures/base/pack/menu_button_b.png differ diff --git a/textures/base/pack/menu_check.png b/textures/base/pack/menu_check.png index bd461e383..4a8fd373b 100644 Binary files a/textures/base/pack/menu_check.png and b/textures/base/pack/menu_check.png differ diff --git a/textures/base/pack/menu_checkf.png b/textures/base/pack/menu_checkf.png index 24502c828..951ed97e6 100644 Binary files a/textures/base/pack/menu_checkf.png and b/textures/base/pack/menu_checkf.png differ diff --git a/textures/base/pack/menu_header.png b/textures/base/pack/menu_header.png deleted file mode 100644 index abf24038e..000000000 Binary files a/textures/base/pack/menu_header.png and /dev/null differ diff --git a/textures/base/pack/menu_trans.png b/textures/base/pack/menu_trans.png index 551ac3a1f..e63c92487 100644 Binary files a/textures/base/pack/menu_trans.png and b/textures/base/pack/menu_trans.png differ diff --git a/textures/base/pack/no_screenshot.png b/textures/base/pack/no_screenshot.png index e309a3eed..90897d598 100644 Binary files a/textures/base/pack/no_screenshot.png and b/textures/base/pack/no_screenshot.png differ diff --git a/textures/base/pack/noclip_btn.png b/textures/base/pack/noclip_btn.png deleted file mode 100644 index 1aadad414..000000000 Binary files a/textures/base/pack/noclip_btn.png and /dev/null differ diff --git a/textures/base/pack/rangeview_btn.png b/textures/base/pack/rangeview_btn.png index fbcd80a1d..e1162fa29 100644 Binary files a/textures/base/pack/rangeview_btn.png and b/textures/base/pack/rangeview_btn.png differ diff --git a/textures/base/pack/right_arrow.png b/textures/base/pack/right_arrow.png index 04594b6e3..902207196 100644 Binary files a/textures/base/pack/right_arrow.png and b/textures/base/pack/right_arrow.png differ diff --git a/textures/base/pack/server_flags_creative.png b/textures/base/pack/server_flags_creative.png index fa37a19ca..65035bef6 100644 Binary files a/textures/base/pack/server_flags_creative.png and b/textures/base/pack/server_flags_creative.png differ diff --git a/textures/base/pack/server_flags_damage.png b/textures/base/pack/server_flags_damage.png index f35eb7292..3f0bf0daf 100644 Binary files a/textures/base/pack/server_flags_damage.png and b/textures/base/pack/server_flags_damage.png differ diff --git a/textures/base/pack/server_flags_favourite.png b/textures/base/pack/server_flags_favourite.png new file mode 100644 index 000000000..3ecd99d1a Binary files /dev/null and b/textures/base/pack/server_flags_favourite.png differ diff --git a/textures/base/pack/server_flags_favourite_off.png b/textures/base/pack/server_flags_favourite_off.png new file mode 100644 index 000000000..d3d4635a6 Binary files /dev/null and b/textures/base/pack/server_flags_favourite_off.png differ diff --git a/textures/base/pack/server_flags_password.png b/textures/base/pack/server_flags_password.png new file mode 100644 index 000000000..756a01055 Binary files /dev/null and b/textures/base/pack/server_flags_password.png differ diff --git a/textures/base/pack/server_flags_pvp.png b/textures/base/pack/server_flags_pvp.png index 5c3d86bc0..de0f2c34c 100644 Binary files a/textures/base/pack/server_flags_pvp.png and b/textures/base/pack/server_flags_pvp.png differ diff --git a/textures/base/pack/smoke_puff.png b/textures/base/pack/smoke_puff.png index e0f038f0a..8824a731c 100644 Binary files a/textures/base/pack/smoke_puff.png and b/textures/base/pack/smoke_puff.png differ diff --git a/textures/base/pack/sunrisebg.png b/textures/base/pack/sunrisebg.png index 1d03dd3c3..948c3c07e 100644 Binary files a/textures/base/pack/sunrisebg.png and b/textures/base/pack/sunrisebg.png differ diff --git a/textures/base/pack/unknown_item.png b/textures/base/pack/unknown_item.png index 27a3450eb..c8cf616a7 100644 Binary files a/textures/base/pack/unknown_item.png and b/textures/base/pack/unknown_item.png differ diff --git a/textures/base/pack/up_arrow.png b/textures/base/pack/up_arrow.png index 070529a41..575917433 100644 Binary files a/textures/base/pack/up_arrow.png and b/textures/base/pack/up_arrow.png differ diff --git a/textures/texture_packs_here.txt b/textures/texture_packs_here.txt deleted file mode 100644 index 4c9afe18e..000000000 --- a/textures/texture_packs_here.txt +++ /dev/null @@ -1 +0,0 @@ -Put your texture pack folders in this folder. Textures in the "server" pack will be used by the server.