MultiCraftProject/MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Final commit

Browse Source
This commit is contained in:
Maksim 2022-05-12 15:33:14 +03:00
parent 9a5bb1eb32
commit ee75dd125b
8 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -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/) [![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 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). 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] <MoNTE48@mail.ua> & MultiCraft Development Team. Copyright © 2014-2022 Maksim Gamarnik [MoNTE48] <Maksym48@pm.me> & 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. The engine and the game is licensed under LGPLv3 (or higher). Resources games licensed under CC BY-SA 4.0, unless otherwise stated.

30
build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj
View File

@ -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; }; 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 = "<group>"; }; 84B9C11524A4D82400016BCE /* ConsentAlertViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConsentAlertViewController.swift; sourceTree = "<group>"; };
84B9C11624A4D82400016BCE /* ConsentAlertViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ConsentAlertViewController.xib; sourceTree = "<group>"; }; 84B9C11624A4D82400016BCE /* ConsentAlertViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ConsentAlertViewController.xib; sourceTree = "<group>"; };
84BA9DE727C5569D004FAF40 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/InfoPlist.strings; sourceTree = "<group>"; };
84BA9DE827C5569D004FAF40 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Localizable.strings; sourceTree = "<group>"; };
84C32A3824AF7DDE00445E92 /* UITextViewPlaceholder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITextViewPlaceholder.swift; sourceTree = "<group>"; }; 84C32A3824AF7DDE00445E92 /* UITextViewPlaceholder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITextViewPlaceholder.swift; sourceTree = "<group>"; };
84C67B1D25D5E06B002E2735 /* AppTrackingTransparency.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppTrackingTransparency.framework; path = System/Library/Frameworks/AppTrackingTransparency.framework; sourceTree = SDKROOT; }; 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 = "<group>"; }; 84CD4A55248781420019B81D /* Bridge-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Bridge-Header.h"; sourceTree = "<group>"; };
@ -346,7 +348,6 @@
84E95CAB27AFE158003253C8 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 84E95CAB27AFE158003253C8 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/InfoPlist.strings; sourceTree = "<group>"; };
84E95CAC27AFE167003253C8 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 84E95CAC27AFE167003253C8 /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/InfoPlist.strings; sourceTree = "<group>"; };
84E95CAD27AFE171003253C8 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 84E95CAD27AFE171003253C8 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
84BA9DE727C5569D004FAF40 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/InfoPlist.strings; sourceTree = "<group>"; };
84E95CAF27AFE1B1003253C8 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 84E95CAF27AFE1B1003253C8 /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/InfoPlist.strings; sourceTree = "<group>"; };
84E95CB027AFE1D8003253C8 /* et */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = et; path = et.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 84E95CB027AFE1D8003253C8 /* et */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = et; path = et.lproj/InfoPlist.strings; sourceTree = "<group>"; };
84E95CB127AFE1F8003253C8 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 84E95CB127AFE1F8003253C8 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@ -370,7 +371,6 @@
84E95D0827AFEA5F003253C8 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/Localizable.strings; sourceTree = "<group>"; }; 84E95D0827AFEA5F003253C8 /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/Localizable.strings; sourceTree = "<group>"; };
84E95D0927AFEA60003253C8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; }; 84E95D0927AFEA60003253C8 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = "<group>"; };
84E95D0A27AFEA61003253C8 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; }; 84E95D0A27AFEA61003253C8 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
84BA9DE827C5569D004FAF40 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Localizable.strings; sourceTree = "<group>"; };
84E95D0C27AFEA62003253C8 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Localizable.strings; sourceTree = "<group>"; }; 84E95D0C27AFEA62003253C8 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Localizable.strings; sourceTree = "<group>"; };
84E95D0D27AFEA62003253C8 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; }; 84E95D0D27AFEA62003253C8 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/Localizable.strings; sourceTree = "<group>"; };
84E95D0F27AFEA63003253C8 /* lv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lv; path = lv.lproj/Localizable.strings; sourceTree = "<group>"; }; 84E95D0F27AFEA63003253C8 /* lv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = lv; path = lv.lproj/Localizable.strings; sourceTree = "<group>"; };
@ -1487,7 +1487,6 @@
F8E6C4D51DCA3B7900F64426 /* Sources */, F8E6C4D51DCA3B7900F64426 /* Sources */,
F8E6C4D61DCA3B7900F64426 /* Frameworks */, F8E6C4D61DCA3B7900F64426 /* Frameworks */,
F8E6C4D71DCA3B7900F64426 /* Resources */, F8E6C4D71DCA3B7900F64426 /* Resources */,
7055146ABE25F98BDC1A6400 /* [CP] Embed Pods Frameworks */,
84A4380625535BA5002571D4 /* Embed Frameworks */, 84A4380625535BA5002571D4 /* Embed Frameworks */,
84F1E21825F0B70500A731AE /* Upload Sentry */, 84F1E21825F0B70500A731AE /* Upload Sentry */,
A91BBBFDFB91D0CBDAABCA4E /* [CP] Copy Pods Resources */, A91BBBFDFB91D0CBDAABCA4E /* [CP] Copy Pods Resources */,
@ -1587,26 +1586,11 @@
/* End PBXResourcesBuildPhase section */ /* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */
7055146ABE25F98BDC1A6400 /* [CP] Embed Pods Frameworks */ = { 84F1E21825F0B70500A731AE /* Upload Sentry */ = {
isa = PBXShellScriptBuildPhase; isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( 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 = ( inputPaths = (
"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}", "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}",
); );
@ -2006,7 +1990,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 144; CURRENT_PROJECT_VERSION = 146;
DEVELOPMENT_TEAM = R3RLJ9TW52; DEVELOPMENT_TEAM = R3RLJ9TW52;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)", "$(inherited)",
@ -2040,7 +2024,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.21.0; MARKETING_VERSION = 1.22.0;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"$(inherited)", "$(inherited)",
"-fvisibility=hidden", "-fvisibility=hidden",
@ -2072,7 +2056,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 144; CURRENT_PROJECT_VERSION = 146;
DEVELOPMENT_TEAM = R3RLJ9TW52; DEVELOPMENT_TEAM = R3RLJ9TW52;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)", "$(inherited)",
@ -2107,7 +2091,7 @@
"$(inherited)", "$(inherited)",
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
MARKETING_VERSION = 1.21.0; MARKETING_VERSION = 1.22.0;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"$(inherited)", "$(inherited)",
"-fvisibility=hidden", "-fvisibility=hidden",

9
build/iOS/Podfile
View File

@ -1,10 +1,9 @@
project 'MultiCraft/MultiCraft.xcodeproj' project 'MultiCraft/MultiCraft.xcodeproj'
platform :ios, '12.0' platform :ios, '12.0'
use_frameworks! use_frameworks! :linkage => :static
install! 'cocoapods', :warn_for_multiple_pod_sources => false, :warn_for_unused_master_specs_repo => false inhibit_all_warnings!
def appodeal def appodeal
# source 'https://github.com/appodeal/CocoaPods.git'
ver = '2.10.3.1' ver = '2.10.3.1'
pod 'APDAdColonyAdapter', ver pod 'APDAdColonyAdapter', ver
@ -16,8 +15,6 @@ def appodeal
end end
target 'MultiCraft' do target 'MultiCraft' do
# source 'https://cdn.cocoapods.org/'
pod 'leveldb-library' pod 'leveldb-library'
pod 'libvorbis' pod 'libvorbis'
@ -34,7 +31,7 @@ post_install do |installer|
config.build_settings['LLVM_LTO'] = 'YES' config.build_settings['LLVM_LTO'] = 'YES'
config.build_settings['ENABLE_BITCODE'] = 'NO' config.build_settings['ENABLE_BITCODE'] = 'NO'
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0' 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_CPLUSPLUSFLAGS'] = ['$(inherited)', '$(OTHER_CFLAGS)']
config.build_settings['OTHER_LDFLAGS'] = ['$(inherited)', '-Wl,-dead_strip'] config.build_settings['OTHER_LDFLAGS'] = ['$(inherited)', '-Wl,-dead_strip']
end end

