Merge pull request #885 from WhiteCloud0123/develop

Update 内容汇总.md、指定版本为10.2

Author: WhiteCloud0123

Makefile

@@ -136,7 +136,7 @@ export CCACHE_COMMENTS=1
 # Explicitly let 'char' to be 'signed char' to fix #18776
 OTHERS += -fsigned-char
 
-VERSION = CDDA-Breeze-10.1
+VERSION = CDDA-Breeze-10.2
 
 TARGET_NAME = cataclysm
 TILES_TARGET_NAME = $(TARGET_NAME)-tiles

android/app/build.gradle

@@ -245,8 +245,8 @@ android {
     defaultConfig {
         minSdkVersion override_minSdkVersion
         targetSdkVersion override_targetSdkVersion
-        versionCode 81
-        versionName "10.1"
+        versionCode 82
+        versionName "10.2"
         if (buildAsApplication) {
             applicationId "WhiteCloud.CDDA_Breeze"
             setProperty("archivesBaseName", "CDDA-Breeze-" + versionName)

android/gradle.properties

@@ -46,7 +46,7 @@ deps=./deps.zip
 
 # This property controls which override version number to use
 # You can override this from the command line by passing "-Poverride_version=#"
-override_version=CDDA-Breeze-10.1
+override_version=CDDA-Breeze-10.2
 
 # This property controls path where overridden version number header should be generated
 # You can override this from the command line by passing "-Pversion_header_path=#"

doc/内容汇总.md

@@ -48,6 +48,8 @@
 
 - 修复在视野惩罚不为1.0的天气下的阴影投射
 
+- 安卓端：修复一些设备上游戏画面出现各种线条的问题
+
 # 性能优化
 
 - 优化了身边有大量物品时的制作速度。

src/version.cpp

@@ -3,7 +3,7 @@
 #if (defined(_WIN32) || defined(MINGW)) && !defined(GIT_VERSION) && !defined(CROSS_LINUX) && !defined(_MSC_VER)
 
 #ifndef VERSION
-#define VERSION "CDDA-Breeze 10.1"
+#define VERSION "CDDA-Breeze 10.2"
 #endif
 
 #else

src/version.h

@@ -1,2 +1,2 @@
 // NOLINT(cata-header-guard)
-#define VERSION "CDDA-Breeze-10.1"
+#define VERSION "CDDA-Breeze-10.2"