From 17be791feab9f7ccb3fa45bae467d8fa2a5fe403 Mon Sep 17 00:00:00 2001 From: MoNTE48 Date: Tue, 17 Apr 2018 20:18:09 +0200 Subject: [PATCH] push to app store --- .../MultiCraft/MultiCraft.xcodeproj/project.pbxproj | 0 .../AppIcon.appiconset/AppIcon-120.png | Bin .../AppIcon.appiconset/AppIcon-152.png | Bin .../AppIcon.appiconset/AppIcon-167.png | Bin .../AppIcon.appiconset/AppIcon-180.png | Bin .../AppIcon.appiconset/AppIcon-76.png | Bin .../Assets.xcassets/AppIcon.appiconset/AppStore.jpg | Bin .../AppIcon.appiconset/Contents.json | 0 .../MultiCraft/Base.lproj/LaunchScreen.storyboard | 0 .../MultiCraft/Base.lproj/Main.storyboard | 0 build/iOS/MultiCraft/MultiCraft/Info.plist | 4 ++-- build/iOS/MultiCraft/MultiCraft/ioswrap.h | 0 .../MultiCraft/ru.lproj/LaunchScreen.strings | 0 .../iOS/MultiCraft/MultiCraft/ru.lproj/Main.strings | 0 build/iOS/Podfile | 0 build/iOS/deps/libraries.sh | 0 build/iOS/deps/sdk.sh | 2 +- build/iOS/icon.png | Bin build/iOS/patches/luajit.patch | 0 src/defaultsettings.cpp | 5 ++++- 20 files changed, 7 insertions(+), 4 deletions(-) mode change 100644 => 100755 build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj mode change 100644 => 100755 build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-120.png mode change 100644 => 100755 build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-152.png mode change 100644 => 100755 build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-167.png mode change 100644 => 100755 build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-180.png mode change 100644 => 100755 build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-76.png mode change 100644 => 100755 build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppStore.jpg mode change 100644 => 100755 build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/Contents.json mode change 100644 => 100755 build/iOS/MultiCraft/MultiCraft/Base.lproj/LaunchScreen.storyboard mode change 100644 => 100755 build/iOS/MultiCraft/MultiCraft/Base.lproj/Main.storyboard mode change 100644 => 100755 build/iOS/MultiCraft/MultiCraft/Info.plist mode change 100644 => 100755 build/iOS/MultiCraft/MultiCraft/ioswrap.h mode change 100644 => 100755 build/iOS/MultiCraft/MultiCraft/ru.lproj/LaunchScreen.strings mode change 100644 => 100755 build/iOS/MultiCraft/MultiCraft/ru.lproj/Main.strings mode change 100644 => 100755 build/iOS/Podfile mode change 100644 => 100755 build/iOS/deps/libraries.sh mode change 100644 => 100755 build/iOS/deps/sdk.sh mode change 100644 => 100755 build/iOS/icon.png mode change 100644 => 100755 build/iOS/patches/luajit.patch diff --git a/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj b/build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj old mode 100644 new mode 100755 diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-120.png b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-120.png old mode 100644 new mode 100755 diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-152.png b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-152.png old mode 100644 new mode 100755 diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-167.png b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-167.png old mode 100644 new mode 100755 diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-180.png b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-180.png old mode 100644 new mode 100755 diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-76.png b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppIcon-76.png old mode 100644 new mode 100755 diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppStore.jpg b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/AppStore.jpg old mode 100644 new mode 100755 diff --git a/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/Contents.json b/build/iOS/MultiCraft/MultiCraft/Assets.xcassets/AppIcon.appiconset/Contents.json old mode 100644 new mode 100755 diff --git a/build/iOS/MultiCraft/MultiCraft/Base.lproj/LaunchScreen.storyboard b/build/iOS/MultiCraft/MultiCraft/Base.lproj/LaunchScreen.storyboard old mode 100644 new mode 100755 diff --git a/build/iOS/MultiCraft/MultiCraft/Base.lproj/Main.storyboard b/build/iOS/MultiCraft/MultiCraft/Base.lproj/Main.storyboard old mode 100644 new mode 100755 diff --git a/build/iOS/MultiCraft/MultiCraft/Info.plist b/build/iOS/MultiCraft/MultiCraft/Info.plist old mode 100644 new mode 100755 index f320b08af..38edce5ba --- a/build/iOS/MultiCraft/MultiCraft/Info.plist +++ b/build/iOS/MultiCraft/MultiCraft/Info.plist @@ -17,9 +17,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.13 + 1.0.14 CFBundleVersion - 24 + 25 LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/build/iOS/MultiCraft/MultiCraft/ioswrap.h b/build/iOS/MultiCraft/MultiCraft/ioswrap.h old mode 100644 new mode 100755 diff --git a/build/iOS/MultiCraft/MultiCraft/ru.lproj/LaunchScreen.strings b/build/iOS/MultiCraft/MultiCraft/ru.lproj/LaunchScreen.strings old mode 100644 new mode 100755 diff --git a/build/iOS/MultiCraft/MultiCraft/ru.lproj/Main.strings b/build/iOS/MultiCraft/MultiCraft/ru.lproj/Main.strings old mode 100644 new mode 100755 diff --git a/build/iOS/Podfile b/build/iOS/Podfile old mode 100644 new mode 100755 diff --git a/build/iOS/deps/libraries.sh b/build/iOS/deps/libraries.sh old mode 100644 new mode 100755 diff --git a/build/iOS/deps/sdk.sh b/build/iOS/deps/sdk.sh old mode 100644 new mode 100755 index 5bd6a4b3a..edd9e0fac --- a/build/iOS/deps/sdk.sh +++ b/build/iOS/deps/sdk.sh @@ -7,4 +7,4 @@ osver=8.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 arm64 -miphoneos-version-min=$osver -fvisibility=hidden -flto -Ofast" +export IOS_FLAGS="-isysroot $(xcrun --sdk $sdk --show-sdk-path) -arch armv7 -arch arm64 -miphoneos-version-min=$osver -fvisibility=hidden -fdata-sections -ffunction-sections -flto -Ofast" diff --git a/build/iOS/icon.png b/build/iOS/icon.png old mode 100644 new mode 100755 diff --git a/build/iOS/patches/luajit.patch b/build/iOS/patches/luajit.patch old mode 100644 new mode 100755 diff --git a/src/defaultsettings.cpp b/src/defaultsettings.cpp index 4aa4b2e6f..8a572b7a2 100644 --- a/src/defaultsettings.cpp +++ b/src/defaultsettings.cpp @@ -374,6 +374,7 @@ void set_default_settings(Settings *settings) settings->setDefault("fullscreen", "true"); settings->setDefault("video_driver", "ogles1"); settings->setDefault("touchscreen_threshold", "20"); + settings->setDefault("fixed_virtual_joystick", "true"); settings->setDefault("max_block_generate_distance", "3"); settings->setDefault("pause_fps_max", "5"); settings->setDefault("doubletap_jump", "true"); @@ -450,6 +451,7 @@ void set_default_settings(Settings *settings) settings->setDefault("mouse_sensitivity", "0.2"); // 3.5" (old iPhone's) if ([SDVersion deviceSize] == Screen3Dot5inch) { + settings->setDefault("viewing_range", "30"); settings->setDefault("hud_scaling", "0.5"); settings->setDefault("gui_scaling", "1.0"); settings->setDefault("mouse_sensitivity", "0.2"); @@ -478,8 +480,9 @@ void set_default_settings(Settings *settings) }; // 5.8" (iPhone X) if ([SDVersion deviceSize] == Screen5Dot8inch) { + settings->setDefault("viewing_range", "75"); settings->setDefault("hud_scaling", "0.7"); - settings->setDefault("gui_scaling", "1.4"); + settings->setDefault("gui_scaling", "1.3"); settings->setDefault("mouse_sensitivity", "0.3"); };