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

Version 1.10.1-release

master
MoNTE48 2020-08-10 01:36:10 +02:00
parent 23a724482d
commit f8d26cc424
8 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

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

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

@ -6,9 +6,10 @@ android {
defaultConfig {
applicationId 'com.multicraft.game'
minSdkVersion 16
//noinspection OldTargetApi
targetSdkVersion 29
versionCode 61
versionName "1.9.4"
versionCode 86
versionName "1.11.0"
multiDexEnabled true
}

2
build/android/build.gradle
View File

@ -6,7 +6,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.0'
classpath 'com.android.tools.build:gradle:4.0.1'
//noinspection GradleDynamicVersion
/*classpath 'com.bugsnag:bugsnag-android-gradle-plugin:4.+'*/
classpath 'de.undercouch:gradle-download-task:4.0.4'

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

@ -7,6 +7,7 @@ android {
ndkVersion '21.3.6528147'
defaultConfig {
minSdkVersion 16
//noinspection OldTargetApi
targetSdkVersion 29
externalNativeBuild {
ndkBuild {

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

@ -1401,7 +1401,7 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 1140;
LastUpgradeCheck = 1160;
ORGANIZATIONNAME = MultiCraft;
TargetAttributes = {
F8E6C4D81DCA3B7900F64426 = {
@ -1780,6 +1780,7 @@
COMPRESS_PNG_FILES = NO;
ENABLE_BITCODE = NO;
ENABLE_INCREMENTAL_DISTILL = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu11;
GCC_OPTIMIZATION_LEVEL = fast;
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
@ -1825,7 +1826,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 95;
CURRENT_PROJECT_VERSION = 96;
DEVELOPMENT_TEAM = R3RLJ9TW52;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
@ -1856,7 +1857,7 @@
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
MARKETING_VERSION = 1.10.0;
MARKETING_VERSION = 1.11.0;
OTHER_CFLAGS = (
"$(inherited)",
"-isystem",
@ -1890,7 +1891,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 95;
CURRENT_PROJECT_VERSION = 96;
DEVELOPMENT_TEAM = R3RLJ9TW52;
GCC_PREPROCESSOR_DEFINITIONS = (
"$(inherited)",
@ -1922,7 +1923,7 @@
"@executable_path/Frameworks",
);
LIBRARY_SEARCH_PATHS = "$(inherited)";
MARKETING_VERSION = 1.10.0;
MARKETING_VERSION = 1.11.0;
OTHER_CFLAGS = (
"$(inherited)",
"-isystem",

13
build/iOS/Podfile
View File

@ -5,12 +5,13 @@ use_frameworks!
def appodeal
source 'https://github.com/appodeal/CocoaPods.git'
pod 'APDAdColonyAdapter', '2.7.1.1-Beta'
pod 'APDAppLovinAdapter', '2.7.1.1-Beta'
pod 'APDAppodealAdExchangeAdapter', '2.7.1.1-Beta'
pod 'APDMintegralAdapter', '2.7.1.1-Beta'
pod 'APDTapjoyAdapter', '2.7.1.1-Beta'
pod 'APDUnityAdapter', '2.7.1.1-Beta'
pod 'APDAdColonyAdapter', '2.7.2.1-Beta'
pod 'APDAppLovinAdapter', '2.7.2.1-Beta'
pod 'APDAppodealAdExchangeAdapter', '2.7.2.1-Beta'
pod 'APDMintegralAdapter', '2.7.2.1-Beta'
pod 'APDOguryAdapter', '2.7.2.1-Beta'
pod 'APDTapjoyAdapter', '2.7.2.1-Beta'
pod 'APDUnityAdapter', '2.7.2.1-Beta'
end
target 'MultiCraft' do

2
games/default

@ -1 +1 @@
Subproject commit f6d3203ede4a9c10252e2369ba867beaa4799a53
Subproject commit 5766c64d28d8b48df4f5a5c8ab7936c8fd5cc476

2
src/config.h
View File

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