Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iOS: v. 1.2.1-release

This commit is contained in:
MoNTE48 2019-06-08 17:49:19 +02:00
parent f1efc3ab70
commit f52aca6f90
5 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1534,12 +1534,11 @@
F8E6C4D11DCA3B7900F64426 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0800;
LastUpgradeCheck = 1020;
ORGANIZATIONNAME = MultiCraft;
TargetAttributes = {
F8E6C4D81DCA3B7900F64426 = {
CreatedOnToolsVersion = 8.0;
ProvisioningStyle = Automatic;
SystemCapabilities = {
com.apple.BackgroundModes = {
enabled = 1;
@ -1889,26 +1888,19 @@
F8E6C4EE1DCA3B7900F64426 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CLANG_ENABLE_OBJC_WEAK = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_FAST_MATH = YES;
GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
GCC_OPTIMIZATION_LEVEL = 3;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_UNROLL_LOOPS = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LLVM_LTO = YES;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
@ -1918,26 +1910,18 @@
F8E6C4EF1DCA3B7900F64426 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_SUSPICIOUS_MOVES = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
CLANG_ENABLE_OBJC_WEAK = YES;
ENABLE_BITCODE = NO;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_FAST_MATH = YES;
GCC_OPTIMIZATION_LEVEL = fast;
GCC_OPTIMIZATION_LEVEL = 3;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_UNROLL_LOOPS = YES;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LLVM_LTO = YES;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
@ -1949,6 +1933,7 @@
baseConfigurationReference = 32528F14AAB9EA0E9CAB8526 /* Pods-MultiCraft.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = R3RLJ9TW52;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
@ -2042,7 +2027,7 @@
baseConfigurationReference = 1E76DCA01B51A98F0CA4C480 /* Pods-MultiCraft.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
DEVELOPMENT_TEAM = R3RLJ9TW52;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",

2
build/iOS/MultiCraft/MultiCraft/Info.plist
View File

@ -21,7 +21,7 @@
<key>CFBundleShortVersionString</key>
<string>1.2.1</string>
<key>CFBundleVersion</key>
<string>49</string>
<string>51</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>

15
games/default/files/player_api/init.lua
View File

@ -94,6 +94,12 @@ end
-- Update appearance when the player joins
minetest.register_on_joinplayer(function(player)
-- Temporary solution to the problem of loading yaw 'nul' on iOS
if (player:get_look_horizontal() == 0) then
player:set_look_horizontal(0.01)
end
player_api.player_attached[player:get_player_name()] = false
player_api.set_model(player, "character.b3d")
player:set_local_animation(
@ -108,6 +114,15 @@ minetest.register_on_joinplayer(function(player)
player:hud_set_hotbar_selected_image("gui_hotbar_selected.png")
player:get_inventory():set_stack("hand", 1, "player_api:hand")
-- Temporary solution to the problem of loading yaw 'nul' on iOS
if PLATFORM == "iOS" then
minetest.after(5, function()
if (player:get_look_horizontal() == 0) then
minetest.request_shutdown()
end
end)
end
end)
-- Items for the new player

2
src/defaultsettings.cpp
View File

@ -424,6 +424,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("max_block_generate_distance", "3");
settings->setDefault("client_mapblock_limit", "250");
settings->setDefault("enable_3d_clouds", "false");
settings->setDefault("debug_log_level", "error");
settings->setDefault("cloud_radius", "6");
// set font_path
settings->setDefault("mono_font_path", "/system/fonts/DroidSansMono.ttf");
@ -450,6 +451,7 @@ void set_default_settings(Settings *settings)
#ifdef __IOS__
settings->setDefault("emergequeue_limit_diskonly", "16");
settings->setDefault("emergequeue_limit_generate", "16");
settings->setDefault("debug_log_level", "none");
// set font_path
settings->setDefault("mono_font_path", g_settings->get("font_path"));
settings->setDefault("fallback_font_path", g_settings->get("font_path"));

8
src/game.cpp
View File

@ -2206,13 +2206,7 @@ bool Game::connectToServer(const std::string &playername,
(client->getProtoVersion() == 0) &&
client->connectedToServer()) {
*error_message = "Connection failure: init packet not "
"recognized by server.\n"
"Most likely the server uses an old protocol version (<v25).\n"
"Please ask the server owner to update to 0.4.13 or later.\n"
"To still connect to the server in the meantime,\n"
"you can enable the 'send_pre_v25_init' setting by editing minetest.conf,\n"
"or by enabling the 'Client -> Network -> Support older Servers'\n"
"entry in the advanced settings menu.";
"recognized by server.";
} else {
*error_message = "Connection timed out.";
}