diff --git a/spatialos.json b/spatialos.json index 3132c09..7e22a68 100644 --- a/spatialos.json +++ b/spatialos.json @@ -1,8 +1,8 @@ { "name": "your_project_name_here", "project_version": "1.0.0", - "sdk_version": "13.0.0", + "sdk_version": "13.0.1", "dependencies": [ - {"name": "standard_library", "version": "13.0.0"} + {"name": "standard_library", "version": "13.0.1"} ] } diff --git a/workers/unity/Assets/EntityPrefabs/Island_01.prefab.meta b/workers/unity/Assets/EntityPrefabs/Island_01.prefab.meta index 13b455e..e0c08e7 100644 --- a/workers/unity/Assets/EntityPrefabs/Island_01.prefab.meta +++ b/workers/unity/Assets/EntityPrefabs/Island_01.prefab.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 8653225ebf8b1c044b911fc0fa92f27c -timeCreated: 1493209356 -licenseType: Free NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/workers/unity/Assets/EntityPrefabs/Island_02.prefab.meta b/workers/unity/Assets/EntityPrefabs/Island_02.prefab.meta index c131f19..9e3b8d6 100644 --- a/workers/unity/Assets/EntityPrefabs/Island_02.prefab.meta +++ b/workers/unity/Assets/EntityPrefabs/Island_02.prefab.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 829f32272fd644b4ca31beaac218e61f -timeCreated: 1493209393 -licenseType: Free NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/workers/unity/Assets/EntityPrefabs/Island_03.prefab.meta b/workers/unity/Assets/EntityPrefabs/Island_03.prefab.meta index c611160..1c58715 100644 --- a/workers/unity/Assets/EntityPrefabs/Island_03.prefab.meta +++ b/workers/unity/Assets/EntityPrefabs/Island_03.prefab.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 3db8bf3d95751434b9cd57b611112668 -timeCreated: 1493209430 -licenseType: Free NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/workers/unity/Assets/EntityPrefabs/Island_04.prefab.meta b/workers/unity/Assets/EntityPrefabs/Island_04.prefab.meta index 65e352e..6b1caa5 100644 --- a/workers/unity/Assets/EntityPrefabs/Island_04.prefab.meta +++ b/workers/unity/Assets/EntityPrefabs/Island_04.prefab.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: ea66f20c054dc574fa22c160fb9982de -timeCreated: 1493209456 -licenseType: Free NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/workers/unity/Assets/EntityPrefabs/Island_Small_01.prefab.meta b/workers/unity/Assets/EntityPrefabs/Island_Small_01.prefab.meta index 5e2536c..df6b280 100644 --- a/workers/unity/Assets/EntityPrefabs/Island_Small_01.prefab.meta +++ b/workers/unity/Assets/EntityPrefabs/Island_Small_01.prefab.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 1871b357a355a67418feb14691d14726 -timeCreated: 1493209509 -licenseType: Free NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/workers/unity/Assets/EntityPrefabs/Island_Small_02.prefab.meta b/workers/unity/Assets/EntityPrefabs/Island_Small_02.prefab.meta index 1b4741c..6311462 100644 --- a/workers/unity/Assets/EntityPrefabs/Island_Small_02.prefab.meta +++ b/workers/unity/Assets/EntityPrefabs/Island_Small_02.prefab.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 5dbc8472b2351134097328328cbb56b6 -timeCreated: 1493209542 -licenseType: Free NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/workers/unity/Assets/EntityPrefabs/Island_Small_03.prefab.meta b/workers/unity/Assets/EntityPrefabs/Island_Small_03.prefab.meta index 0b12ed4..a9f1407 100644 --- a/workers/unity/Assets/EntityPrefabs/Island_Small_03.prefab.meta +++ b/workers/unity/Assets/EntityPrefabs/Island_Small_03.prefab.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 181e074754ed6cb4097f24040650ce25 -timeCreated: 1493209578 -licenseType: Free NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/workers/unity/Assets/EntityPrefabs/Island_Small_04.prefab.meta b/workers/unity/Assets/EntityPrefabs/Island_Small_04.prefab.meta index ed27ea2..0a78c2d 100644 --- a/workers/unity/Assets/EntityPrefabs/Island_Small_04.prefab.meta +++ b/workers/unity/Assets/EntityPrefabs/Island_Small_04.prefab.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: b70594bb47b27524a9166df1d90922b4 -timeCreated: 1493209608 -licenseType: Free NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/workers/unity/Assets/EntityPrefabs/LargeFish.prefab.meta b/workers/unity/Assets/EntityPrefabs/LargeFish.prefab.meta index e7981c6..7db8e3c 100644 --- a/workers/unity/Assets/EntityPrefabs/LargeFish.prefab.meta +++ b/workers/unity/Assets/EntityPrefabs/LargeFish.prefab.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: a5063d1825aa56c45984f59e2d3e3a45 -timeCreated: 1493211861 -licenseType: Free NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/workers/unity/Assets/EntityPrefabs/PirateShip.prefab.meta b/workers/unity/Assets/EntityPrefabs/PirateShip.prefab.meta index 20ff73e..55692e4 100644 --- a/workers/unity/Assets/EntityPrefabs/PirateShip.prefab.meta +++ b/workers/unity/Assets/EntityPrefabs/PirateShip.prefab.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 67e77d6a1f6ef9d43917be667998e7ed -timeCreated: 1472635270 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: -1 diff --git a/workers/unity/Assets/EntityPrefabs/PlayerCreator.prefab.meta b/workers/unity/Assets/EntityPrefabs/PlayerCreator.prefab.meta index 66151a5..e0ba0ed 100644 --- a/workers/unity/Assets/EntityPrefabs/PlayerCreator.prefab.meta +++ b/workers/unity/Assets/EntityPrefabs/PlayerCreator.prefab.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 43298fe8be1ad6f4ca15857e9955e47b -timeCreated: 1480507094 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/workers/unity/Assets/EntityPrefabs/PlayerShip.prefab.meta b/workers/unity/Assets/EntityPrefabs/PlayerShip.prefab.meta index ff6e9ed..0932ee5 100644 --- a/workers/unity/Assets/EntityPrefabs/PlayerShip.prefab.meta +++ b/workers/unity/Assets/EntityPrefabs/PlayerShip.prefab.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: c992c098f92447342b57f616b2e78d94 -timeCreated: 1468522532 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: -1 diff --git a/workers/unity/Assets/EntityPrefabs/SmallFish.prefab.meta b/workers/unity/Assets/EntityPrefabs/SmallFish.prefab.meta index 5abb18a..92a3f52 100644 --- a/workers/unity/Assets/EntityPrefabs/SmallFish.prefab.meta +++ b/workers/unity/Assets/EntityPrefabs/SmallFish.prefab.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 5e18ce94c1818764a9d99df97ad0363c -timeCreated: 1493211874 -licenseType: Free NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/workers/unity/Assets/EntityPrefabs/Whale.prefab.meta b/workers/unity/Assets/EntityPrefabs/Whale.prefab.meta index 9129d2a..1279d28 100644 --- a/workers/unity/Assets/EntityPrefabs/Whale.prefab.meta +++ b/workers/unity/Assets/EntityPrefabs/Whale.prefab.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 720dfd5ba8b6ad942837199e9301c9af -timeCreated: 1493212110 -licenseType: Free NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/workers/unity/Assets/Plugins/Improbable/.Modules/MinimalBuildSystem/Editor/Configuration/SpatialOSBuildConfigurationEditor.cs b/workers/unity/Assets/Plugins/Improbable/.Modules/MinimalBuildSystem/Editor/Configuration/SpatialOSBuildConfigurationEditor.cs index 00e64c4..f38d617 100644 --- a/workers/unity/Assets/Plugins/Improbable/.Modules/MinimalBuildSystem/Editor/Configuration/SpatialOSBuildConfigurationEditor.cs +++ b/workers/unity/Assets/Plugins/Improbable/.Modules/MinimalBuildSystem/Editor/Configuration/SpatialOSBuildConfigurationEditor.cs @@ -409,11 +409,7 @@ private static void SwapInList(IList list, int indexA, int indexB) private static IDisposable IndentLevelScope(int increment) { -#if UNITY_2017_3_OR_NEWER return new EditorGUI.IndentLevelScope(increment); -#else - return new FallbackIndentLevelScope(increment); -#endif } } } diff --git a/workers/unity/Assets/Plugins/Improbable/.Modules/MinimalBuildSystem/Editor/Configuration/WorkerBuildData.cs b/workers/unity/Assets/Plugins/Improbable/.Modules/MinimalBuildSystem/Editor/Configuration/WorkerBuildData.cs index 79d783a..ab6fbdb 100644 --- a/workers/unity/Assets/Plugins/Improbable/.Modules/MinimalBuildSystem/Editor/Configuration/WorkerBuildData.cs +++ b/workers/unity/Assets/Plugins/Improbable/.Modules/MinimalBuildSystem/Editor/Configuration/WorkerBuildData.cs @@ -9,12 +9,7 @@ namespace Improbable.Unity.MinimalBuildSystem.Configuration { public class WorkerBuildData { - internal const BuildTarget OSXBuildTarget = -#if UNITY_2017_3_OR_NEWER - BuildTarget.StandaloneOSX; -#else - BuildTarget.StandaloneOSXIntel64; -#endif + internal const BuildTarget OSXBuildTarget = BuildTarget.StandaloneOSX; private readonly WorkerPlatform workerPlatform; private readonly BuildTarget buildTarget; diff --git a/workers/unity/Assets/Plugins/Improbable/Core/Linux/Plugins/x86_64/libCoreSdkDll.so b/workers/unity/Assets/Plugins/Improbable/Core/Linux/Plugins/x86_64/libCoreSdkDll.so old mode 100644 new mode 100755 diff --git a/workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents.meta b/workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents.meta index f91e993..181f850 100644 --- a/workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents.meta +++ b/workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents.meta @@ -1,8 +1,6 @@ fileFormatVersion: 2 -guid: 423ed5cbd20219349bf143381ae64f99 +guid: 0cfca7763e9f445a3a2e64b5318db4df folderAsset: yes -timeCreated: 1526049922 -licenseType: Pro DefaultImporter: externalObjects: {} userData: diff --git a/workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents/Info.plist b/workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents/Info.plist old mode 100644 new mode 100755 diff --git a/workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents/Info.plist.meta b/workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents/Info.plist.meta index c301877..1b06018 100644 --- a/workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents/Info.plist.meta +++ b/workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents/Info.plist.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 79ff8ad7eefbb8c4988509d091dcc37e -timeCreated: 1526049922 -licenseType: Pro +guid: b65f9b1b4eb3840a29bf1fd06b2c454c DefaultImporter: externalObjects: {} userData: diff --git a/workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents/MacOS.meta b/workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents/MacOS.meta index 9a4eee2..e4f81a7 100644 --- a/workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents/MacOS.meta +++ b/workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents/MacOS.meta @@ -1,8 +1,6 @@ fileFormatVersion: 2 -guid: bca08ae668e2354458867858c8ef86cb +guid: 101d1e448b12145ba832d754ff2864f8 folderAsset: yes -timeCreated: 1526049922 -licenseType: Pro DefaultImporter: externalObjects: {} userData: diff --git a/workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents/MacOS/CoreSdkDll b/workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents/MacOS/CoreSdkDll old mode 100644 new mode 100755 diff --git a/workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents/MacOS/CoreSdkDll.meta b/workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents/MacOS/CoreSdkDll.meta index fff3fd3..19e99b3 100644 --- a/workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents/MacOS/CoreSdkDll.meta +++ b/workers/unity/Assets/Plugins/Improbable/Core/OSX/CoreSdkDll.bundle/Contents/MacOS/CoreSdkDll.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 47880e36d5d6c63489f1cd2f41154136 -timeCreated: 1526049922 -licenseType: Pro +guid: db3db49d5ada54d84bd7077bef979dc6 DefaultImporter: externalObjects: {} userData: diff --git a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.dll b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.dll old mode 100644 new mode 100755 diff --git a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.dll.meta b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.dll.meta index cf343ad..7a5af20 100644 --- a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.dll.meta +++ b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.dll.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 38634bd06f0d74b9fbb7b77b2a08b5d0 -timeCreated: 1527179045 -licenseType: Pro +guid: f44fb4b626fe048998e488cfd2923afe PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.xml.meta b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.xml.meta index 93b66cc..087474d 100644 --- a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.xml.meta +++ b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.Framework.xml.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 8afb126da30e84bc58795da5a9707494 -timeCreated: 1527179057 -licenseType: Pro +guid: 3814222838dbb497b92c44beb19b01f1 TextScriptImporter: externalObjects: {} userData: diff --git a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.dll b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.dll old mode 100644 new mode 100755 diff --git a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.dll.meta b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.dll.meta index bea2ba8..04bcedc 100644 --- a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.dll.meta +++ b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.dll.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: f50f3aee2e72440c190d326f6bbc58b0 -timeCreated: 1527179045 -licenseType: Pro +guid: 7752f3da0b6ef45b9bdd962b12aaf6ac PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.xml b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.xml old mode 100644 new mode 100755 diff --git a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.xml.meta b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.xml.meta index 2f179dd..14bf5e4 100644 --- a/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.xml.meta +++ b/workers/unity/Assets/Plugins/Improbable/Sdk/Dll/Improbable.WorkerSdkCsharp.xml.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 -guid: 316c715d468cf44e6be0a43c27cfe5f5 -timeCreated: 1527179057 -licenseType: Pro +guid: 138032453b3de44b6a1cb0f47d379d98 TextScriptImporter: externalObjects: {} userData: diff --git a/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Editor/Build/DefaultPlayerBuildConfiguration.cs b/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Editor/Build/DefaultPlayerBuildConfiguration.cs index 06ad55a..330e42b 100644 --- a/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Editor/Build/DefaultPlayerBuildConfiguration.cs +++ b/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Editor/Build/DefaultPlayerBuildConfiguration.cs @@ -32,11 +32,7 @@ internal static PlayerBuildConfiguation Generate() Targets = new List { BuildTarget.StandaloneWindows.ToString(), -#if UNITY_2017_3_OR_NEWER BuildTarget.StandaloneOSX.ToString() -#else - BuildTarget.StandaloneOSXIntel64.ToString() -#endif } } }, diff --git a/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Editor/Build/UnityPlayerBuilder.cs b/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Editor/Build/UnityPlayerBuilder.cs index 494f60d..01d6929 100644 --- a/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Editor/Build/UnityPlayerBuilder.cs +++ b/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Editor/Build/UnityPlayerBuilder.cs @@ -8,6 +8,9 @@ using Improbable.Unity.EditorTools.Util; using Improbable.Unity.Util; using UnityEditor; +#if UNITY_2018_1_OR_NEWER +using UnityEditor.Build.Reporting; +#endif using UnityEngine; namespace Improbable.Unity.EditorTools.Build @@ -51,15 +54,6 @@ private static BuildTarget ToRuntimePlatform(string platform) if (platform.ToLower() != "current") { var value = (BuildTarget) Enum.Parse(typeof(BuildTarget), platform); -#if UNITY_2017_3_OR_NEWER -#pragma warning disable 618 - if (value == BuildTarget.StandaloneOSXIntel64) - { - Debug.LogWarningFormat("{0} is deprecated and will be removed. Please update {1} to use {2} instead.", BuildTarget.StandaloneOSXIntel64, UnityPlayerBuilders.PlayerConfigurationFilePath, BuildTarget.StandaloneOSX); - value = BuildTarget.StandaloneOSX; - } -#pragma warning restore 618 -#endif return value; } @@ -73,11 +67,7 @@ internal static BuildTarget CurrentPlatform() case RuntimePlatform.WindowsEditor: return BuildTarget.StandaloneWindows; case RuntimePlatform.OSXEditor: -#if UNITY_2017_3_OR_NEWER return BuildTarget.StandaloneOSX; -#else - return BuildTarget.StandaloneOSXIntel64; -#endif case RuntimePlatform.LinuxEditor: return BuildTarget.StandaloneLinux64; default: @@ -120,11 +110,7 @@ internal string AssemblyDirectory { switch (BuildTarget) { -#if UNITY_2017_3_OR_NEWER case BuildTarget.StandaloneOSX: -#else - case BuildTarget.StandaloneOSXIntel64: -#endif { return PathUtil.Combine(PackagePath, string.Format("{0}.app", PackageName), "Contents", "Resources", "Data", "Managed"); } @@ -202,11 +188,7 @@ private static PlatformData CreatePlatformData(BuildTarget buildTarget) return new PlatformData("Managed", "Windows", "_Data", ".exe"); case BuildTarget.StandaloneWindows64: return new PlatformData("Managed", "Windows", "_Data", ".exe"); -#if UNITY_2017_3_OR_NEWER case BuildTarget.StandaloneOSX: -#else - case BuildTarget.StandaloneOSXIntel64: -#endif return new PlatformData("Contents/Data/Managed", "Mac", ".app", ""); case BuildTarget.StandaloneLinux64: return new PlatformData("Managed", "Linux", "_Data", ""); @@ -228,12 +210,19 @@ internal void BuildPlayer() var playerOptions = new BuildPlayerOptions { target = BuildTarget, locationPathName = tempExecutablePath, options = options, scenes = scenes }; var buildErrorMessage = BuildPipeline.BuildPlayer(playerOptions); +#if UNITY_2018_1_OR_NEWER + if (buildErrorMessage.summary.result != BuildResult.Succeeded) + { + throw new ApplicationException(string.Format("Failed to build player {0} due to {1} errors", BuildConfigComment, + buildErrorMessage.summary.totalErrors)); + } +#else if (!string.IsNullOrEmpty(buildErrorMessage)) { throw new ApplicationException(string.Format("Failed to build player {0} due to {1}", BuildConfigComment, buildErrorMessage)); } - +#endif Debug.LogFormat("Built player {0} into {1}", BuildConfigComment, PackagePath); } diff --git a/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Editor/Core/SpatialOsWindow.cs b/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Editor/Core/SpatialOsWindow.cs index 3a6e21e..9c6ceea 100644 --- a/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Editor/Core/SpatialOsWindow.cs +++ b/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Editor/Core/SpatialOsWindow.cs @@ -16,8 +16,8 @@ namespace Improbable.Unity.EditorTools [InitializeOnLoad] public class SpatialOsWindow : EditorWindow { - private const string MinVersion = "5.6.0"; - private const string MaxVersion = "2017.3.0"; + private const string MinVersion = "2017.3.0"; + private const string MaxVersion = "2018.1.3"; private static SharedGuiContent sharedContent; private static string versionMessage; diff --git a/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Editor/PrefabExport/EntityPrefabExporter.cs b/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Editor/PrefabExport/EntityPrefabExporter.cs index ee1fce4..e1bbd6f 100644 --- a/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Editor/PrefabExport/EntityPrefabExporter.cs +++ b/workers/unity/Assets/Plugins/Improbable/Sdk/Src/Editor/PrefabExport/EntityPrefabExporter.cs @@ -20,13 +20,7 @@ public class EntityPrefabExporter { { BuildTarget.StandaloneWindows, Platform.BuildPlatform.Windows }, { BuildTarget.StandaloneWindows64, Platform.BuildPlatform.Windows }, -#if UNITY_2017_3_OR_NEWER { BuildTarget.StandaloneOSX, Platform.BuildPlatform.OSX }, -#else - { BuildTarget.StandaloneOSXIntel, Platform.BuildPlatform.OSX }, - { BuildTarget.StandaloneOSXIntel64, Platform.BuildPlatform.OSX }, - { BuildTarget.StandaloneOSXUniversal, Platform.BuildPlatform.OSX }, -#endif { BuildTarget.StandaloneLinux, Platform.BuildPlatform.Linux }, { BuildTarget.StandaloneLinux64, Platform.BuildPlatform.Linux }, { BuildTarget.iOS, Platform.BuildPlatform.iOS } diff --git a/workers/unity/Assets/Resources/EntityPrefabs/FireAnim.prefab.meta b/workers/unity/Assets/Resources/EntityPrefabs/FireAnim.prefab.meta index af1968b..e9169cc 100644 --- a/workers/unity/Assets/Resources/EntityPrefabs/FireAnim.prefab.meta +++ b/workers/unity/Assets/Resources/EntityPrefabs/FireAnim.prefab.meta @@ -1,7 +1,5 @@ fileFormatVersion: 2 guid: 99e15ef67551b5640830cdb949bf1dac -timeCreated: 1468527679 -licenseType: Pro NativeFormatImporter: externalObjects: {} mainObjectFileID: 0 diff --git a/workers/unity/Improbable/bin/CodeGenerator.dll b/workers/unity/Improbable/bin/CodeGenerator.dll old mode 100644 new mode 100755 diff --git a/workers/unity/Improbable/bin/Improbable.TextTemplating.dll b/workers/unity/Improbable/bin/Improbable.TextTemplating.dll old mode 100644 new mode 100755 diff --git a/workers/unity/Improbable/bin/Mono.TextTemplating.dll b/workers/unity/Improbable/bin/Mono.TextTemplating.dll old mode 100644 new mode 100755 diff --git a/workers/unity/Improbable/bin/Newtonsoft.Json.dll b/workers/unity/Improbable/bin/Newtonsoft.Json.dll old mode 100644 new mode 100755 diff --git a/workers/unity/Improbable/bin/UnityCodeGenerator.exe b/workers/unity/Improbable/bin/UnityCodeGenerator.exe old mode 100644 new mode 100755 diff --git a/workers/unity/Improbable/bin/windows/clean.exe b/workers/unity/Improbable/bin/windows/clean.exe old mode 100644 new mode 100755 diff --git a/workers/unity/Improbable/bin/windows/unity-csharp-invoker.exe b/workers/unity/Improbable/bin/windows/unity-csharp-invoker.exe old mode 100644 new mode 100755 diff --git a/workers/unity/Improbable/bin/windows/unity-invoker.exe b/workers/unity/Improbable/bin/windows/unity-invoker.exe old mode 100644 new mode 100755 diff --git a/workers/unity/Improbable/bin/windows/unity-mono-invoker.exe b/workers/unity/Improbable/bin/windows/unity-mono-invoker.exe old mode 100644 new mode 100755 diff --git a/workers/unity/Improbable/bin/windows/unity-zip.exe b/workers/unity/Improbable/bin/windows/unity-zip.exe old mode 100644 new mode 100755