2
build/iOS/deps/freetype.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash -e #!/bin/bash -e
. sdk.sh . sdk.sh
FREETYPE_VERSION=2.11.1 FREETYPE_VERSION=2.12.1
if [ ! -d freetype-src ]; then if [ ! -d freetype-src ]; then
wget http://download.savannah.gnu.org/releases/freetype/freetype-$FREETYPE_VERSION.tar.gz wget http://download.savannah.gnu.org/releases/freetype/freetype-$FREETYPE_VERSION.tar.gz

2
build/iOS/deps/openal.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash -e #!/bin/bash -e
. sdk.sh . sdk.sh
OPENAL_VERSION=1.21.1 OPENAL_VERSION=1.22.0
if [ ! -d openal-src ]; then if [ ! -d openal-src ]; then
wget https://github.com/kcat/openal-soft/archive/$OPENAL_VERSION.tar.gz wget https://github.com/kcat/openal-soft/archive/$OPENAL_VERSION.tar.gz

2
builtin/mainmenu/tab_credits.lua
View File

@ -18,7 +18,7 @@
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
local multicraft_developers = { local multicraft_developers = {
"Maksim Gamarnik (MoNTE48) <MoNTE48@mail.ua>", "Maksim Gamarnik (MoNTE48) <Maksym48@pm.me>",
"Bektur Mambetov (ubulem) <berkut87@gmail.com>", "Bektur Mambetov (ubulem) <berkut87@gmail.com>",
"Alexander Zavrin (Ransom.00)", "Alexander Zavrin (Ransom.00)",
"luk3yx", "luk3yx",

5
builtin/mainmenu/tab_settings_simple.lua
View File

@ -48,6 +48,7 @@ local function formspec(tabview, name, tabdata)
local range = tonumber(core.settings:get("viewing_range")) local range = tonumber(core.settings:get("viewing_range"))
local sensitivity = tonumber(core.settings:get("mouse_sensitivity")) * 2000 local sensitivity = tonumber(core.settings:get("mouse_sensitivity")) * 2000
local touchtarget = core.settings:get_bool("touchtarget") or false 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 sound = tonumber(core.settings:get("sound_volume")) ~= 0 and true or false
local tab_string = 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") .. ";" "checkbox[0.25,2.3;cb_inventory_items_animations;" .. fgettext("Inv. animations") .. ";"
.. dump(core.settings:get_bool("inventory_items_animations")) .. "]" .. .. dump(core.settings:get_bool("inventory_items_animations")) .. "]" ..
"checkbox[0.25,2.9;cb_fancy_leaves;" .. fgettext("Fancy Leaves") .. ";" "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") .. ";" "checkbox[0.25,3.5;cb_touchtarget;" .. fgettext("Touchtarget") .. ";"
.. dump(touchtarget) .. "]" .. .. dump(touchtarget) .. "]" ..
"checkbox[0.25,4.1;cb_sound;" .. fgettext("Sound") .. ";" "checkbox[0.25,4.1;cb_sound;" .. fgettext("Sound") .. ";"
@ -178,7 +179,7 @@ local function handle_settings_buttons(this, fields, tabname, tabdata)
end end
if fields["cb_fancy_leaves"] then if fields["cb_fancy_leaves"] then
core.settings:set("dd_leaves_style", fields["cb_fancy_leaves"] and "fancy" or "opaque") core.settings:set("dd_leaves_style", fields["cb_fancy_leaves"] and "fancy" or "opaque")
ddhandled = true return true
end end
if fields["cb_touchtarget"] then if fields["cb_touchtarget"] then
core.settings:set("touchtarget", fields["cb_touchtarget"]) core.settings:set("touchtarget", fields["cb_touchtarget"])

4
src/config.h
View File

@ -17,8 +17,8 @@
#define PROJECT_NAME_C "MultiCraft" #define PROJECT_NAME_C "MultiCraft"
#define STATIC_SHAREDIR "" #define STATIC_SHAREDIR ""
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 21 #define VERSION_MINOR 22
#define VERSION_PATCH 1 #define VERSION_PATCH 0
#define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH) #define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH)
#endif #endif