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

Fix fly on mobile platform, update iOS

master
MoNTE48 2019-05-10 22:33:16 +02:00 committed by Maksim
parent 2cee766ff6
commit 6dcc8a9f80
20 changed files with 143 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@
4B35A9F11EEE014F00274961 /* l_storage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B35A9EF1EEE014F00274961 /* l_storage.cpp */; };
4B35A9F41EEE017000274961 /* scripting_client.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B35A9F21EEE017000274961 /* scripting_client.cpp */; };
4B35A9F71EEE018D00274961 /* scripting_server.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4B35A9F51EEE018D00274961 /* scripting_server.cpp */; };
844B495F228606B200EB60EF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 844B495D228606B200EB60EF /* Main.storyboard */; };
849C4F86209656D3005EB041 /* ru.lproj in Resources */ = {isa = PBXBuildFile; fileRef = 849C4F85209656D2005EB041 /* ru.lproj */; };
EB4367AE23CAD13A43ADF4B1 /* libPods-MultiCraft.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8758CE009FCB7E91F4C84C28 /* libPods-MultiCraft.a */; };
F810D7052080E48100D109B8 /* en.lproj in Resources */ = {isa = PBXBuildFile; fileRef = F810D7042080E48000D109B8 /* en.lproj */; };
@ -44,7 +45,6 @@
F856B5C31F55F7EE00FE9494 /* bg.png in Resources */ = {isa = PBXBuildFile; fileRef = F856B5C21F55F7EE00FE9494 /* bg.png */; };
F85722891DDC74B700308383 /* libluajit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F85722881DDC74B700308383 /* libluajit.a */; };
F87DC8BA210887C700393B64 /* mapgen_v7p.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F87DC8B9210887C700393B64 /* mapgen_v7p.cpp */; };
F8E6C4E71DCA3B7900F64426 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F8E6C4E51DCA3B7900F64426 /* Main.storyboard */; };
F8E6C4E91DCA3B7900F64426 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F8E6C4E81DCA3B7900F64426 /* Assets.xcassets */; };
F8E6C4EC1DCA3B7900F64426 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F8E6C4EA1DCA3B7900F64426 /* LaunchScreen.storyboard */; };
F8E6C4F51DCA3EA400F64426 /* ioswrap.m in Sources */ = {isa = PBXBuildFile; fileRef = F8E6C4F41DCA3EA400F64426 /* ioswrap.m */; };
@ -290,6 +290,7 @@
4B35A9F31EEE017000274961 /* scripting_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scripting_client.h; path = ../../../../src/script/scripting_client.h; sourceTree = "<group>"; };
4B35A9F51EEE018D00274961 /* scripting_server.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = scripting_server.cpp; path = ../../../../src/script/scripting_server.cpp; sourceTree = "<group>"; };
4B35A9F61EEE018D00274961 /* scripting_server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = scripting_server.h; path = ../../../../src/script/scripting_server.h; sourceTree = "<group>"; };
844B495E228606B200EB60EF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
849C4F85209656D2005EB041 /* ru.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ru.lproj; sourceTree = "<group>"; };
8758CE009FCB7E91F4C84C28 /* libPods-MultiCraft.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MultiCraft.a"; sourceTree = BUILT_PRODUCTS_DIR; };
F810D7042080E48000D109B8 /* en.lproj */ = {isa = PBXFileReference; lastKnownFileType = folder; path = en.lproj; sourceTree = "<group>"; };
@ -302,7 +303,6 @@
F87DC8B8210887C600393B64 /* mapgen_v7p.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mapgen_v7p.h; path = ../../../../src/mapgen_v7p.h; sourceTree = "<group>"; };
F87DC8B9210887C700393B64 /* mapgen_v7p.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = mapgen_v7p.cpp; path = ../../../../src/mapgen_v7p.cpp; sourceTree = "<group>"; };
F8E6C4D91DCA3B7900F64426 /* MultiCraft.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MultiCraft.app; sourceTree = BUILT_PRODUCTS_DIR; };
F8E6C4E61DCA3B7900F64426 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
F8E6C4E81DCA3B7900F64426 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
F8E6C4EB1DCA3B7900F64426 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
F8E6C4ED1DCA3B7900F64426 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@ -788,8 +788,8 @@
children = (
849C4F85209656D2005EB041 /* ru.lproj */,
F810D7042080E48000D109B8 /* en.lproj */,
F8E6C4E51DCA3B7900F64426 /* Main.storyboard */,
F8E6C4E81DCA3B7900F64426 /* Assets.xcassets */,
844B495D228606B200EB60EF /* Main.storyboard */,
F8E6C4EA1DCA3B7900F64426 /* LaunchScreen.storyboard */,
F8E6C4ED1DCA3B7900F64426 /* Info.plist */,
F8E6C4DC1DCA3B7900F64426 /* Supporting Files */,
@ -1391,6 +1391,11 @@
F8E6C4D81DCA3B7900F64426 = {
CreatedOnToolsVersion = 8.0;
ProvisioningStyle = Automatic;
SystemCapabilities = {
com.apple.BackgroundModes = {
enabled = 1;
};
};
};
};
};
@ -1420,9 +1425,9 @@
F810D7052080E48100D109B8 /* en.lproj in Resources */,
F8E6C4EC1DCA3B7900F64426 /* LaunchScreen.storyboard in Resources */,
F8E6C4E91DCA3B7900F64426 /* Assets.xcassets in Resources */,
844B495F228606B200EB60EF /* Main.storyboard in Resources */,
F8E6C7E11DCA4EB300F64426 /* assets.zip in Resources */,
849C4F86209656D3005EB041 /* ru.lproj in Resources */,
F8E6C4E71DCA3B7900F64426 /* Main.storyboard in Resources */,
F8E6C7E31DCA511700F64426 /* worlds.zip in Resources */,
F856B5C31F55F7EE00FE9494 /* bg.png in Resources */,
);
@ -1733,11 +1738,10 @@
/* End PBXSourcesBuildPhase section */
/* Begin PBXVariantGroup section */
F8E6C4E51DCA3B7900F64426 /* Main.storyboard */ = {
844B495D228606B200EB60EF /* Main.storyboard */ = {
isa = PBXVariantGroup;
children = (
F8E6C4E61DCA3B7900F64426 /* Base */,
84F65DD0226E3C9C0028D198 /* ru */,
844B495E228606B200EB60EF /* Base */,
);
name = Main.storyboard;
sourceTree = "<group>";
@ -1746,7 +1750,6 @@
isa = PBXVariantGroup;
children = (
F8E6C4EB1DCA3B7900F64426 /* Base */,
84F65DD1226E3C9D0028D198 /* ru */,
);
name = LaunchScreen.storyboard;
sourceTree = "<group>";
@ -1860,6 +1863,8 @@
CLANG_ENABLE_MODULES = YES;
CLANG_USE_OPTIMIZATION_PROFILE = NO;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = R3RLJ9TW52;
ENABLE_BITCODE = NO;
GCC_PREPROCESSOR_DEFINITIONS = (
@ -1907,18 +1912,12 @@
"\"${PODS_ROOT}/Headers/Public/SDVersion\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/SSZipArchive\"",
"-flto",
"-fvisibility=hidden",
"-fdata-sections",
"-ffunction-sections",
);
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-flto",
"-flto=thin",
"-fvisibility=hidden",
"-fdata-sections",
"-ffunction-sections",
);
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
OTHER_LDFLAGS = (
"$(inherited)",
"-L${SRCROOT}/../deps/irrlicht",
@ -1946,6 +1945,8 @@
CLANG_ENABLE_MODULES = YES;
CLANG_USE_OPTIMIZATION_PROFILE = NO;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
COPY_PHASE_STRIP = YES;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = R3RLJ9TW52;
ENABLE_BITCODE = NO;
GCC_PREPROCESSOR_DEFINITIONS = (
@ -1994,18 +1995,12 @@
"\"${PODS_ROOT}/Headers/Public/SDVersion\"",
"-isystem",
"\"${PODS_ROOT}/Headers/Public/SSZipArchive\"",
"-flto",
"-fvisibility=hidden",
"-fdata-sections",
"-ffunction-sections",
);
OTHER_CPLUSPLUSFLAGS = (
"$(OTHER_CFLAGS)",
"-flto",
"-flto=thin",
"-fvisibility=hidden",
"-fdata-sections",
"-ffunction-sections",
);
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
OTHER_LDFLAGS = (
"$(inherited)",
"-L${SRCROOT}/../deps/irrlicht",

BIN
build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-120.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 24 KiB

BIN
build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-152.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 35 KiB

BIN
build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-167.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 52 KiB

After

Width:  |  Height:  |  Size: 40 KiB

BIN
build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-180.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 45 KiB

BIN
build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-76.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppStore.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 558 KiB

After

Width:  |  Height:  |  Size: 369 KiB

9
build/iOS/MultiCraft/MultiCraft/Base.lproj/Main.storyboard
View File

@ -1,15 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="tne-QT-ifu">
<objects>
<viewController id="BYZ-38-t0r" customClass="ViewController" sceneMemberID="viewController">
<viewController id="BYZ-38-t0r" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
<viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>

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

@ -2,14 +2,14 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
<string></string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
<string>MultiCraft</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleGetInfoString</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
@ -19,9 +19,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.1.26</string>
<string>1.2.10</string>
<key>CFBundleVersion</key>
<string>43</string>
<string>44</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
@ -35,6 +35,10 @@
<string>MultiCraft needs your location to provide personalised advertising experience tailored to you</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>MultiCraft needs your location to provide personalised advertising experience tailored to you</string>
<key>UIBackgroundModes</key>
<array>
<string>fetch</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>

3
build/iOS/Podfile
View File

@ -2,6 +2,9 @@ project 'MultiCraft/MultiCraft.xcodeproj'
platform :ios, '9.0'
target 'MultiCraft' do
source 'https://github.com/CocoaPods/Specs.git'
source 'https://github.com/appodeal/CocoaPods.git'
pod 'SSZipArchive'
pod 'SDVersion', :git => 'https://github.com/MoNTE48/SDVersion'
pod 'LuaJITPod', :git => 'https://github.com/MoNTE48/LuaJITPod'

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

@ -8,7 +8,7 @@
cd irrlicht-src/
if [ ! -f .patched ]; then
for p in touchcount unscaled dblfreefix viewcontroller headerpath roundingerror hideindicator; do
for p in touchcount unscaled dblfreefix viewcontroller proj roundingerror hideindicator; do
patch -p0 <../../patches/irrlicht-$p.patch
done
touch .patched

4
build/iOS/deps/sdk.sh
View File

@ -7,5 +7,5 @@ osver=9.0
export IOS_COMPILER=$(xcrun --sdk $sdk --find clang)
export IOS_CC=$IOS_COMPILER
export IOS_CXX=$IOS_COMPILER
export IOS_FLAGS="-isysroot $(xcrun --sdk $sdk --show-sdk-path) -arch armv7 -arch armv7s -arch arm64 -arch arm64e -miphoneos-version-min=$osver -fvisibility=hidden -fdata-sections -ffunction-sections -fvisibility=hidden -flto -Ofast"
export IOS_FLAGS_LUA="-isysroot $(xcrun --sdk $sdk --show-sdk-path) -arch armv7 -arch arm64 -miphoneos-version-min=$osver -fvisibility=hidden -fdata-sections -ffunction-sections -fvisibility=hidden -flto -Ofast"
export IOS_FLAGS="-isysroot $(xcrun --sdk $sdk --show-sdk-path) -arch armv7 -arch armv7s -arch arm64 -arch arm64e -miphoneos-version-min=$osver -fvisibility=hidden -fdata-sections -ffunction-sections -Ofast"
export IOS_FLAGS_LUA="-isysroot $(xcrun --sdk $sdk --show-sdk-path) -arch armv7 -arch arm64 -miphoneos-version-min=$osver -fvisibility=hidden -fdata-sections -ffunction-sections -Ofast"

BIN
build/iOS/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 230 KiB

18
build/iOS/patches/irrlicht-headerpath.patch
View File

@ -1,18 +0,0 @@
--- source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj.orig 2018-04-17 12:20:00.000000000 +0200
+++ source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj 2018-04-17 12:36:00.000000000 +0200
@@ -3311,6 +3319,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ HEADER_SEARCH_PATHS = "${SRCROOT}/../../include";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
@@ -3345,6 +3354,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ HEADER_SEARCH_PATHS = "${SRCROOT}/../../include";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_MODULE_NAME = Irrlicht;

82
build/iOS/patches/irrlicht-proj.patch Normal file
View File

@ -0,0 +1,82 @@
--- source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj.orig 2019-05-10 17:15:20.000000000 +0200
+++ source/Irrlicht/Irrlicht.xcodeproj/project.pbxproj 2019-05-10 17:27:43.000000000 +0200
@@ -3222,6 +3222,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@@ -3257,6 +3258,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = NO;
+ CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@@ -3289,6 +3291,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_USE_OPTIMIZATION_PROFILE = NO;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@@ -3304,6 +3307,7 @@
ENABLE_STRICT_OBJC_MSGSEND = YES;
EXECUTABLE_PREFIX = lib;
GCC_DYNAMIC_NO_PIC = NO;
+ GCC_FAST_MATH = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
@@ -3311,12 +3315,14 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ HEADER_SEARCH_PATHS = "${SRCROOT}/../../include";
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_MODULE_NAME = Irrlicht;
PRODUCT_NAME = Irrlicht;
SDKROOT = iphoneos;
+ STRIP_STYLE = "non-global";
};
name = Debug;
};
@@ -3324,6 +3330,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ CLANG_USE_OPTIMIZATION_PROFILE = NO;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@@ -3340,16 +3347,22 @@
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
EXECUTABLE_PREFIX = lib;
+ GCC_FAST_MATH = YES;
+ GCC_OPTIMIZATION_LEVEL = fast;
+ GCC_SYMBOLS_PRIVATE_EXTERN = YES;
+ GCC_UNROLL_LOOPS = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+ HEADER_SEARCH_PATHS = "${SRCROOT}/../../include";
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_MODULE_NAME = Irrlicht;
PRODUCT_NAME = Irrlicht;
SDKROOT = iphoneos;
+ STRIP_STYLE = "non-global";
};
name = Release;
};

