diff --git a/Assets/Fungus/Scripts/Commands/Property.meta b/Assets/Fungus/Scripts/Commands/Property.meta deleted file mode 100644 index d2aa6cd5..00000000 --- a/Assets/Fungus/Scripts/Commands/Property.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 103d5735e5e7b4a409ae0bb18c246f22 -folderAsset: yes -timeCreated: 1513473561 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Fungus/Scripts/Editor/HierarchyIcons.cs b/Assets/Fungus/Scripts/Editor/HierarchyIcons.cs index 60171bbb..4543c14a 100644 --- a/Assets/Fungus/Scripts/Editor/HierarchyIcons.cs +++ b/Assets/Fungus/Scripts/Editor/HierarchyIcons.cs @@ -28,7 +28,7 @@ namespace Fungus static HierarchyIcons() { EditorApplication.hierarchyWindowItemOnGUI += HierarchyIconCallback; - EditorApplication.hierarchyWindowChanged += HierarchyChanged; + EditorApplication.hierarchyChanged += HierarchyChanged; } //track all gameobjectIds that have flowcharts on them diff --git a/Assets/Fungus/Scripts/VariableTypes/Editor.meta b/Assets/Fungus/Scripts/VariableTypes/Editor.meta deleted file mode 100644 index 0f88bcd0..00000000 --- a/Assets/Fungus/Scripts/VariableTypes/Editor.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 59b05963ac368e4489c4251c5ba38443 -folderAsset: yes -timeCreated: 1513473561 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Fungus/Thirdparty/Usfxr/Scripts/SfxrAudioPlayer.cs b/Assets/Fungus/Thirdparty/Usfxr/Scripts/SfxrAudioPlayer.cs index 604baed0..a0904efd 100644 --- a/Assets/Fungus/Thirdparty/Usfxr/Scripts/SfxrAudioPlayer.cs +++ b/Assets/Fungus/Thirdparty/Usfxr/Scripts/SfxrAudioPlayer.cs @@ -36,7 +36,6 @@ public class SfxrAudioPlayer : MonoBehaviour { * @author Zeh Fernando */ - // Properties private bool isDestroyed = false; // If true, this instance has been destroyed and shouldn't do anything yes private bool needsToDestroy = false; // If true, it has been scheduled for destruction (from outside the main thread) @@ -52,7 +51,7 @@ public class SfxrAudioPlayer : MonoBehaviour { void Start() { // Creates an empty audio source so this GameObject can receive audio events AudioSource soundSource = gameObject.AddComponent(); - soundSource.clip = null; // new AudioClip(); + soundSource.clip = null; soundSource.volume = 1f; soundSource.pitch = 1f; soundSource.priority = 128; diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/IntegrationTestsRunnerWindow.cs b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/IntegrationTestsRunnerWindow.cs index 0469e664..152b7b3a 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/IntegrationTestsRunnerWindow.cs +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/IntegrationTestsRunnerWindow.cs @@ -59,8 +59,8 @@ namespace UnityTest { EditorApplication.hierarchyWindowItemOnGUI -= OnHierarchyWindowItemDraw; EditorApplication.hierarchyWindowItemOnGUI += OnHierarchyWindowItemDraw; - EditorApplication.hierarchyWindowChanged -= OnHierarchyChangeUpdate; - EditorApplication.hierarchyWindowChanged += OnHierarchyChangeUpdate; + EditorApplication.hierarchyChanged -= OnHierarchyChangeUpdate; + EditorApplication.hierarchyChanged += OnHierarchyChangeUpdate; EditorApplication.update -= BackgroundSceneChangeWatch; EditorApplication.update += BackgroundSceneChangeWatch; #if UNITY_2017_2_OR_NEWER @@ -86,7 +86,7 @@ namespace UnityTest { EditorApplication.hierarchyWindowItemOnGUI -= OnHierarchyWindowItemDraw; EditorApplication.update -= BackgroundSceneChangeWatch; - EditorApplication.hierarchyWindowChanged -= OnHierarchyChangeUpdate; + EditorApplication.hierarchyChanged -= OnHierarchyChangeUpdate; #if UNITY_2017_2_OR_NEWER EditorApplication.playModeStateChanged -= OnPlaymodeStateChanged; #else diff --git a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlayerSettingConfigurator.cs b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlayerSettingConfigurator.cs index 77aea814..cd729b20 100644 --- a/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlayerSettingConfigurator.cs +++ b/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlayerSettingConfigurator.cs @@ -18,7 +18,7 @@ namespace UnityTest private ResolutionDialogSetting m_DisplayResolutionDialog; private bool m_RunInBackground; - private bool m_FullScreen; + private FullScreenMode m_FullScreen; private bool m_ResizableWindow; private readonly List m_TempFileList = new List(); @@ -35,8 +35,8 @@ namespace UnityTest m_RunInBackground = PlayerSettings.runInBackground; PlayerSettings.runInBackground = true; - m_FullScreen = PlayerSettings.defaultIsFullScreen; - PlayerSettings.defaultIsFullScreen = false; + m_FullScreen = PlayerSettings.fullScreenMode; + PlayerSettings.fullScreenMode = FullScreenMode.Windowed; m_ResizableWindow = PlayerSettings.resizableWindow; PlayerSettings.resizableWindow = true; @@ -44,7 +44,7 @@ namespace UnityTest public void RevertSettingsChanges() { - PlayerSettings.defaultIsFullScreen = m_FullScreen; + PlayerSettings.fullScreenMode = m_FullScreen; PlayerSettings.runInBackground = m_RunInBackground; PlayerSettings.displayResolutionDialog = m_DisplayResolutionDialog; PlayerSettings.resizableWindow = m_ResizableWindow; diff --git a/UnityPackageManager/manifest.json b/Packages/manifest.json similarity index 100% rename from UnityPackageManager/manifest.json rename to Packages/manifest.json diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset new file mode 100644 index 00000000..636a595b --- /dev/null +++ b/ProjectSettings/PresetManager.asset @@ -0,0 +1,6 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1386491679 &1 +PresetManager: + m_ObjectHideFlags: 0 + m_DefaultList: [] diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index ac7d2146..22977b32 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.4.0f1 +m_EditorVersion: 2018.1.0f2