diff --git a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj
index 74a4fb0e..86791b13 100644
--- a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj
+++ b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj
@@ -1840,6 +1840,7 @@
STRIP_PNG_TEXT = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
+ VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Debug;
};
@@ -1872,6 +1873,7 @@
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
+ VALIDATE_WORKSPACE_SKIPPED_SDK_FRAMEWORKS = OpenGLES;
};
name = Release;
};
@@ -1881,7 +1883,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
- CURRENT_PROJECT_VERSION = 137;
+ CURRENT_PROJECT_VERSION = 138;
DEVELOPMENT_TEAM = R3RLJ9TW52;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
@@ -1916,7 +1918,7 @@
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
- MARKETING_VERSION = 1.17.0;
+ MARKETING_VERSION = 1.19.0;
OTHER_CFLAGS = (
"$(inherited)",
"-fvisibility=hidden",
@@ -1947,7 +1949,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
- CURRENT_PROJECT_VERSION = 137;
+ CURRENT_PROJECT_VERSION = 138;
DEVELOPMENT_TEAM = R3RLJ9TW52;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
@@ -1983,7 +1985,7 @@
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
- MARKETING_VERSION = 1.17.0;
+ MARKETING_VERSION = 1.19.0;
OTHER_CFLAGS = (
"$(inherited)",
"-fvisibility=hidden",
diff --git a/build/iOS/MultiCraft/MultiCraft/Info.plist b/build/iOS/MultiCraft/MultiCraft/Info.plist
index d92a6592..2b972e04 100755
--- a/build/iOS/MultiCraft/MultiCraft/Info.plist
+++ b/build/iOS/MultiCraft/MultiCraft/Info.plist
@@ -45,59 +45,7 @@
SKAdNetworkIdentifier
- yclnxrl5pm.skadnetwork
-
-
- SKAdNetworkIdentifier
- v72qych5uu.skadnetwork
-
-
- SKAdNetworkIdentifier
- tl55sbb4fm.skadnetwork
-
-
- SKAdNetworkIdentifier
- t38b2kh725.skadnetwork
-
-
- SKAdNetworkIdentifier
- prcb7njmu6.skadnetwork
-
-
- SKAdNetworkIdentifier
- ppxm28t8ap.skadnetwork
-
-
- SKAdNetworkIdentifier
- mlmmfzh3r3.skadnetwork
-
-
- SKAdNetworkIdentifier
- klf5c3l5u5.skadnetwork
-
-
- SKAdNetworkIdentifier
- hs6bdukanm.skadnetwork
-
-
- SKAdNetworkIdentifier
- c6k4g5qg8m.skadnetwork
-
-
- SKAdNetworkIdentifier
- 9t245vhmpl.skadnetwork
-
-
- SKAdNetworkIdentifier
- 9rd848q2bz.skadnetwork
-
-
- SKAdNetworkIdentifier
- 8s468mfl3y.skadnetwork
-
-
- SKAdNetworkIdentifier
- 7ug5zh24hu.skadnetwork
+ 6g9af3uyq4.skadnetwork
SKAdNetworkIdentifier
@@ -105,20 +53,116 @@
SKAdNetworkIdentifier
- 4468km3ulz.skadnetwork
+ 2fnua5tdw4.skadnetwork
SKAdNetworkIdentifier
- 3rd42ekr43.skadnetwork
+ ydx93a7ass.skadnetwork
SKAdNetworkIdentifier
- 2u9pt9hc89.skadnetwork
+ cg4yq2srnc.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ v72qych5uu.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ mlmmfzh3r3.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ pwdxu55a5a.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ c6k4g5qg8m.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ wg4vff78zm.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ g28c52eehv.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 523jb4fst2.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 294l99pt4k.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ hs6bdukanm.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ prcb7njmu6.skadnetwork
SKAdNetworkIdentifier
m8dbw4sv7c.skadnetwork
+
+ SKAdNetworkIdentifier
+ 9nlqeag3gk.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ cj5566h2ga.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ u679fj5vs4.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ a7xqa6mtl2.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ g2y4y55b64.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ wzmmz9fp6w.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ yclnxrl5pm.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 4468km3ulz.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ t38b2kh725.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 7ug5zh24hu.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ rx5hdcabgc.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 5lm9lj6jb7.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 9rd848q2bz.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ n6fk4nfna4.skadnetwork
+
SKAdNetworkIdentifier
7rz58n8ntl.skadnetwork
@@ -129,36 +173,104 @@
SKAdNetworkIdentifier
- 5lm9lj6jb7.skadnetwork
+ 275upjj5gd.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ kbd757ywx3.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 9t245vhmpl.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ n9x2a789qt.skadnetwork
SKAdNetworkIdentifier
44jx6755aq.skadnetwork
+
+ SKAdNetworkIdentifier
+ tl55sbb4fm.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 2u9pt9hc89.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 8s468mfl3y.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ klf5c3l5u5.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ ppxm28t8ap.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 74b6s63p6l.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ kbmxgpxpgc.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 44n7hlldy6.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 5l3tpt7t6e.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ uw77j35x4d.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 6964rsfnh4.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 84993kbrcf.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ pwa73g5rt2.skadnetwork
+
SKAdNetworkIdentifier
mtkv5xtk9e.skadnetwork
SKAdNetworkIdentifier
- 6g9af3uyq4.skadnetwork
+ e5fvkxwrpn.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ gta9lk7p23.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ r45fhb6rf7.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 3rd42ekr43.skadnetwork
SKAdNetworkIdentifier
ludvb6z3bs.skadnetwork
-
- SKAdNetworkIdentifier
- wg4vff78zm.skadnetwork
-
SKAdNetworkIdentifier
737z793b9f.skadnetwork
-
- SKAdNetworkIdentifier
- ydx93a7ass.skadnetwork
-
SKAdNetworkIdentifier
mls7yz5dvl.skadnetwork
@@ -167,10 +279,54 @@
SKAdNetworkIdentifier
w9q455wk68.skadnetwork
+
+ SKAdNetworkIdentifier
+ p78axxw29g.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 6xzpu9s2p8.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ ggvn48r87g.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 3sh42y64q3.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ f38h382jlk.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 24t9a8vw3c.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ cstr6suwn9.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ zmvfpc5aq8.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ feyaarzu9v.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 5a6flpkh64.skadnetwork
+
SKAdNetworkIdentifier
glqzh8vgby.skadnetwork
+
+ SKAdNetworkIdentifier
+ 424m5254lk.skadnetwork
+
SKAdNetworkIdentifier
av6w8kgt66.skadnetwork
@@ -179,29 +335,13 @@
SKAdNetworkIdentifier
s39g8k73mm.skadnetwork
-
- SKAdNetworkIdentifier
- cj5566h2ga.skadnetwork
-
-
- SKAdNetworkIdentifier
- f38h382jlk.skadnetwork
-
SKAdNetworkIdentifier
lr83yxwka7.skadnetwork
SKAdNetworkIdentifier
- v9wttpbfk9.skadnetwork
-
-
- SKAdNetworkIdentifier
- n38lu8286q.skadnetwork
-
-
- SKAdNetworkIdentifier
- cstr6suwn9.skadnetwork
+ 22mmun2rn5.skadnetwork
SKAdNetworkIdentifier
@@ -209,27 +349,55 @@
SKAdNetworkIdentifier
- kbd757ywx3.skadnetwork
+ 4w7y6s5ca2.skadnetwork
SKAdNetworkIdentifier
- n9x2a789qt.skadnetwork
+ dzg6xy7pwj.skadnetwork
SKAdNetworkIdentifier
- uw77j35x4d.skadnetwork
+ y45688jllp.skadnetwork
SKAdNetworkIdentifier
- 3sh42y64q3.skadnetwork
+ hdw39hrw9y.skadnetwork
SKAdNetworkIdentifier
- 5l3tpt7t6e.skadnetwork
+ 4dzt52r2t5.skadnetwork
SKAdNetworkIdentifier
- 5a6flpkh64.skadnetwork
+ 5tjdwbrq8w.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 32z4fx6l9h.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ xy9t38ct57.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 54nzkqm89y.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 9b89h5y424.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 79pbpufp6p.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ s69wq72ugq.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ k674qkevps.skadnetwork
SKAdNetworkIdentifier
@@ -239,6 +407,74 @@
SKAdNetworkIdentifier
f73kdq92p3.skadnetwork
+
+ SKAdNetworkIdentifier
+ x44k69ngh6.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ mp6xlyr22a.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ qqp299437r.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 3qcr597p9d.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 97r2b46745.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 6p4ks3rnbw.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ rvh3l7un93.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ zq492l623r.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ x8uqf25wch.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ b9bk5wbcq9.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ bxvub5ada5.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ v9wttpbfk9.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ n38lu8286q.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 3qy4746246.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ v4nxqhlyqp.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ 8c4e2ghe7u.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ r26jy69rpl.skadnetwork
+
SKAdNetworkIdentifier
8m87ys6875.skadnetwork
@@ -249,31 +485,35 @@
SKAdNetworkIdentifier
- zmvfpc5aq8.skadnetwork
+ 52fl2v3hgk.skadnetwork
SKAdNetworkIdentifier
- 97r2b46745.skadnetwork
+ m5mvw97r93.skadnetwork
SKAdNetworkIdentifier
- 6xzpu9s2p8.skadnetwork
+ 89z7zv988g.skadnetwork
SKAdNetworkIdentifier
- cg4yq2srnc.skadnetwork
+ hb56zgv37p.skadnetwork
SKAdNetworkIdentifier
- g28c52eehv.skadnetwork
+ 6v7lgmsu45.skadnetwork
SKAdNetworkIdentifier
- ecpz2srf59.skadnetwork
+ m297p6643m.skadnetwork
SKAdNetworkIdentifier
- 22mmun2rn5.skadnetwork
+ 3l6bd9hu43.skadnetwork
+
+
+ SKAdNetworkIdentifier
+ vcra2ehyfk.skadnetwork
SKAdNetworkIdentifier
@@ -281,36 +521,12 @@
SKAdNetworkIdentifier
- 24t9a8vw3c.skadnetwork
+ f7s53z58qe.skadnetwork
SKAdNetworkIdentifier
v79kvwwj4g.skadnetwork
-
- SKAdNetworkIdentifier
- 424m5254lk.skadnetwork
-
-
- SKAdNetworkIdentifier
- 4dzt52r2t5.skadnetwork
-
-
- SKAdNetworkIdentifier
- wzmmz9fp6w.skadnetwork
-
-
- SKAdNetworkIdentifier
- 44n7hlldy6.skadnetwork
-
-
- SKAdNetworkIdentifier
- bvpn9ufa9b.skadnetwork
-
-
- SKAdNetworkIdentifier
- 3qy4746246.skadnetwork
-
SKAdNetworkIdentifier
gta8lk7p23.skadnetwork
diff --git a/build/iOS/MultiCraft/MultiCraft/SDVersion/SDVersion.h b/build/iOS/MultiCraft/MultiCraft/SDVersion/SDVersion.h
index 47f2f58d..a02ea4a7 100755
--- a/build/iOS/MultiCraft/MultiCraft/SDVersion/SDVersion.h
+++ b/build/iOS/MultiCraft/MultiCraft/SDVersion/SDVersion.h
@@ -213,6 +213,8 @@ typedef NS_ENUM(NSInteger, DeviceVersion){
#define SDVersioniPhone12Series (([SDVersion deviceVersion] == iPhone12Mini) || ([SDVersion deviceVersion] == iPhone12) || ([SDVersion deviceVersion] == iPhone12Pro) || ([SDVersion deviceVersion] == iPhone12ProMax) || \
([SDVersion deviceVersion] == iPhone13Mini) || ([SDVersion deviceVersion] == iPhone13) || ([SDVersion deviceVersion] == iPhone13Pro) || ([SDVersion deviceVersion] == iPhone13ProMax))
+//#define SDVersion10and5Inch (([SDVersion deviceVersion] == iPadPro10Dot5Inch) || ([SDVersion deviceVersion] == iPadAir3))
+
//#define SDVersion11Inch (([SDVersion deviceVersion] == iPadPro11Inch) || ([SDVersion deviceVersion] == iPadPro11Inch2Gen) || ([SDVersion deviceVersion] == iPadAir4))
//#define SDVersion12and9Inch (([SDVersion deviceVersion] == iPadPro12Dot9Inch) || ([SDVersion deviceVersion] == iPadPro12Dot9Inch2Gen) || ([SDVersion deviceVersion] == iPadPro12Dot9Inch3Gen) || ([SDVersion deviceVersion] == iPadPro12Dot9Inch4Gen))
diff --git a/build/iOS/MultiCraft/MultiCraft/ioswrap.m b/build/iOS/MultiCraft/MultiCraft/ioswrap.m
index 35a3fde0..acbe3713 100644
--- a/build/iOS/MultiCraft/MultiCraft/ioswrap.m
+++ b/build/iOS/MultiCraft/MultiCraft/ioswrap.m
@@ -5,10 +5,6 @@
#import "ioswrap.h"
#import
-#ifdef OFFICIAL
-#import "ads.h"
-#endif
-
static UIViewController *viewc;
/* Initialization iOS Specific Things */
diff --git a/build/iOS/Podfile b/build/iOS/Podfile
index 5e5cdb3f..d5a54c8b 100755
--- a/build/iOS/Podfile
+++ b/build/iOS/Podfile
@@ -5,16 +5,14 @@ install! 'cocoapods', :warn_for_multiple_pod_sources => false, :warn_for_unused_
def appodeal
# source 'https://github.com/appodeal/CocoaPods.git'
- ver = '2.9.0-Beta'
+ ver = '2.10.3.1'
pod 'APDAdColonyAdapter', ver
pod 'APDAppLovinAdapter', ver
- # We don't use all of these networks, but they are part of BidMachine and we can't exclude only FB otherwise
- pod 'APDBidMachineAdapter', ver, :subspecs => ['Tapjoy', 'AdColony', 'Criteo', 'MyTarget', 'Smaato', 'Vungle', 'AppRoll']
+ pod 'APDBidMachineAdapter', ver
pod 'APDIronSourceAdapter', ver
- pod 'APDMintegralAdapter', ver
- pod 'APDTapjoyAdapter', ver
pod 'APDUnityAdapter', ver
+ pod 'APDVungleAdapter', ver
end
target 'MultiCraft' do
diff --git a/build/iOS/deps/freetype.sh b/build/iOS/deps/freetype.sh
index 239c98a5..26a9fda4 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.0
+FREETYPE_VERSION=2.11.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/libcurl.sh b/build/iOS/deps/libcurl.sh
index 07255135..887f3989 100755
--- a/build/iOS/deps/libcurl.sh
+++ b/build/iOS/deps/libcurl.sh
@@ -1,7 +1,7 @@
#!/bin/bash -e
. sdk.sh
-CURL_VERSION=7.79.1
+CURL_VERSION=7.80.0
if [ ! -d libcurl-src ]; then
wget https://curl.haxx.se/download/curl-$CURL_VERSION.tar.gz
diff --git a/src/script/lua_api/l_mainmenu.cpp b/src/script/lua_api/l_mainmenu.cpp
index f285cf25..4d7d0339 100644
--- a/src/script/lua_api/l_mainmenu.cpp
+++ b/src/script/lua_api/l_mainmenu.cpp
@@ -127,6 +127,11 @@ int ModApiMainMenu::l_start(lua_State *L)
data->serverdescription = getTextData(L,"serverdescription");
data->servername = getTextData(L,"servername");
+#ifdef __IOS__
+ std::string conf_path = porting::path_user + DIR_DELIM + "multicraft.conf";
+ g_settings->updateConfigFile(conf_path.c_str());
+#endif
+
//close menu next time
engine->m_startgame = true;
return 0;