Browse Source

Updated to 2018.1

Update from obselete windowHierarchyChanged o hierarchyChanged
Force a line difference in SfxrAudioPlayer to help identify cause of some lingering error reports.
master
desktop-maesty/steve 7 years ago
parent
commit
bf5cb48592
  1. 9
      Assets/Fungus/Scripts/Commands/Property.meta
  2. 2
      Assets/Fungus/Scripts/Editor/HierarchyIcons.cs
  3. 9
      Assets/Fungus/Scripts/VariableTypes/Editor.meta
  4. 3
      Assets/Fungus/Thirdparty/Usfxr/Scripts/SfxrAudioPlayer.cs
  5. 6
      Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/IntegrationTestsRunnerWindow.cs
  6. 8
      Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlayerSettingConfigurator.cs
  7. 0
      Packages/manifest.json
  8. 6
      ProjectSettings/PresetManager.asset
  9. 2
      ProjectSettings/ProjectVersion.txt

9
Assets/Fungus/Scripts/Commands/Property.meta

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 103d5735e5e7b4a409ae0bb18c246f22
folderAsset: yes
timeCreated: 1513473561
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Fungus/Scripts/Editor/HierarchyIcons.cs

@ -28,7 +28,7 @@ namespace Fungus
static HierarchyIcons() static HierarchyIcons()
{ {
EditorApplication.hierarchyWindowItemOnGUI += HierarchyIconCallback; EditorApplication.hierarchyWindowItemOnGUI += HierarchyIconCallback;
EditorApplication.hierarchyWindowChanged += HierarchyChanged; EditorApplication.hierarchyChanged += HierarchyChanged;
} }
//track all gameobjectIds that have flowcharts on them //track all gameobjectIds that have flowcharts on them

9
Assets/Fungus/Scripts/VariableTypes/Editor.meta

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 59b05963ac368e4489c4251c5ba38443
folderAsset: yes
timeCreated: 1513473561
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

3
Assets/Fungus/Thirdparty/Usfxr/Scripts/SfxrAudioPlayer.cs vendored

@ -36,7 +36,6 @@ public class SfxrAudioPlayer : MonoBehaviour {
* @author Zeh Fernando * @author Zeh Fernando
*/ */
// Properties // Properties
private bool isDestroyed = false; // If true, this instance has been destroyed and shouldn't do anything yes 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) 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() { void Start() {
// Creates an empty audio source so this GameObject can receive audio events // Creates an empty audio source so this GameObject can receive audio events
AudioSource soundSource = gameObject.AddComponent<AudioSource>(); AudioSource soundSource = gameObject.AddComponent<AudioSource>();
soundSource.clip = null; // new AudioClip(); soundSource.clip = null;
soundSource.volume = 1f; soundSource.volume = 1f;
soundSource.pitch = 1f; soundSource.pitch = 1f;
soundSource.priority = 128; soundSource.priority = 128;

6
Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/IntegrationTestsRunnerWindow.cs

@ -59,8 +59,8 @@ namespace UnityTest
{ {
EditorApplication.hierarchyWindowItemOnGUI -= OnHierarchyWindowItemDraw; EditorApplication.hierarchyWindowItemOnGUI -= OnHierarchyWindowItemDraw;
EditorApplication.hierarchyWindowItemOnGUI += OnHierarchyWindowItemDraw; EditorApplication.hierarchyWindowItemOnGUI += OnHierarchyWindowItemDraw;
EditorApplication.hierarchyWindowChanged -= OnHierarchyChangeUpdate; EditorApplication.hierarchyChanged -= OnHierarchyChangeUpdate;
EditorApplication.hierarchyWindowChanged += OnHierarchyChangeUpdate; EditorApplication.hierarchyChanged += OnHierarchyChangeUpdate;
EditorApplication.update -= BackgroundSceneChangeWatch; EditorApplication.update -= BackgroundSceneChangeWatch;
EditorApplication.update += BackgroundSceneChangeWatch; EditorApplication.update += BackgroundSceneChangeWatch;
#if UNITY_2017_2_OR_NEWER #if UNITY_2017_2_OR_NEWER
@ -86,7 +86,7 @@ namespace UnityTest
{ {
EditorApplication.hierarchyWindowItemOnGUI -= OnHierarchyWindowItemDraw; EditorApplication.hierarchyWindowItemOnGUI -= OnHierarchyWindowItemDraw;
EditorApplication.update -= BackgroundSceneChangeWatch; EditorApplication.update -= BackgroundSceneChangeWatch;
EditorApplication.hierarchyWindowChanged -= OnHierarchyChangeUpdate; EditorApplication.hierarchyChanged -= OnHierarchyChangeUpdate;
#if UNITY_2017_2_OR_NEWER #if UNITY_2017_2_OR_NEWER
EditorApplication.playModeStateChanged -= OnPlaymodeStateChanged; EditorApplication.playModeStateChanged -= OnPlaymodeStateChanged;
#else #else

8
Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/PlatformRunner/PlayerSettingConfigurator.cs

@ -18,7 +18,7 @@ namespace UnityTest
private ResolutionDialogSetting m_DisplayResolutionDialog; private ResolutionDialogSetting m_DisplayResolutionDialog;
private bool m_RunInBackground; private bool m_RunInBackground;
private bool m_FullScreen; private FullScreenMode m_FullScreen;
private bool m_ResizableWindow; private bool m_ResizableWindow;
private readonly List<string> m_TempFileList = new List<string>(); private readonly List<string> m_TempFileList = new List<string>();
@ -35,8 +35,8 @@ namespace UnityTest
m_RunInBackground = PlayerSettings.runInBackground; m_RunInBackground = PlayerSettings.runInBackground;
PlayerSettings.runInBackground = true; PlayerSettings.runInBackground = true;
m_FullScreen = PlayerSettings.defaultIsFullScreen; m_FullScreen = PlayerSettings.fullScreenMode;
PlayerSettings.defaultIsFullScreen = false; PlayerSettings.fullScreenMode = FullScreenMode.Windowed;
m_ResizableWindow = PlayerSettings.resizableWindow; m_ResizableWindow = PlayerSettings.resizableWindow;
PlayerSettings.resizableWindow = true; PlayerSettings.resizableWindow = true;
@ -44,7 +44,7 @@ namespace UnityTest
public void RevertSettingsChanges() public void RevertSettingsChanges()
{ {
PlayerSettings.defaultIsFullScreen = m_FullScreen; PlayerSettings.fullScreenMode = m_FullScreen;
PlayerSettings.runInBackground = m_RunInBackground; PlayerSettings.runInBackground = m_RunInBackground;
PlayerSettings.displayResolutionDialog = m_DisplayResolutionDialog; PlayerSettings.displayResolutionDialog = m_DisplayResolutionDialog;
PlayerSettings.resizableWindow = m_ResizableWindow; PlayerSettings.resizableWindow = m_ResizableWindow;

0
UnityPackageManager/manifest.json → Packages/manifest.json

6
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: []

2
ProjectSettings/ProjectVersion.txt

@ -1 +1 @@
m_EditorVersion: 2017.4.0f1 m_EditorVersion: 2018.1.0f2

Loading…
Cancel
Save