From 6df3d59a6aed3535a9e8ff23ec30763d598c1a90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Madar=C3=A1sz?= Date: Thu, 13 Sep 2018 16:36:42 +0200 Subject: [PATCH] Bump up Unity version --- Assets/Scripts/Core/GameAPI.cs | 6 +++++- ProjectSettings/ProjectSettings.asset | 2 +- ProjectSettings/ProjectVersion.txt | 2 +- README.md | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Assets/Scripts/Core/GameAPI.cs b/Assets/Scripts/Core/GameAPI.cs index 5fd206e..e612e1c 100644 --- a/Assets/Scripts/Core/GameAPI.cs +++ b/Assets/Scripts/Core/GameAPI.cs @@ -1,4 +1,7 @@ -using B83.Image.BMP; +#if UNITY_EDITOR +#undef MAFIAUNITY_RELEASE +#endif + using System; using System.Collections; using System.Collections.Generic; @@ -38,6 +41,7 @@ public static void ResetGameAPI() /// when framework's API radically changes. /// + #if MAFIAUNITY_RELEASE public const string GAME_VERSION = "v1.0.0"; #else diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index dbe10be..062a828 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -569,7 +569,7 @@ PlayerSettings: webGLCompressionFormat: 1 webGLLinkerTarget: 1 scriptingDefineSymbols: - 1: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT + 1: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT;MAFIAUNITY_RELEASE 4: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT 7: UNITY_POST_PROCESSING_STACK_V2;CROSS_PLATFORM_INPUT 13: UNITY_POST_PROCESSING_STACK_V2 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 75a1158..6169583 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.2.6f1 +m_EditorVersion: 2018.2.7f1 diff --git a/README.md b/README.md index bc957ad..41a0aeb 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ We aim to create open-source tools for the game [Mafia](https://en.wikipedia.org ## Development -We are currently using Unity version: **2018.2.6f1**. +We are currently using Unity version: **2018.2.7f1**. Actual development takes place in **develop** branch and therefore is covering more features and possible fixes. We highly recommend to use **develop** branch until we reach the time once our project gets more stable (and starts using versioning semantics). **master** branch is considered stable but less developed and might also lack certain features which might introduce importing bugs or issues.