2
src/client.cpp
View File

@ -772,6 +772,7 @@ void Client::initLocalMapSaving(const Address &address,
return;
}
#ifdef _WIN32
const std::string world_path = porting::path_user
+ DIR_DELIM + "worlds"
+ DIR_DELIM + "server_"
@ -782,6 +783,7 @@ void Client::initLocalMapSaving(const Address &address,
m_localdb = new MapDatabaseSQLite3(world_path);
m_localdb->beginSave();
actionstream << "Local map saving started, map will be saved at '" << world_path << "'" << std::endl;
#endif
}
void Client::ReceiveAll()

4
src/client/inputhandler.cpp
View File

@ -23,7 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "mainmenumanager.h"
#ifdef __IOS__
extern void external_exit_game();
extern void external_pause_game();
#endif
bool MyEventReceiver::OnEvent(const SEvent &event)
@ -65,7 +65,7 @@ bool MyEventReceiver::OnEvent(const SEvent &event)
#ifdef __IOS__
if (event.EventType == irr::EET_APPLICATION_EVENT) {
if (event.ApplicationEvent.EventType == irr::EAET_WILL_PAUSE)
external_exit_game();
external_pause_game();
return true;
}

2
src/defaultsettings.cpp
View File

@ -469,7 +469,7 @@ void set_default_settings(Settings *settings)
} else if (([SDVersion deviceSize] == Screen5Dot8inch) || ([SDVersion deviceSize] == Screen6Dot1inch) || ([SDVersion deviceSize] == Screen6Dot5inch)) {
// 5.8+" (iPhone X-series)
settings->setDefault("hud_scaling", "0.8");
settings->setDefault("gui_scaling", "1.2");
settings->setDefault("gui_scaling", "1.3");
settings->setDefault("mouse_sensitivity", "0.35");
} else {
// iPad

25
src/game.cpp
View File

@ -2770,10 +2770,22 @@ void Game::toggleFreeMoveAlt()
{
bool free_move = !g_settings->getBool("free_move");
bool creative = !g_settings->getBool("creative_mode");
if (m_cache_doubletap_jump && runData.jump_timer < 0.15f)
if (!free_move || !creative)
toggleFreeMove();
if (simple_singleplayer_mode) {
if (m_cache_doubletap_jump && runData.jump_timer < 0.15f) {
if (!free_move || !creative)
toggleFreeMove();
}
} else {
if (client->checkPrivilege("fly") && runData.jump_timer < 0.15f) {
#if defined(__ANDROID__) || defined(__IOS__)
toggleFreeMove();
#else
if (m_cache_doubletap_jump)
toggleFreeMove();
#endif
}
}
runData.reset_jump_timer = true;
}
@ -4895,13 +4907,6 @@ void external_pause_game()
g_game->pauseGame();
}
void external_exit_game()
{
if (!g_game)
return;
g_gamecallback->disconnect();
}
void external_statustext(const char *text, float duration)
{
if (!g_game)

4
src/sky.cpp
View File

@ -560,12 +560,12 @@ void Sky::update(float time_of_day, float time_brightness,
video::SColorf cloudcolor_bright_dawn_f(1.0, 0.7, 0.5);
*/
video::SColorf bgcolor_bright_normal_f = video::SColor(255, 2, 145, 255);
video::SColorf bgcolor_bright_normal_f = video::SColor(255, 5, 155, 245);
video::SColorf bgcolor_bright_indoor_f = video::SColor(255, 100, 100, 100);
video::SColorf bgcolor_bright_dawn_f = video::SColor(255, 180, 186, 255);
video::SColorf bgcolor_bright_night_f = video::SColor(255, 64, 144, 255);
video::SColorf skycolor_bright_normal_f = video::SColor(255, 2, 145, 255);
video::SColorf skycolor_bright_normal_f = video::SColor(255, 5, 155, 245);
video::SColorf skycolor_bright_dawn_f = video::SColor(255, 180, 186, 255);
video::SColorf skycolor_bright_night_f = video::SColor(255, 0, 107, 255);