Update creative and mainmenu formspec
parent
ec782841d0
commit
a977fa04fc
|
@ -100,7 +100,7 @@ function ui.update()
|
|||
"label[0.5,0;" .. error_title ..
|
||||
"]textlist[0.2,0.8;11.5,3.5;;" .. formspec ..
|
||||
"]button[6,4.6;3,0.5;btn_reconnect_no;" .. fgettext("Main menu") .. "]" ..
|
||||
"button[3,4.6;3,0.5;btn_reconnect_yes;" .. fgettext("Reconnect") .. "]
|
||||
"button[3,4.6;3,0.5;btn_reconnect_yes;" .. fgettext("Restart") .. "]"
|
||||
else
|
||||
local active_toplevel_ui_elements = 0
|
||||
for key,value in pairs(ui.childlist) do
|
||||
|
|
|
@ -235,7 +235,6 @@ core.register_entity(":__builtin:item", {
|
|||
maxexptime = 6,
|
||||
minsize = 2,
|
||||
maxsize = 4,
|
||||
collisiondetection = true,
|
||||
texture = "item_smoke.png"
|
||||
})
|
||||
return
|
||||
|
|
|
@ -20,9 +20,9 @@
|
|||
local multicraft_developers = {
|
||||
"Maksim Gamarnik (MoNTE48) <MoNTE48@mail.ua>",
|
||||
"Bektur Mambetov (ubulem) <berkut87@gmail.com>",
|
||||
"Alexander Zavrin (Ransom.00)",
|
||||
"Alexander Zavrin (Ransom.00)",
|
||||
"sfan5 <sfan5@live.de>",
|
||||
"stujones11 Stuart Jones <stujones111@gmail.com>",
|
||||
"Stuart Jones (stujones11) <stujones111@gmail.com>",
|
||||
"paramat",
|
||||
"And other people who helped make the world better!",
|
||||
}
|
||||
|
@ -96,11 +96,10 @@ return {
|
|||
caption = fgettext("Credits"),
|
||||
cbf_formspec = function(tabview, name, tabdata)
|
||||
local version = core.get_version()
|
||||
-- return "label[0.1,0;MultiCraft Open Source Project, ver. " .. version.string .. "]" ..
|
||||
return "label[0.1,0;MultiCraft Open Source Project]" ..
|
||||
"label[0.1,0.3;]" ..
|
||||
"label[0.1,0.5;https://github.com/MultiCraftProject]" ..
|
||||
"label[0.1,1.0;LGPLv3.0+ and CC-BY-SA 3.0]" ..
|
||||
return "label[0.1,0;MultiCraft Open Source Project, ver. " .. version.string .. "]" ..
|
||||
"label[0.1,0.25;Copyright (c) 2014-2019 MultiCraft Developement Team]" ..
|
||||
"label[0.1,0.5;Home page: https://github.com/MultiCraftProject/MultiCraft]" ..
|
||||
"label[0.1,0.75;Licence: LGPLv3.0+ and CC-BY-SA 3.0]" ..
|
||||
"tablecolumns[color;text]" ..
|
||||
"tableoptions[background=#999999;highlight=#00000000;border=true]" ..
|
||||
"table[0,1.6;11.8,3.8;list_credits;" ..
|
||||
|
|
|
@ -33,37 +33,40 @@ local function get_formspec(tabview, name, tabdata)
|
|||
|
||||
local retval =
|
||||
-- Search
|
||||
"field[0.2,0.1;5.81,1;te_search;;" .. core.formspec_escape(tabdata.search_for) .. "]" ..
|
||||
"button[5.62,-0.22;1.5,1;btn_mp_search;" .. fgettext("Search") .. "]" ..
|
||||
"image_button[6.97,-0.125;.83,.83;" .. core.formspec_escape(defaulttexturedir .. "refresh.png")
|
||||
"field[0.2,0.1;5.71,1;te_search;;" .. core.formspec_escape(tabdata.search_for) .. "]" ..
|
||||
"image_button[5.52,-0.125;0.85,0.85;" .. core.formspec_escape(defaulttexturedir .. "search.png")
|
||||
.. ";btn_mp_search;" .. "]" ..
|
||||
"image_button[6.26,-0.125;0.85,0.85;" .. core.formspec_escape(defaulttexturedir .. "refresh.png")
|
||||
.. ";btn_mp_refresh;" .. "]" ..
|
||||
|
||||
-- Address / Port
|
||||
"label[7.75,-0.3;" .. fgettext("Address / Port") .. "]" ..
|
||||
"field[8,0.6;3.2,0.5;te_address;;" ..
|
||||
"label[7.1,-0.3;" .. fgettext("Address:") .. "]" ..
|
||||
"label[10.22,-0.3;" .. fgettext("Port:") .. "]" ..
|
||||
"field[7.4,0.6;3.2,0.5;te_address;;" ..
|
||||
core.formspec_escape(core.settings:get("address")) .. "]" ..
|
||||
"field[11.1,0.6;1.35,0.5;te_port;;" ..
|
||||
"field[10.5,0.6;1.85,0.5;te_port;;" ..
|
||||
core.formspec_escape(core.settings:get("remote_port")) .. "]" ..
|
||||
|
||||
-- Name / Password
|
||||
"label[7.75,0.85;" .. fgettext("Name / Password") .. "]" ..
|
||||
"field[8,1.75;2.85,0.5;te_name;;" ..
|
||||
"label[7.1,0.85;" .. fgettext("Name:") .. "]" ..
|
||||
"label[10.22,0.85;" .. fgettext("Password:") .. "]" ..
|
||||
"field[7.4,1.75;2.86,0.5;te_name;;" ..
|
||||
core.formspec_escape(core.settings:get("name")) .. "]" ..
|
||||
"pwdfield[10.73,1.75;1.72,0.5;te_pwd;]" ..
|
||||
"pwdfield[10.5,1.8;1.86,0.5;te_pwd;]" ..
|
||||
|
||||
-- Description Background
|
||||
"box[7.7,2.1;4.25,2.65;#999999]"..
|
||||
"box[7.1,2.1;4.8,2.65;#999999]"..
|
||||
|
||||
-- Connect
|
||||
"button[9.9,5;2.25,0.5;btn_mp_connect;" .. fgettext("Connect") .. "]"
|
||||
"button[9.4,5;2.7,0.5;btn_mp_connect;" .. fgettext("Connect") .. "]"
|
||||
|
||||
if tabdata.fav_selected and fav_selected then
|
||||
if gamedata.fav then
|
||||
retval = retval .. "button[7.7,5;2.3,0.5;btn_delete_favorite;" ..
|
||||
retval = retval .. "button[7.1,5;2.3,0.5;btn_delete_favorite;" ..
|
||||
fgettext("Del. Favorite") .. "]"
|
||||
end
|
||||
if fav_selected.description then
|
||||
retval = retval .. "textarea[8.1,2.3;4.23,2.9;;" ..
|
||||
retval = retval .. "textarea[7.5,2.3;4.8,2.9;;" ..
|
||||
core.formspec_escape((gamedata.serverdescription or ""), true) .. ";]"
|
||||
end
|
||||
end
|
||||
|
@ -81,7 +84,7 @@ local function get_formspec(tabview, name, tabdata)
|
|||
image_column(fgettext("PvP enabled"), "pvp") .. ",padding=0.25;" ..
|
||||
"color,span=1;" ..
|
||||
"text,padding=1]" ..
|
||||
"table[-0.09,0.7;7.7,4.9;favourites;"
|
||||
"table[-0.09,0.7;7,4.9;favourites;"
|
||||
|
||||
if menudata.search_result then
|
||||
for i = 1, #menudata.search_result do
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 577 B After Width: | Height: | Size: 180 B |
Binary file not shown.
After Width: | Height: | Size: 167 B |
Loading…
Reference in New Issue