From ee75dd125b32788f41fe18c7fcb8c1b60098eef6 Mon Sep 17 00:00:00 2001 From: Maksim Date: Thu, 12 May 2022 15:33:14 +0300 Subject: [PATCH] Final commit --- README.md | 8 ++--- .../MultiCraft.xcodeproj/project.pbxproj | 30 +++++-------------- build/iOS/Podfile | 9 ++---- build/iOS/deps/freetype.sh | 2 +- build/iOS/deps/openal.sh | 2 +- builtin/mainmenu/tab_credits.lua | 2 +- builtin/mainmenu/tab_settings_simple.lua | 5 ++-- src/config.h | 4 +-- 8 files changed, 22 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index 580837e2..f96c13fe 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ -MultiCraft Open Source -====================== +MultiCraft Open Source – Legacy Version +======================================= -[![License](https://img.shields.io/badge/license-LGPLv3.0%2B-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0.en.html) +[![License](https://img.shields.io/badge/License-LGPLv3.0%2B-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0.en.html) [![License: CC BY-SA 4.0](https://img.shields.io/badge/License-CC_BY--SA_4.0-orange.svg)](https://creativecommons.org/licenses/by-sa/4.0/) MultiCraft is an Open Source sandbox game. MultiCraft is based on the Minetest Engine, which is developed by a [number of contributors](https://github.com/minetest/minetest/graphs/contributors). -Copyright © 2014-2022 Maksim Gamarnik [MoNTE48] & MultiCraft Development Team. +Copyright © 2014-2022 Maksim Gamarnik [MoNTE48] & MultiCraft Development Team. The engine and the game is licensed under LGPLv3 (or higher). Resources games licensed under CC BY-SA 4.0, unless otherwise stated. diff --git a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj index 43243219..cb6c3bfb 100644 --- a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj +++ b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj @@ -324,6 +324,8 @@ 84B4414C27ABFD5B000AFAAB /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; 84B9C11524A4D82400016BCE /* ConsentAlertViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConsentAlertViewController.swift; sourceTree = ""; }; 84B9C11624A4D82400016BCE /* ConsentAlertViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ConsentAlertViewController.xib; sourceTree = ""; }; + 84BA9DE727C5569D004FAF40 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/InfoPlist.strings; sourceTree = ""; }; + 84BA9DE827C5569D004FAF40 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Localizable.strings; sourceTree = ""; }; 84C32A3824AF7DDE00445E92 /* UITextViewPlaceholder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITextViewPlaceholder.swift; sourceTree = ""; }; 84C67B1D25D5E06B002E2735 /* AppTrackingTransparency.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppTrackingTransparency.framework; path = System/Library/Frameworks/AppTrackingTransparency.framework; sourceTree = SDKROOT; }; 84CD4A55248781420019B81D /* Bridge-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Bridge-Header.h"; sourceTree = ""; }; @@ -346,7 +348,6 @@ 84E95CAB27AFE158003253C8 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/InfoPlist.strings; sourceTree = ""; }; 84E95CAC27AFE167003253C8 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/InfoPlist.strings; sourceTree = ""; }; 84E95CAD27AFE171003253C8 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = ""; }; - 84BA9DE727C5569D004FAF40 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/InfoPlist.strings; sourceTree = ""; }; 84E95CAF27AFE1B1003253C8 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = ""; }; 84E95CB027AFE1D8003253C8 /* et */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = et; path = et.lproj/InfoPlist.strings; sourceTree = ""; }; 84E95CB127AFE1F8003253C8 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/InfoPlist.strings; sourceTree = ""; }; @@ -370,7 +371,6 @@ 84E95D0827AFEA5F003253C8 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/Localizable.strings; sourceTree = ""; }; 84E95D0927AFEA60003253C8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; }; 84E95D0A27AFEA61003253C8 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = ""; }; - 84BA9DE827C5569D004FAF40 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Localizable.strings; sourceTree = ""; }; 84E95D0C27AFEA62003253C8 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Localizable.strings; sourceTree = ""; }; 84E95D0D27AFEA62003253C8 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = ""; }; 84E95D0F27AFEA63003253C8 /* lv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lv; path = lv.lproj/Localizable.strings; sourceTree = ""; }; @@ -1487,7 +1487,6 @@ F8E6C4D51DCA3B7900F64426 /* Sources */, F8E6C4D61DCA3B7900F64426 /* Frameworks */, F8E6C4D71DCA3B7900F64426 /* Resources */, - 7055146ABE25F98BDC1A6400 /* [CP] Embed Pods Frameworks */, 84A4380625535BA5002571D4 /* Embed Frameworks */, 84F1E21825F0B70500A731AE /* Upload Sentry */, A91BBBFDFB91D0CBDAABCA4E /* [CP] Copy Pods Resources */, @@ -1587,26 +1586,11 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 7055146ABE25F98BDC1A6400 /* [CP] Embed Pods Frameworks */ = { + 84F1E21825F0B70500A731AE /* Upload Sentry */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); - inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-MultiCraft/Pods-MultiCraft-frameworks-${CONFIGURATION}-input-files.xcfilelist", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-MultiCraft/Pods-MultiCraft-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MultiCraft/Pods-MultiCraft-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - 84F1E21825F0B70500A731AE /* Upload Sentry */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; inputPaths = ( "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}", ); @@ -2006,7 +1990,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 144; + CURRENT_PROJECT_VERSION = 146; DEVELOPMENT_TEAM = R3RLJ9TW52; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -2040,7 +2024,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.21.0; + MARKETING_VERSION = 1.22.0; OTHER_CFLAGS = ( "$(inherited)", "-fvisibility=hidden", @@ -2072,7 +2056,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 144; + CURRENT_PROJECT_VERSION = 146; DEVELOPMENT_TEAM = R3RLJ9TW52; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -2107,7 +2091,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.21.0; + MARKETING_VERSION = 1.22.0; OTHER_CFLAGS = ( "$(inherited)", "-fvisibility=hidden", diff --git a/build/iOS/Podfile b/build/iOS/Podfile index d5a54c8b..efe99e64 100755 --- a/build/iOS/Podfile +++ b/build/iOS/Podfile @@ -1,10 +1,9 @@ project 'MultiCraft/MultiCraft.xcodeproj' platform :ios, '12.0' -use_frameworks! -install! 'cocoapods', :warn_for_multiple_pod_sources => false, :warn_for_unused_master_specs_repo => false +use_frameworks! :linkage => :static +inhibit_all_warnings! def appodeal -# source 'https://github.com/appodeal/CocoaPods.git' ver = '2.10.3.1' pod 'APDAdColonyAdapter', ver @@ -16,8 +15,6 @@ def appodeal end target 'MultiCraft' do -# source 'https://cdn.cocoapods.org/' - pod 'leveldb-library' pod 'libvorbis' @@ -34,7 +31,7 @@ post_install do |installer| config.build_settings['LLVM_LTO'] = 'YES' config.build_settings['ENABLE_BITCODE'] = 'NO' config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0' - config.build_settings['OTHER_CFLAGS'] = ['$(inherited)', '-fvisibility-inlines-hidden', '-fdata-sections', '-ffunction-sections', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables'] + config.build_settings['OTHER_CFLAGS'] = ['$(inherited)', '-fvisibility-inlines-hidden', '-fdata-sections', '-ffunction-sections'] config.build_settings['OTHER_CPLUSPLUSFLAGS'] = ['$(inherited)', '$(OTHER_CFLAGS)'] config.build_settings['OTHER_LDFLAGS'] = ['$(inherited)', '-Wl,-dead_strip'] end diff --git a/build/iOS/deps/freetype.sh b/build/iOS/deps/freetype.sh index 26a9fda4..06148a38 100755 --- a/build/iOS/deps/freetype.sh +++ b/build/iOS/deps/freetype.sh @@ -1,7 +1,7 @@ #!/bin/bash -e . sdk.sh -FREETYPE_VERSION=2.11.1 +FREETYPE_VERSION=2.12.1 if [ ! -d freetype-src ]; then wget http://download.savannah.gnu.org/releases/freetype/freetype-$FREETYPE_VERSION.tar.gz diff --git a/build/iOS/deps/openal.sh b/build/iOS/deps/openal.sh index 1638d91a..65a76f85 100755 --- a/build/iOS/deps/openal.sh +++ b/build/iOS/deps/openal.sh @@ -1,7 +1,7 @@ #!/bin/bash -e . sdk.sh -OPENAL_VERSION=1.21.1 +OPENAL_VERSION=1.22.0 if [ ! -d openal-src ]; then wget https://github.com/kcat/openal-soft/archive/$OPENAL_VERSION.tar.gz diff --git a/builtin/mainmenu/tab_credits.lua b/builtin/mainmenu/tab_credits.lua index 90da6d92..b696a0b5 100644 --- a/builtin/mainmenu/tab_credits.lua +++ b/builtin/mainmenu/tab_credits.lua @@ -18,7 +18,7 @@ -------------------------------------------------------------------------------- local multicraft_developers = { - "Maksim Gamarnik (MoNTE48) ", + "Maksim Gamarnik (MoNTE48) ", "Bektur Mambetov (ubulem) ", "Alexander Zavrin (Ransom.00)", "luk3yx", diff --git a/builtin/mainmenu/tab_settings_simple.lua b/builtin/mainmenu/tab_settings_simple.lua index 775efaf2..68f22891 100644 --- a/builtin/mainmenu/tab_settings_simple.lua +++ b/builtin/mainmenu/tab_settings_simple.lua @@ -48,6 +48,7 @@ local function formspec(tabview, name, tabdata) local range = tonumber(core.settings:get("viewing_range")) local sensitivity = tonumber(core.settings:get("mouse_sensitivity")) * 2000 local touchtarget = core.settings:get_bool("touchtarget") or false + local fancy_leaves = core.settings:get("leaves_style") == "fancy" local sound = tonumber(core.settings:get("sound_volume")) ~= 0 and true or false local tab_string = @@ -67,7 +68,7 @@ local function formspec(tabview, name, tabdata) "checkbox[0.25,2.3;cb_inventory_items_animations;" .. fgettext("Inv. animations") .. ";" .. dump(core.settings:get_bool("inventory_items_animations")) .. "]" .. "checkbox[0.25,2.9;cb_fancy_leaves;" .. fgettext("Fancy Leaves") .. ";" - .. dump(sound) .. "]" .. + .. dump(fancy_leaves) .. "]" .. "checkbox[0.25,3.5;cb_touchtarget;" .. fgettext("Touchtarget") .. ";" .. dump(touchtarget) .. "]" .. "checkbox[0.25,4.1;cb_sound;" .. fgettext("Sound") .. ";" @@ -178,7 +179,7 @@ local function handle_settings_buttons(this, fields, tabname, tabdata) end if fields["cb_fancy_leaves"] then core.settings:set("dd_leaves_style", fields["cb_fancy_leaves"] and "fancy" or "opaque") - ddhandled = true + return true end if fields["cb_touchtarget"] then core.settings:set("touchtarget", fields["cb_touchtarget"]) diff --git a/src/config.h b/src/config.h index 495b89d7..bd737be7 100644 --- a/src/config.h +++ b/src/config.h @@ -17,8 +17,8 @@ #define PROJECT_NAME_C "MultiCraft" #define STATIC_SHAREDIR "" #define VERSION_MAJOR 1 - #define VERSION_MINOR 21 - #define VERSION_PATCH 1 + #define VERSION_MINOR 22 + #define VERSION_PATCH 0 #define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH) #endif