diff --git a/builtin/mainmenu/dlg_create_world.lua b/builtin/mainmenu/dlg_create_world.lua index 585f3684..771dce0a 100644 --- a/builtin/mainmenu/dlg_create_world.lua +++ b/builtin/mainmenu/dlg_create_world.lua @@ -46,7 +46,7 @@ local function create_world_formspec(dialogdata) current_seed = core.formspec_escape(current_seed) local retval = - "size[12,3,true]" .. + "size[11.5,3,false]" .. "label[2,0;" .. fgettext("World name") .. "]".. "field[4.5,0.4;6,0.5;te_world_name;;]" .. @@ -56,11 +56,10 @@ local function create_world_formspec(dialogdata) --"label[2,2;" .. fgettext("Mapgen") .. "]".. --"dropdown[4.2,2;6.3;dd_mapgen;" .. mglist .. ";" .. selindex .. "]" .. - "dropdown[6000.2,6;6.3;games;" .. gamemgr.gamelist() .. - ";1]" .. + "dropdown[600.2,6;6.3;games;" .. gamemgr.gamelist() .. ";1]" .. - "button[5,2.6;2.6,0.5;world_create_confirm;" .. fgettext("Create") .. "]" .. - "button[7.5,2.6;2.8,0.5;world_create_cancel;" .. fgettext("Cancel") .. "]" + "button[3.25,2.6;2.5,0.5;world_create_confirm;" .. fgettext("Create") .. "]" .. + "button[5.75,2.6;2.5,0.5;world_create_cancel;" .. fgettext("Cancel") .. "]" if #gamemgr.games == 0 then retval = retval .. "box[2,4;8,1;#ff8800]label[2.25,4;" .. diff --git a/builtin/mainmenu/dlg_delete_world.lua b/builtin/mainmenu/dlg_delete_world.lua index 6c81e74a..d49d290b 100644 --- a/builtin/mainmenu/dlg_delete_world.lua +++ b/builtin/mainmenu/dlg_delete_world.lua @@ -19,10 +19,10 @@ local function delete_world_formspec(dialogdata) local retval = - "size[12,2,true]" .. + "size[11.5,2,false]" .. "label[2,0;" .. - fgettext("Delete World \"$1\"?", dialogdata.delete_name) .. "]".. - "button[3.5,1.2;2.6,0.5;world_delete_confirm;" .. fgettext("Yes").. "]" .. + fgettext("Delete World \"$1\"?", dialogdata.delete_name) .. "]" .. + "button[3.5,1.2;2.6,0.5;world_delete_confirm;" .. fgettext("Yes") .. "]" .. "button[6,1.2;2.8,0.5;world_delete_cancel;" .. fgettext("No") .. "]" return retval end @@ -61,4 +61,4 @@ function create_delete_world_dlg(name_to_del,index_to_del) retval.data.delete_index = index_to_del return retval -end \ No newline at end of file +end diff --git a/builtin/mainmenu/init.lua b/builtin/mainmenu/init.lua index d32d5a2f..642366af 100644 --- a/builtin/mainmenu/init.lua +++ b/builtin/mainmenu/init.lua @@ -24,8 +24,7 @@ mt_color_dark_green = "#003300" local menupath = core.get_mainmenu_path() local basepath = core.get_builtin_path() -defaulttexturedir = core.get_texturepath_share() .. DIR_DELIM .. "base" .. - DIR_DELIM +defaulttexturedir = core.get_texturepath_share() .. DIR_DELIM .. "base" .. DIR_DELIM dofile(basepath .. DIR_DELIM .. "common" .. DIR_DELIM .. "async_event.lua") dofile(basepath .. DIR_DELIM .. "common" .. DIR_DELIM .. "filterlist.lua") @@ -43,7 +42,7 @@ dofile(menupath .. DIR_DELIM .. "dlg_delete_world.lua") dofile(menupath .. DIR_DELIM .. "dlg_config_world.lua") if PLATFORM ~= "Android" then dofile(menupath .. DIR_DELIM .. "modmgr.lua") - dofile(menupath .. DIR_DELIM .. "store.lua") +-- dofile(menupath .. DIR_DELIM .. "store.lua") dofile(menupath .. DIR_DELIM .. "dlg_settings_advanced.lua") end @@ -104,14 +103,14 @@ local function init_globals() tv_main:add(tabs.settings) tv_main:add(tabs.texturepacks) end - + --tv_main:add(tabs.mods) tv_main:add(tabs.credits) tv_main:set_global_event_handler(main_event_handler) tv_main:set_fixed_size(false) - tv_main:set_tab(core.setting_get("maintab_LAST")) + tv_main:set_tab(core.setting_get("maintab_LAST")) ui.set_default("maintab") tv_main:show() @@ -125,9 +124,10 @@ local function init_globals() ui.update() core.sound_play("main_menu", false) - + minetest.set_clouds(false) mm_texture.set_dirt_bg() end init_globals() + diff --git a/builtin/mainmenu/textures.lua b/builtin/mainmenu/textures.lua index 5dc14239..8c535933 100644 --- a/builtin/mainmenu/textures.lua +++ b/builtin/mainmenu/textures.lua @@ -20,8 +20,7 @@ mm_texture = {} -------------------------------------------------------------------------------- function mm_texture.init() - mm_texture.defaulttexturedir = core.get_texturepath() .. DIR_DELIM .. "base" .. - DIR_DELIM + mm_texture.defaulttexturedir = core.get_texturepath() .. DIR_DELIM .. "base" .. DIR_DELIM mm_texture.basetexturedir = mm_texture.defaulttexturedir mm_texture.texturepack = core.setting_get("texture_path") diff --git a/textures/base/crack_anylength_android.png b/textures/base/crack_anylength_android.png new file mode 100644 index 00000000..02191a73 Binary files /dev/null and b/textures/base/crack_anylength_android.png differ