MultiCraftProject/MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Version 1.11.1-release

Browse Source
This commit is contained in:
MoNTE48 2020-08-31 12:44:31 +02:00
parent f544447341
commit e87c313187
7 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -15,7 +15,7 @@ set(CMAKE_CXX_STANDARD 11)
# Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing # Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
set(VERSION_MAJOR 1) set(VERSION_MAJOR 1)
set(VERSION_MINOR 11) set(VERSION_MINOR 11)
set(VERSION_PATCH 0) set(VERSION_PATCH 1)
set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string") set(VERSION_EXTRA "" CACHE STRING "Stuff to append to version string")
# Change to false for releases # Change to false for releases

8
build/android/app/build.gradle
View File

@ -1,15 +1,15 @@
apply plugin: 'com.android.application' apply plugin: 'com.android.application'
android { android {
compileSdkVersion 29 compileSdkVersion 29
buildToolsVersion '30.0.1' buildToolsVersion '30.0.2'
ndkVersion '21.3.6528147' ndkVersion '21.3.6528147'
defaultConfig { defaultConfig {
applicationId 'com.multicraft.game' applicationId 'com.multicraft.game'
minSdkVersion 16 minSdkVersion 16
//noinspection OldTargetApi //noinspection OldTargetApi
targetSdkVersion 29 targetSdkVersion 29
versionCode 86 versionCode 88
versionName "1.11.0" versionName "1.11.1"
multiDexEnabled true multiDexEnabled true
} }
@ -71,7 +71,7 @@ dependencies {
//noinspection GradleDependency //noinspection GradleDependency
implementation 'commons-io:commons-io:2.5' implementation 'commons-io:commons-io:2.5'
implementation 'gun0912.ted:tedpermission-rx2:2.2.3' implementation 'gun0912.ted:tedpermission-rx2:2.2.3'
implementation 'net.lingala.zip4j:zip4j:2.6.1' implementation 'net.lingala.zip4j:zip4j:2.6.2'
/* Analytics libraries */ /* Analytics libraries */
//noinspection GradleDynamicVersion //noinspection GradleDynamicVersion

4
build/android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Wed Jul 08 12:03:54 CEST 2020 #Sun Aug 30 18:21:48 CEST 2020
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip

2
build/android/native/build.gradle
View File

@ -3,7 +3,7 @@ apply plugin: 'de.undercouch.download'
android { android {
compileSdkVersion 29 compileSdkVersion 29
buildToolsVersion '30.0.1' buildToolsVersion '30.0.2'
ndkVersion '21.3.6528147' ndkVersion '21.3.6528147'
defaultConfig { defaultConfig {
minSdkVersion 16 minSdkVersion 16

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

@ -1808,7 +1808,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 96; CURRENT_PROJECT_VERSION = 97;
DEVELOPMENT_TEAM = R3RLJ9TW52; DEVELOPMENT_TEAM = R3RLJ9TW52;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)", "$(inherited)",
@ -1839,7 +1839,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
LIBRARY_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)";
MARKETING_VERSION = 1.11.0; MARKETING_VERSION = 1.11.1;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"$(inherited)", "$(inherited)",
"-isystem", "-isystem",
@ -1873,7 +1873,7 @@
buildSettings = { buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 96; CURRENT_PROJECT_VERSION = 97;
DEVELOPMENT_TEAM = R3RLJ9TW52; DEVELOPMENT_TEAM = R3RLJ9TW52;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)", "$(inherited)",
@ -1905,7 +1905,7 @@
"@executable_path/Frameworks", "@executable_path/Frameworks",
); );
LIBRARY_SEARCH_PATHS = "$(inherited)"; LIBRARY_SEARCH_PATHS = "$(inherited)";
MARKETING_VERSION = 1.11.0; MARKETING_VERSION = 1.11.1;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"$(inherited)", "$(inherited)",
"-isystem", "-isystem",

2
src/config.h
View File

@ -18,7 +18,7 @@
#define STATIC_SHAREDIR "" #define STATIC_SHAREDIR ""
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 11 #define VERSION_MINOR 11
#define VERSION_PATCH 0 #define VERSION_PATCH 1
#define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH) #define VERSION_STRING STR(VERSION_MAJOR) "." STR(VERSION_MINOR) "." STR(VERSION_PATCH)
#endif #endif

4
src/constants.h
View File

@ -111,9 +111,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
// TODO: implement dpi-based scaling for windows and remove this hack // TODO: implement dpi-based scaling for windows and remove this hack
#if defined(_WIN32) #if defined(_WIN32)
#define TTF_DEFAULT_FONT_SIZE (22) #define TTF_DEFAULT_FONT_SIZE (22)
#elif defined(__ANDROID__) #elif defined(__ANDROID__) || defined(__IOS__)
#define TTF_DEFAULT_FONT_SIZE (15)
#elif defined(__IOS__)
#define TTF_DEFAULT_FONT_SIZE (13) #define TTF_DEFAULT_FONT_SIZE (13)
#else #else
#define TTF_DEFAULT_FONT_SIZE (20) #define TTF_DEFAULT_FONT_SIZE (20)