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

iOS: v. 1.1.26

This commit is contained in:
MoNTE48 2019-04-02 02:15:53 +02:00
parent e183a46be7
commit 046502b61e
9 changed files with 64 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,7 +298,7 @@
F84D3A941DE79AB400ADE1A0 /* ads.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = ads.mm; path = ../../Ads/ads.mm; sourceTree = "<group>"; };
F85119A61F4476FC00BFA9AF /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../deps/libcurl/lib/libcurl.a; sourceTree = "<group>"; };
F856B5C21F55F7EE00FE9494 /* bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = bg.png; path = ../../../../textures/base/bg.png; sourceTree = "<group>"; };
F85722881DDC74B700308383 /* libluajit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libluajit.a; path = ../deps/luajit/lib/libluajit.a; sourceTree = "<group>"; };
F85722881DDC74B700308383 /* libluajit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libluajit.a; path = ../Pods/LuaJITPod/lib/libluajit.a; sourceTree = "<group>"; };
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; };
@ -1455,35 +1455,40 @@
files = (
);
inputPaths = (
"${SRCROOT}/../Pods/Target Support Files/Pods-MultiCraft/Pods-MultiCraft-resources.sh",
"${PODS_ROOT}/Target Support Files/Pods-MultiCraft/Pods-MultiCraft-resources.sh",
"${PODS_ROOT}/Appodeal/APDStartAppAdapter.embeddedframework/Resources/StartApp.bundle",
"${PODS_ROOT}/Appodeal/APDTapjoyAdapter.embeddedframework/Resources/TapjoyResources.bundle",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/Resources/MPAdBrowserController.xib",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/Resources/MPCloseBtn.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/Resources/MPCloseBtn@2x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/Resources/MPCloseBtn@3x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/Resources/MPCloseButtonX.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/Resources/MPCloseButtonX@2x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/Resources/MPCloseButtonX@3x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/Resources/MPDAAIcon.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/Resources/MPDAAIcon@2x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/Resources/MPDAAIcon@3x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/Resources/MPMutedBtn.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/Resources/MPMutedBtn@2x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/Resources/MPMutedBtn@3x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/Resources/MPPlayBtn.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/Resources/MPPlayBtn@2x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/Resources/MPPlayBtn@3x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/Resources/MPUnmutedBtn.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/Resources/MPUnmutedBtn@2x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/Resources/MPUnmutedBtn@3x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/Resources/MRAID.bundle",
"${PODS_ROOT}/Appodeal/APDTapjoyAdapter.embeddedframework/Tapjoy.framework/Resources/en.lproj",
"${PODS_ROOT}/Appodeal/APDTapjoyAdapter.embeddedframework/Tapjoy.framework/Resources/TapjoyResources.bundle",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPAdapters.plist",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPAdBrowserController.xib",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPCloseBtn.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPCloseBtn@2x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPCloseBtn@3x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPCloseButtonX.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPCloseButtonX@2x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPCloseButtonX@3x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPCountdownTimer.html",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPDAAIcon.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPDAAIcon@2x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPDAAIcon@3x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPMutedBtn.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPMutedBtn@2x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPMutedBtn@3x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPPlayBtn.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPPlayBtn@2x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPPlayBtn@3x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPUnmutedBtn.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPUnmutedBtn@2x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MPUnmutedBtn@3x.png",
"${PODS_ROOT}/Appodeal/APDTwitterMoPubAdapter.embeddedframework/MoPubSDK.framework/Resources/MRAID.bundle",
"${PODS_CONFIGURATION_BUILD_DIR}/PersonalizedAdConsent/PersonalizedAdConsent.bundle",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/StartApp.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/en.lproj",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TapjoyResources.bundle",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPAdapters.plist",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPAdBrowserController.nib",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseBtn.png",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseBtn@2x.png",
@ -1491,6 +1496,7 @@
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseButtonX.png",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseButtonX@2x.png",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCloseButtonX@3x.png",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPCountdownTimer.html",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPDAAIcon.png",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPDAAIcon@2x.png",
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MPDAAIcon@3x.png",
@ -1508,7 +1514,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/../Pods/Target Support Files/Pods-MultiCraft/Pods-MultiCraft-resources.sh\"\n";
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-MultiCraft/Pods-MultiCraft-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
@ -1731,6 +1737,7 @@
isa = PBXVariantGroup;
children = (
F8E6C4E61DCA3B7900F64426 /* Base */,
84F65DD0226E3C9C0028D198 /* ru */,
);
name = Main.storyboard;
sourceTree = "<group>";
@ -1739,6 +1746,7 @@
isa = PBXVariantGroup;
children = (
F8E6C4EB1DCA3B7900F64426 /* Base */,
84F65DD1226E3C9D0028D198 /* ru */,
);
name = LaunchScreen.storyboard;
sourceTree = "<group>";
@ -1849,6 +1857,7 @@
baseConfigurationReference = 32528F14AAB9EA0E9CAB8526 /* Pods-MultiCraft.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CLANG_USE_OPTIMIZATION_PROFILE = NO;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
DEVELOPMENT_TEAM = R3RLJ9TW52;
@ -1880,7 +1889,7 @@
"${SRCROOT}/../deps/libvorbis/include",
"${SRCROOT}/../deps/leveldb/include",
"${SRCROOT}/../deps/freetype/include/freetype2",
"${SRCROOT}/../deps/luajit/include",
"${SRCROOT}/../Pods/LuaJITPod/include",
"${SRCROOT}/../deps/intl/include",
"${SRCROOT}/../deps/libcurl/include",
);
@ -1917,7 +1926,7 @@
"-L$(SRCROOT)/../deps/libvorbis/lib",
"-L${SRCROOT}/../deps/leveldb/lib",
"-L${SRCROOT}/../deps/freetype/lib",
"-L${SRCROOT}/../deps/luajit/lib",
"-L${SRCROOT}/../Pods/LuaJITPod/lib",
"-L${SRCROOT}/../deps/intl",
"-L${SRCROOT}/../deps/libcurl/lib",
"-Wl,-dead_strip",
@ -1934,6 +1943,7 @@
baseConfigurationReference = 1E76DCA01B51A98F0CA4C480 /* Pods-MultiCraft.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CLANG_USE_OPTIMIZATION_PROFILE = NO;
CLANG_WARN_DOCUMENTATION_COMMENTS = NO;
DEVELOPMENT_TEAM = R3RLJ9TW52;
@ -1966,7 +1976,7 @@
"${SRCROOT}/../deps/libvorbis/include",
"${SRCROOT}/../deps/leveldb/include",
"${SRCROOT}/../deps/freetype/include/freetype2",
"${SRCROOT}/../deps/luajit/include",
"${SRCROOT}/../Pods/LuaJITPod/include",
"${SRCROOT}/../deps/intl/include",
"${SRCROOT}/../deps/libcurl/include",
);
@ -2003,7 +2013,7 @@
"-L$(SRCROOT)/../deps/libvorbis/lib",
"-L${SRCROOT}/../deps/leveldb/lib",
"-L${SRCROOT}/../deps/freetype/lib",
"-L${SRCROOT}/../deps/luajit/lib",
"-L${SRCROOT}/../Pods/LuaJITPod/lib",
"-L${SRCROOT}/../deps/intl",
"-L${SRCROOT}/../deps/libcurl/lib",
"-Wl,-dead_strip",

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

@ -2,6 +2,8 @@
<!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>
@ -17,9 +19,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.1.25</string>
<string>1.1.26</string>
<key>CFBundleVersion</key>
<string>40</string>
<string>43</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>
@ -28,11 +30,11 @@
<true/>
</dict>
<key>NSCalendarsUsageDescription</key>
<string>Advertising</string>
<string>MultiCraft needs your calendar to provide personalised advertising experience tailored to you</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>MultiCraft needs your location to provide personalised advertising experience tailored to you</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Advertising</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>Advertising</string>
<string>MultiCraft needs your location to provide personalised advertising experience tailored to you</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>

14
build/iOS/Podfile
View File

@ -2,14 +2,10 @@ project 'MultiCraft/MultiCraft.xcodeproj'
platform :ios, '9.0'
target 'MultiCraft' do
source 'https://github.com/appodeal/CocoaPods.git'
source 'https://github.com/CocoaPods/Specs.git'
pod 'SSZipArchive'
pod 'SDVersion', :git => 'https://github.com/MoNTE48/SDVersion'
pod 'LuaJITPod', :git => 'https://github.com/MoNTE48/LuaJITPod'
pod 'SSZipArchive'
pod 'SDVersion', :git => 'https://github.com/skitudeiosdevelopers/SDVersion'
pod 'Appodeal/Core', '2.5.0-Beta'
pod 'Appodeal/Interstitial', '2.5.0-Beta'
pod 'Appodeal/Video', '2.5.0-Beta'
pod 'PersonalizedAdConsent', :git => 'https://github.com/MultiCraftProject/googleads-consent-sdk-ios'
pod 'Appodeal/Interstitial', '2.5.3-Beta'
pod 'PersonalizedAdConsent', :git => 'https://github.com/MultiCraftProject/googleads-consent-sdk-ios'
end

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

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

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

@ -3,7 +3,7 @@
. sdk.sh
[ ! -d irrlicht-src ] && \
svn co svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es irrlicht-src
svn co -r 5780 svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es irrlicht-src
cd irrlicht-src/

5
build/iOS/deps/libcurl.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash -e
. sdk.sh
CURL_VERSION=7.64.0
CURL_VERSION=7.64.1
if [ ! -d libcurl-src ]; then
wget https://curl.haxx.se/download/curl-$CURL_VERSION.tar.gz
@ -20,8 +20,7 @@ for x in arm64 armv7; do
--disable-debug --disable-verbose --disable-dependency-tracking --disable-ftp \
--disable-ldap --disable-ldaps --disable-rtsp --disable-proxy --disable-dict \
--disable-telnet --disable-tftp --disable-pop3 --disable-imap --disable-smtp \
--disable-gopher --disable-sspi --disable-manual --disable-zlib --without-zlib \
--with-darwinssl
--disable-gopher --disable-sspi --disable-manual --with-darwinssl
make -j$(sysctl -n hw.ncpu)
cp -f lib/.libs/libcurl.a templib_$x.a
done

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

@ -5,7 +5,7 @@
./libvorbis.sh
./leveldb.sh
./freetype.sh
./luajit.sh
#./luajit.sh
./intl.sh
./libcurl.sh

15
src/defaultsettings.cpp
View File

@ -130,8 +130,8 @@ void set_default_settings(Settings *settings)
settings->setDefault("pause_fps_max", "10");
settings->setDefault("viewing_range", "100");
settings->setDefault("near_plane", "0.1");
settings->setDefault("screenW", "800");
settings->setDefault("screenH", "600");
settings->setDefault("screen_w", "800");
settings->setDefault("screen_h", "600");
settings->setDefault("autosave_screensize", "true");
settings->setDefault("fullscreen", "false");
settings->setDefault("fullscreen_bpp", "24");
@ -373,11 +373,11 @@ void set_default_settings(Settings *settings)
// Mobile Platform
#if defined(__ANDROID__) || defined(__IOS__)
settings->setDefault("screenW", "0");
settings->setDefault("screenH", "0");
settings->setDefault("screen_w", "0");
settings->setDefault("screen_h", "0");
settings->setDefault("fullscreen", "true");
settings->setDefault("fps_max", "35");
settings->setDefault("enable_shaders", "false");
settings->setDefault("fullscreen", "true");
settings->setDefault("video_driver", "ogles1");
settings->setDefault("touchtarget", "true");
settings->setDefault("touchscreen_threshold", "20");
@ -411,7 +411,7 @@ void set_default_settings(Settings *settings)
// check screen size
float x_inches = ((double) porting::getDisplaySize().X /
(160 * porting::getDisplayDensity()));
(160 * porting::getDisplayDensity()));
if (x_inches <= 3.7) {
// small 4" phones
settings->setDefault("hud_scaling", "0.5");
@ -455,7 +455,7 @@ void set_default_settings(Settings *settings)
// 4" (iPhone 5)
settings->setDefault("hud_scaling", "0.5");
settings->setDefault("gui_scaling", "1.1");
settings->setDefault("mouse_sensitivity", "0.23");
settings->setDefault("mouse_sensitivity", "0.24");
} else if ([SDVersion deviceSize] == Screen4Dot7inch) {
// 4.7" (iPhone)
settings->setDefault("hud_scaling", "0.6");
@ -503,7 +503,6 @@ void set_default_settings(Settings *settings)
settings->setDefault("active_block_range", "1");
settings->setDefault("max_block_generate_distance", "3");
} else {
/*} else if (([SDVersion deviceVersion] == iPhone8) || ([SDVersion deviceVersion] == iPhone8Plus) || ([SDVersion deviceVersion] == iPhoneX) || ([SDVersion deviceVersion] == iPadPro9Dot7Inch) || ()([SDVersion deviceVersion] == iPadPro12Dot9Inch) || ([SDVersion deviceVersion] == iPadPro10Dot5Inch) || ([SDVersion deviceVersion] == iPadAir2) || ([SDVersion deviceVersion] == iPad5)|| ([SDVersion deviceVersion] == iPad6)) {*/
// high settings
settings->setDefault("viewing_range", "75");
settings->setDefault("client_mapblock_limit", "1000");

2
src/filesys.cpp
View File

@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "log.h"
#include "config.h"
#include "porting.h"
#ifdef __ANDROID__
#if defined(__ANDROID__) || defined(__IOS__)
#include "settings.h" // For g_settings
#endif