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

iOS: v.1.0.9

Browse Source
This commit is contained in:
Maksim Gamarnik 2017-04-11 22:23:50 +03:00
parent 07c19c19ce
commit e3babcf97f
12 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,6 +224,8 @@
4B0F49CE1E424FDF0003953D /* enriched_string.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = enriched_string.cpp; path = ../../../../src/util/enriched_string.cpp; sourceTree = "<group>"; };
4B0F49D01E424FFD0003953D /* joystick_controller.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = joystick_controller.cpp; path = ../../../../src/client/joystick_controller.cpp; sourceTree = "<group>"; };
4B0F49D21E42501D0003953D /* static_text.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = static_text.cpp; path = ../../../../src/irrlicht_changes/static_text.cpp; sourceTree = "<group>"; };
4B735DD21E92C8DB00307C15 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Main.strings; sourceTree = "<group>"; };
4B735DD31E92C8DB00307C15 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
8758CE009FCB7E91F4C84C28 /* libPods-MultiCraft.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-MultiCraft.a"; sourceTree = BUILT_PRODUCTS_DIR; };
F81F6BE41DDC7D99000B9E21 /* libintl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libintl.a; path = ../deps/intl/libintl.a; sourceTree = "<group>"; };
F84D3A931DE79AB400ADE1A0 /* ads.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ads.h; path = ../../Ads/ads.h; sourceTree = "<group>"; };
@ -1569,6 +1571,7 @@
isa = PBXVariantGroup;
children = (
F8E6C4E61DCA3B7900F64426 /* Base */,
4B735DD21E92C8DB00307C15 /* ru */,
);
name = Main.storyboard;
sourceTree = "<group>";
@ -1577,6 +1580,7 @@
isa = PBXVariantGroup;
children = (
F8E6C4EB1DCA3B7900F64426 /* Base */,
4B735DD31E92C8DB00307C15 /* ru */,
);
name = LaunchScreen.storyboard;
sourceTree = "<group>";
@ -1588,11 +1592,13 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_USE_OPTIMIZATION_PROFILE = NO;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
@ -1639,11 +1645,13 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_USE_OPTIMIZATION_PROFILE = NO;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;

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: 22 KiB

After

Width:  |  Height:  |  Size: 23 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: 30 KiB

After

Width:  |  Height:  |  Size: 31 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: 34 KiB

After

Width:  |  Height:  |  Size: 34 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: 37 KiB

After

Width:  |  Height:  |  Size: 37 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: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

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

@ -17,9 +17,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0.8</string>
<string>1.0.9</string>
<key>CFBundleVersion</key>
<string>13</string>
<string>14</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSAppTransportSecurity</key>

1
build/iOS/MultiCraft/MultiCraft/ru.lproj/LaunchScreen.strings Normal file
View File

@ -0,0 +1 @@

1
build/iOS/MultiCraft/MultiCraft/ru.lproj/Main.strings Normal file
View File

@ -0,0 +1 @@

BIN
build/iOS/icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 119 KiB

15
src/defaultsettings.cpp
View File

@ -430,30 +430,33 @@ void set_default_settings(Settings *settings)
// For iPad =)
settings->setDefault("hud_scaling", "0.8");
settings->setDefault("gui_scaling", "1.2");
settings->setDefault("gui_scaling", "1.1");
settings->setDefault("mouse_sensitivity", "0.2");
// 3.5" (old iPhone's)
if ([SDVersion deviceSize] == Screen3Dot5inch) {
settings->setDefault("hud_scaling", "0.4");
settings->setDefault("gui_scaling", "0.8");
settings->setDefault("mouse_sensitivity", "0.15");
settings->setDefault("gui_scaling", "0.9");
settings->setDefault("mouse_sensitivity", "0.2");
settings->setDefault("enable_3d_clouds", "false");
settings->setDefault("smooth_lighting", "false");
};
// 4" (iPhone 5)
if ([SDVersion deviceSize] == Screen4inch) {
settings->setDefault("hud_scaling", "0.5");
settings->setDefault("gui_scaling", "0.9");
settings->setDefault("gui_scaling", "1.1");
settings->setDefault("mouse_sensitivity", "0.23");
settings->setDefault("enable_3d_clouds", "false");
};
// 4.7" (iPhone)
if ([SDVersion deviceSize] == Screen4Dot7inch) {
settings->setDefault("hud_scaling", "0.6");
settings->setDefault("gui_scaling", "1.1");
settings->setDefault("gui_scaling", "1.2");
settings->setDefault("mouse_sensitivity", "0.25");
}
// 5.5" (iPhone Plus)
if ([SDVersion deviceSize] == Screen5Dot5inch) {
settings->setDefault("hud_scaling", "0.7");
settings->setDefault("gui_scaling", "1.3");
settings->setDefault("gui_scaling", "1.4");
settings->setDefault("mouse_sensitivity", "0.3");
};

22
src/game.cpp
View File

@ -1244,36 +1244,34 @@ static void show_pause_menu(GUIFormSpecMenu **cur_formspec,
JoystickController *joystick, bool singleplayermode)
{
#if !defined(__ANDROID__) && !defined(__IOS__)
#ifdef __ANDROID__
float ypos = singleplayermode ? 0.5 : 0.1;
#elif __IOS__
float ypos = 1.0;
#else
float ypos = 1.0;
#endif
#ifdef __IOS__
float bsize = 3.5;
#else
float bsize = 4.0;
#endif
float bsize = 5.0;
std::ostringstream os;
os << FORMSPEC_VERSION_STRING << SIZE_TAG
<< "bgcolor[#00000060;true]"
<< "button_exit[3.5," << (ypos++) << ";" << bsize << ",0.5;btn_continue;"
<< "button_exit[3.0," << (ypos++) << ";" << bsize << ",0.5;btn_continue;"
<< strgettext("Continue") << "]";
#if !defined(__ANDROID__) && !defined(__IOS__)
if (!singleplayermode) {
os << "button_exit[3.5," << (ypos++) << ";4,0.5;btn_change_password;"
os << "button_exit[3.0," << (ypos++) << ";4,0.5;btn_change_password;"
<< strgettext("Change Password") << "]";
}
os << "button_exit[3.5," << (ypos++) << ";4,0.5;btn_sound;"
os << "button_exit[3.0," << (ypos++) << ";4,0.5;btn_sound;"
<< strgettext("Sound Volume") << "]";
os << "button_exit[3.5," << (ypos++) << ";4,0.5;btn_key_config;"
os << "button_exit[3.0," << (ypos++) << ";4,0.5;btn_key_config;"
<< strgettext("Change Keys") << "]";
#endif
os << "button_exit[3.5," << (ypos++) << ";" << bsize << ",0.5;btn_exit_menu;"
os << "button_exit[3.0," << (ypos++) << ";" << bsize << ",0.5;btn_exit_menu;"
<< strgettext("Save and Exit") << "]";
#ifndef __IOS__
os << "button_exit[3.5," << (ypos++) << ";4,0.5;btn_exit_os;"
os << "button_exit[3.0," << (ypos++) << ";4,0.5;btn_exit_os;"
<< strgettext("Close game") << "]";
#endif
os << "\n;]";