diff --git a/.gitignore b/.gitignore index e139ef1c..5b05d809 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ gtags.files ## Configuration/log files debug.txt +multicraft.conf ## Doxygen files doc/Doxyfile diff --git a/build/android/Makefile b/build/android/Makefile index 4fae5921..92318e97 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -83,6 +83,7 @@ IRRLICHT_TIMESTAMP = $(IRRLICHT_DIR)/timestamp IRRLICHT_TIMESTAMP_INT = $(ROOT)/deps/irrlicht_timestamp IRRLICHT_URL_HTTP = https://github.com/zaki/irrlicht/archive/$(IRRLICHT_COMMIT).zip +# not used now OPENSSL_VERSION = 1.0.2g OPENSSL_DIR = $(ROOT)/deps/openssl OPENSSL_LIB = $(OPENSSL_DIR)/libssl.so.1.0.0 @@ -118,7 +119,7 @@ ICONV_TIMESTAMP = $(ICONV_DIR)/timestamp ICONV_TIMESTAMP_INT = $(ROOT)/deps/iconv_timestamp ICONV_URL_HTTP = http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$(ICONV_VERSION).tar.gz -SQLITE3_VERSION= 3120100 +SQLITE3_VERSION= 3120200 SQLITE3_DIR = $(ROOT)/deps/sqlite SQLITE3_URL = http://www.sqlite.org/2016/sqlite-amalgamation-$(SQLITE3_VERSION).zip @@ -376,9 +377,9 @@ $(FREETYPE_LIB) : $(FREETYPE_TIMESTAMP) export PATH="$${TOOLCHAIN}/bin:$${PATH}"; \ export CXX=${CROSS_PREFIX}g++; \ export TARGET_OS=OS_ANDROID_CROSSCOMPILE; \ - CC=${CROSS_PREFIX}gcc ./configure --host=${TARGET_HOST} \ - --prefix=${TOOLCHAIN} --with-png=no --with-harfbuzz=no || exit 1; \ - CC=${CROSS_PREFIX}gcc ANDROID_DEV=/tmp/ndk-${TARGET_HOST}-freetype make || exit 1; \ + CC=${CROSS_PREFIX}gcc ./configure --host=${TARGET_HOST} \ + --prefix=${TOOLCHAIN} --with-png=no --with-harfbuzz=no || exit 1; \ + CC=${CROSS_PREFIX}gcc ANDROID_DEV=/tmp/ndk-${TARGET_HOST}-freetype $(MAKE) || exit 1; \ touch ${FREETYPE_TIMESTAMP}; \ touch ${FREETYPE_TIMESTAMP_INT}; \ $(RM) -rf $${TOOLCHAIN}; \ diff --git a/builtin/mainmenu/textures.lua b/builtin/mainmenu/textures.lua index 84a901b8..ea69618d 100644 --- a/builtin/mainmenu/textures.lua +++ b/builtin/mainmenu/textures.lua @@ -180,6 +180,6 @@ function mm_texture.set_dirt_bg() end --use base pack - local minimalpath = defaulttexturedir .. "dirt_bg.png" + local minimalpath = defaulttexturedir .. "bg.png" core.set_background("background", minimalpath, true, 128) end diff --git a/doc/Other License.md b/doc/Other License.md index 5d76480c..9759c9a0 100644 --- a/doc/Other License.md +++ b/doc/Other License.md @@ -227,6 +227,14 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +RetroVille NC: + + 100% Free + +Copyright (c) 2010, Jayvee Enaguas + +http://www.dafont.com/retroville-nc.font + --- --- --- Mod "Dungeon Loot" [dungeon_loot] diff --git a/fonts/basis33.ttf b/fonts/basis33.ttf deleted file mode 100644 index b20255b2..00000000 Binary files a/fonts/basis33.ttf and /dev/null differ diff --git a/fonts/retrovillenc.ttf b/fonts/retrovillenc.ttf new file mode 100644 index 00000000..4611f760 Binary files /dev/null and b/fonts/retrovillenc.ttf differ diff --git a/multicraft.conf b/multicraft.conf index e4aaf78e..cf18ef95 100644 --- a/multicraft.conf +++ b/multicraft.conf @@ -1,6 +1,6 @@ menu_last_game = default name = -selected_world_path = /home/maksim/MultiCraft/bin/../worlds/World 1 +selected_world_path = /media/maksim/LinuxWork/MultiCraft-master/bin/../worlds/World 2 server_dedicated = false creative_mode = false enable_damage = true diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 6de40add..85d23407 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -217,7 +217,7 @@ void set_default_settings(Settings *settings) std::stringstream fontsize; fontsize << DEFAULT_FONT_SIZE; - settings->setDefault("font_size", "12"); + settings->setDefault("font_size", fontsize.str()); settings->setDefault("mono_font_size", fontsize.str()); settings->setDefault("fallback_font_size", fontsize.str()); #else @@ -355,7 +355,7 @@ void set_default_settings(Settings *settings) settings->setDefault("fps_max", "30"); settings->setDefault("max_objects_per_block", "20"); settings->setDefault("sqlite_synchronous", "1"); - settings->setDefault("gui_scaling", "1.1"); + settings->setDefault("gui_scaling", "1.2"); settings->setDefault("doubletap_jump", "true"); settings->setDefault("server_map_save_interval", "20"); settings->setDefault("client_unload_unused_data_timeout", "60"); @@ -382,9 +382,10 @@ void set_default_settings(Settings *settings) settings->setDefault("mouse_sensitivity", "0.15"); } - std::stringstream anddroidfontsize; - anddroidfontsize << DEFAULT_FONT_SIZE / 2.8 * x_inches; - settings->setDefault("font_size", anddroidfontsize.str()); + //std::stringstream anddroidfontsize; + //anddroidfontsize << DEFAULT_FONT_SIZE / 3.0 * x_inches; + //settings->setDefault("font_size", anddroidfontsize.str()); + settings->setDefault("mono_font_path", "/system/fonts/DroidSansMono.ttf"); settings->setDefault("fallback_font_path", "/system/fonts/DroidSans.ttf"); diff --git a/src/drawscene.cpp b/src/drawscene.cpp index 7fff02a2..e6650d47 100644 --- a/src/drawscene.cpp +++ b/src/drawscene.cpp @@ -500,7 +500,11 @@ void draw_load_screen(const std::wstring &text, IrrlichtDevice* device, } else driver->beginScene(true, true, video::SColor(255, 0, 0, 0)); - + video::ITexture *background_image = driver->getTexture((porting::path_share + "/textures/base/bg.png").c_str()); + draw2DImageFilterScaled(driver, background_image, + irr::core::rect(0, 0, screensize.X*2, screensize.Y*2), + irr::core::rect(0, 0, screensize.X, screensize.Y), 0, 0, false); + // draw progress bar if ((percent >= 0) && (percent <= 100)) { diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index e9e23174..b69e2fc5 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -2902,7 +2902,7 @@ bool GUIFormSpecMenu::preprocessEvent(const SEvent& event) if (label == "") { label = "text"; } - message += gettext(label) + ":"; + message += gettext(label.c_str()); /* single line text input */ int type = 2; diff --git a/src/hud.cpp b/src/hud.cpp index d11db7bb..ab2f27c2 100644 --- a/src/hud.cpp +++ b/src/hud.cpp @@ -449,7 +449,7 @@ void Hud::drawHotbar(u16 playeritem) { s32 hotbar_itemcount = player->hud_hotbar_itemcount; s32 width = hotbar_itemcount * (m_hotbar_imagesize + m_padding * 2); - v2s32 pos = centerlowerpos - v2s32(width / 2, m_hotbar_imagesize + m_padding * 3); + v2s32 pos = centerlowerpos - v2s32(width / 2, m_hotbar_imagesize + m_padding * 2.7); if ( (float) width / (float) porting::getWindowSize().X <= g_settings->getFloat("hud_hotbar_max_width")) { @@ -580,7 +580,7 @@ void Hud::updateSelectionMesh(const v3s16 &camera_offset) m_halo_boxes.push_back(halo_box); m_selection_mesh = convertNodeboxesToMesh( - m_halo_boxes, texture_uv, 0.5); + m_halo_boxes, texture_uv, 0.3); } void Hud::resizeHotbar() { diff --git a/textures/base/dirt_bg.png b/textures/base/bg.png similarity index 100% rename from textures/base/dirt_bg.png rename to textures/base/bg.png diff --git a/textures/base/left.png b/textures/base/left.png index be19c557..11ecb11c 100644 Binary files a/textures/base/left.png and b/textures/base/left.png differ diff --git a/textures/base/up_three.png b/textures/base/up_three.png index cf2c07c4..82b3f279 100644 Binary files a/textures/base/up_three.png and b/textures/base/up_three.png differ