Version 2.0.5-release
* cherry picked from commit14a7fe0266* fix main menu minor changes cherry picked from commitf917f5c8d0
This commit is contained in:
Maksym H
parent
880579ea15
commit
575f130854
@ -2,7 +2,7 @@
|
||||
|
||||
project.ext.set("versionMajor", 2) // Version Major
|
||||
project.ext.set("versionMinor", 0) // Version Minor
|
||||
project.ext.set("versionPatch", 4) // Version Patch
|
||||
project.ext.set("versionPatch", 5) // Version Patch
|
||||
project.ext.set("versionExtra", "") // Version Extra
|
||||
project.ext.set("versionCode", 100) // Android Version Code
|
||||
project.ext.set("developmentBuild", 0) // Whether it is a development build, or a release
|
||||
|
||||
@ -2226,7 +2226,7 @@
|
||||
"ENABLE_UPDATE_CHECKER=1",
|
||||
"VERSION_MAJOR=2",
|
||||
"VERSION_MINOR=0",
|
||||
"VERSION_PATCH=4",
|
||||
"VERSION_PATCH=5",
|
||||
"VERSION_EXTRA=\"\"",
|
||||
"DEVELOPMENT_BUILD=1",
|
||||
);
|
||||
@ -2250,7 +2250,7 @@
|
||||
);
|
||||
INFOPLIST_FILE = MultiCraft/Info.plist;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.11;
|
||||
MARKETING_VERSION = 2.0.4;
|
||||
MARKETING_VERSION = 2.0.5;
|
||||
OTHER_LDFLAGS = (
|
||||
"$(inherited)",
|
||||
"-L${SRCROOT}/../deps/freetype",
|
||||
@ -2296,7 +2296,7 @@
|
||||
"ENABLE_UPDATE_CHECKER=1",
|
||||
"VERSION_MAJOR=2",
|
||||
"VERSION_MINOR=0",
|
||||
"VERSION_PATCH=4",
|
||||
"VERSION_PATCH=5",
|
||||
"VERSION_EXTRA=\"\"",
|
||||
"DEVELOPMENT_BUILD=0",
|
||||
);
|
||||
@ -2320,7 +2320,7 @@
|
||||
);
|
||||
INFOPLIST_FILE = MultiCraft/Info.plist;
|
||||
MACOSX_DEPLOYMENT_TARGET = 10.11;
|
||||
MARKETING_VERSION = 2.0.4;
|
||||
MARKETING_VERSION = 2.0.5;
|
||||
OTHER_LDFLAGS = (
|
||||
"$(inherited)",
|
||||
"-L${SRCROOT}/../deps/freetype",
|
||||
|
||||
@ -14,7 +14,7 @@ set(CLANG_MINIMUM_VERSION "3.5")
|
||||
# Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
|
||||
set(VERSION_MAJOR 2)
|
||||
set(VERSION_MINOR 0)
|
||||
set(VERSION_PATCH 4)
|
||||
set(VERSION_PATCH 5)
|
||||
set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
|
||||
|
||||
# Change to false for releases
|
||||
|
||||
@ -178,7 +178,7 @@ local function get_formspec(self, popup_w, popup_h, popup_fs)
|
||||
fs[#fs + 1] = "bgcolor[;neither]"
|
||||
fs[#fs + 1] = "listcolors[#000;#000;#000;#dff6f5;#302c2e]"
|
||||
fs[#fs + 1] = fmt("background9[1.25,0;%s,%s;%sbg_common.png;false;32]",
|
||||
w, h + 1.15, defaulttexturedir)
|
||||
w, h + 1.15, defaulttexturedir_esc)
|
||||
|
||||
add_button_header(self, fs, w)
|
||||
|
||||
@ -211,7 +211,7 @@ local function get_formspec(self, popup_w, popup_h, popup_fs)
|
||||
fs[#fs + 1] = fmt("container[%s,%s]", (w + 2.5 - popup_w) / 2,
|
||||
(h + 1.15 - popup_h) / 2)
|
||||
fs[#fs + 1] = fmt("style[popup_bg;bgimg=%sbg_common.png;bgimg_middle=32]",
|
||||
defaulttexturedir)
|
||||
defaulttexturedir_esc)
|
||||
fs[#fs + 1] = fmt("image_button[0,0;%s,%s;;popup_bg;;false;false]",
|
||||
popup_w, popup_h)
|
||||
fs[#fs + 1] = popup_fs
|
||||
|
||||
@ -160,14 +160,13 @@ os.tmpname = function()
|
||||
end
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
local button_path = defaulttexturedir_esc .. "gui" .. DIR_DELIM_esc
|
||||
local worldlist_scrbar_pos = 0
|
||||
function menu_render_worldlist(selected_index)
|
||||
local fs = {"formspec_version[4]"}
|
||||
|
||||
local outer_w, outer_h = 6.93, 5.65
|
||||
fs[#fs + 1] = fmt("background9[0.52,0.21;%s,%s;%sworldlist_bg_new.png;false;32]",
|
||||
outer_w + 1.2, outer_h + 0.2, button_path)
|
||||
outer_w + 1.2, outer_h + 0.2, defaulttexturedir_esc .. "gui" .. DIR_DELIM_esc)
|
||||
fs[#fs + 1] = fmt("scroll_container[0.62,0.31;%s,%s;scrbar;vertical]", outer_w, outer_h)
|
||||
|
||||
local creative = core.settings:get_bool("creative_mode", false)
|
||||
@ -211,11 +210,9 @@ function menu_render_worldlist(selected_index)
|
||||
|
||||
fs[#fs + 1] = fmt("scrollbaroptions[max=%d;thumbsize=%s]", math.ceil(scrollbar_max),
|
||||
(outer_h / inner_h) * scrollbar_max)
|
||||
fs[#fs + 1] = fmt("scrollbar[%s,0.31;0.8,5.65;vertical;scrbar;%s;" ..
|
||||
"%sscrollbar_bg.png,%sscrollbar_slider_middle.png,%sscrollbar_up.png," ..
|
||||
"%sscrollbar_down.png,%sscrollbar_slider_top.png,%sscrollbar_slider_bottom.png]",
|
||||
outer_w + 0.82, worldlist_scrbar_pos, button_path, button_path,
|
||||
button_path, button_path, button_path, button_path)
|
||||
fs[#fs + 1] = scrollbar_style("scrbar")
|
||||
fs[#fs + 1] = fmt("scrollbar[%s,0.31;0.8,5.65;vertical;scrbar;%s]",
|
||||
outer_w + 0.82, worldlist_scrbar_pos)
|
||||
|
||||
return table.concat(fs)
|
||||
end
|
||||
|
||||
@ -130,7 +130,7 @@ local function get_formspec(_, _, tab_data)
|
||||
if game and game.moddable then
|
||||
retval = retval ..
|
||||
btn_style("world_configure") ..
|
||||
"image_button[8.1,4.85;4,0.9;;world_configure;" .. fgettext("Select Mods") .. ";true;false]" ..
|
||||
"image_button[8.1,4.85;4,0.9;;world_configure;" .. fgettext("Settings") .. ";true;false]" ..
|
||||
"image[8.3,5.02;0.5,0.5;" .. defaulttexturedir_esc .. "gui" .. DIR_DELIM_esc .. "world_settings.png]"
|
||||
end
|
||||
|
||||
|
||||
@ -4359,7 +4359,9 @@ void Game::showPauseMenu()
|
||||
bool hasRealKeyboard = porting::hasRealKeyboard();
|
||||
if (simple_singleplayer_mode && hasRealKeyboard)
|
||||
ypos -= 0.6f;
|
||||
#ifdef __IOS__
|
||||
ypos += 0.5f;
|
||||
#endif
|
||||
#endif
|
||||
const bool high_dpi = RenderingEngine::isHighDpi();
|
||||
const std::string x2 = high_dpi ? ".x2" : "";
|
||||
|
||||
@ -48,7 +48,7 @@ void set_default_settings()
|
||||
settings->setDefault("language", "");
|
||||
settings->setDefault("name", "");
|
||||
settings->setDefault("bind_address", "");
|
||||
settings->setDefault("serverlist_url", "servers.multicraft.world");
|
||||
settings->setDefault("serverlist_url", "servers.muklticraft.world");
|
||||
|
||||
// Client
|
||||
settings->setDefault("address", "");
|
||||
@ -560,9 +560,10 @@ void set_default_settings()
|
||||
settings->setDefault("client_mapblock_limit", "50");
|
||||
settings->setDefault("fps_max", "35");
|
||||
settings->setDefault("fps_max_unfocused", "10");
|
||||
settings->setDefault("viewing_range", "30");
|
||||
settings->setDefault("viewing_range", "20");
|
||||
settings->setDefault("smooth_lighting", "false");
|
||||
settings->setDefault("enable_3d_clouds", "false");
|
||||
settings->setDefault("enable_shaders", "false");
|
||||
settings->setDefault("active_object_send_range_blocks", "1");
|
||||
settings->setDefault("active_block_range", "1");
|
||||
settings->setDefault("max_objects_per_block", "16");
|
||||
@ -582,8 +583,10 @@ void set_default_settings()
|
||||
settings->setDefault("client_mapblock_limit", "200");
|
||||
settings->setDefault("fps_max", "35");
|
||||
settings->setDefault("fps_max_unfocused", "10");
|
||||
settings->setDefault("viewing_range", "40");
|
||||
settings->setDefault("viewing_range", "30");
|
||||
settings->setDefault("smooth_lighting", "false");
|
||||
settings->setDefault("enable_3d_clouds", "false");
|
||||
settings->setDefault("enable_shaders", "false");
|
||||
settings->setDefault("active_object_send_range_blocks", "1");
|
||||
settings->setDefault("active_block_range", "2");
|
||||
settings->setDefault("max_objects_per_block", "16");
|
||||
@ -618,6 +621,7 @@ void set_default_settings()
|
||||
settings->setDefault("max_block_generate_distance", "5");
|
||||
|
||||
// enable visual shader effects
|
||||
settings->setDefault("enable_3d_clouds", "true");
|
||||
settings->setDefault("enable_waving_water", "true");
|
||||
settings->setDefault("enable_waving_leaves", "true");
|
||||
settings->setDefault("enable_waving_plants", "true");
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user