new PlayMaker version

Assets/PlayMaker/ConditionalExpression.dll.meta

@@ -13,6 +13,10 @@ PluginImporter:
       enabled: 0
       settings:
         DefaultValueInitialized: true
+    WindowsStoreApps:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/PlayMaker/Editor/ConditionalExpressionEditor.dll.meta

@@ -13,6 +13,10 @@ PluginImporter:
       enabled: 1
       settings:
         DefaultValueInitialized: true
+    WindowsStoreApps:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/PlayMaker/Editor/Install/PlayMaker.1.7.8.4.unitypackage.meta

@@ -1,8 +1,4 @@
-fileFormatVersion: 2
+fileFormatVersion: 2
-guid: dd583cbbf618ba54983cdf396b28e49b
+guid: dd583cbbf618ba54983cdf396b28e49b
-timeCreated: 1434821796
+DefaultImporter:
-licenseType: Store
+  userData: 
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/PlayMaker/Editor/Install/Playmaker.1.8.0.unitypackage.meta

@@ -1,8 +1,4 @@
-fileFormatVersion: 2
+fileFormatVersion: 2
-guid: f982487afa4f0444ea11e90a9d05b94e
+guid: f982487afa4f0444ea11e90a9d05b94e
-timeCreated: 1434775225
+DefaultImporter:
-licenseType: Store
+  userData: 
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/PlayMaker/Editor/PlayMakerEditor.dll.meta

@@ -13,6 +13,10 @@ PluginImporter:
       enabled: 1
       settings:
         DefaultValueInitialized: true
+    WindowsStoreApps:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/PlayMaker/Editor/PlayMakerEditorResources.dll.meta

@@ -13,6 +13,10 @@ PluginImporter:
       enabled: 1
       settings:
         DefaultValueInitialized: true
+    WindowsStoreApps:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/PlayMaker/Editor/PlayMakerWelcomeWindow.cs

@@ -18,7 +18,7 @@ namespace HutongGames.PlayMakerEditor
     public class PlayMakerWelcomeWindow : EditorWindow
     {
         private const string installCurrentVersion = "1.7.8.4";
-        private const string installBetaVersion = "1.8.0 BETA RC35";
+        private const string installBetaVersion = "1.8.0 BETA RC37";
 
         private const string editorPrefsShowAtStartup = "PlayMaker.ShowWelcomeScreen.1.7.8.4"; // Add version to ensure first time open
         private const string editorPrefsSavedPage = "PlayMaker.WelcomeScreenPage";

Assets/PlayMaker/Editor/de/PlayMakerEditor.de.resources.dll.meta

@@ -1,7 +1,22 @@
 fileFormatVersion: 2
 guid: 95b145b64a3889b4ca78f8100839c9dc
-MonoAssemblyImporter:
+PluginImporter:
   serializedVersion: 1
   iconMap: {}
   executionOrder: {}
+  isPreloaded: 0
+  platformData:
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+    WindowsStoreApps:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/PlayMaker/Editor/es-ES/PlayMakerEditor.es-ES.resources.dll.meta

@@ -1,7 +1,22 @@
 fileFormatVersion: 2
 guid: 519359e55debe8845a68a0e0ff935e16
-MonoAssemblyImporter:
+PluginImporter:
   serializedVersion: 1
   iconMap: {}
   executionOrder: {}
+  isPreloaded: 0
+  platformData:
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+    WindowsStoreApps:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/PlayMaker/Editor/fr/PlayMakerEditor.fr.resources.dll.meta

@@ -1,7 +1,22 @@
 fileFormatVersion: 2
 guid: e47236d35f408df498a319746efab596
-MonoAssemblyImporter:
+PluginImporter:
   serializedVersion: 1
   iconMap: {}
   executionOrder: {}
+  isPreloaded: 0
+  platformData:
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+    WindowsStoreApps:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/PlayMaker/Editor/it/PlayMakerEditor.it.resources.dll.meta

@@ -1,7 +1,22 @@
 fileFormatVersion: 2
 guid: 7000414ace5effa4cab99f751c0ddc65
-MonoAssemblyImporter:
+PluginImporter:
   serializedVersion: 1
   iconMap: {}
   executionOrder: {}
+  isPreloaded: 0
+  platformData:
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+    WindowsStoreApps:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/PlayMaker/Editor/ja/PlayMakerEditor.ja.resources.dll.meta

@@ -1,7 +1,22 @@
 fileFormatVersion: 2
 guid: d3f0148c4d46a0b4a95d717f910900a5
-MonoAssemblyImporter:
+PluginImporter:
   serializedVersion: 1
   iconMap: {}
   executionOrder: {}
+  isPreloaded: 0
+  platformData:
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+    WindowsStoreApps:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/PlayMaker/Editor/nl/PlayMakerEditor.nl.resources.dll.meta

@@ -1,7 +1,22 @@
 fileFormatVersion: 2
 guid: bab910be097f3e24fbf4e77451ea6b24
-MonoAssemblyImporter:
+PluginImporter:
   serializedVersion: 1
   iconMap: {}
   executionOrder: {}
+  isPreloaded: 0
+  platformData:
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+    WindowsStoreApps:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/PlayMaker/Editor/pt-BR/PlayMakerEditor.pt-BR.resources.dll.meta

@@ -1,7 +1,22 @@
 fileFormatVersion: 2
 guid: 72db74579eb0aa24aaf2989374f99303
-MonoAssemblyImporter:
+PluginImporter:
   serializedVersion: 1
   iconMap: {}
   executionOrder: {}
+  isPreloaded: 0
+  platformData:
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+    WindowsStoreApps:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/PlayMaker/Editor/sv-SE/PlayMakerEditor.sv-SE.resources.dll.meta

@@ -1,7 +1,22 @@
 fileFormatVersion: 2
 guid: 9bf7a4151eb9ade47a2d9f8607773b80
-MonoAssemblyImporter:
+PluginImporter:
   serializedVersion: 1
   iconMap: {}
   executionOrder: {}
+  isPreloaded: 0
+  platformData:
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+    WindowsStoreApps:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/PlayMaker/Editor/zh-CN/PlayMakerEditor.zh-CN.resources.dll.meta

@@ -1,7 +1,22 @@
 fileFormatVersion: 2
 guid: 45cf97bfa74384b41b4ed44acdce63da
-MonoAssemblyImporter:
+PluginImporter:
   serializedVersion: 1
   iconMap: {}
   executionOrder: {}
+  isPreloaded: 0
+  platformData:
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+    WindowsStoreApps:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/PlayMaker/Editor/zh-TW/PlayMakerEditor.zh-TW.resources.dll.meta

@@ -1,7 +1,22 @@
 fileFormatVersion: 2
 guid: 3741839e25a749b4b96666c2d7d391b2
-MonoAssemblyImporter:
+PluginImporter:
   serializedVersion: 1
   iconMap: {}
   executionOrder: {}
+  isPreloaded: 0
+  platformData:
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 1
+      settings:
+        DefaultValueInitialized: true
+    WindowsStoreApps:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
   userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/PlayMaker/UpdateHelper.cs

@@ -1,11 +1,16 @@
 // Small helper class to allow Fsm to call SetDirty
 // Fsm is inside dll so cannot use #if UNITY_EDITOR
 
-using UnityEngine;
+#if (UNITY_4_3 || UNITY_4_5 || UNITY_4_6)
-#if UNITY_EDITOR
+#define UNITY_PRE_5_0
-using UnityEditor;
 #endif
 
+#if (UNITY_4_3 || UNITY_4_5 || UNITY_4_6 || UNITY_5_0 || UNITY_5_1 || UNITY_5_2)
+#define UNITY_PRE_5_3
+#endif
+
+using UnityEngine;
+
 namespace HutongGames.PlayMaker
 {
     /// <summary>
@@ -19,20 +24,25 @@ namespace HutongGames.PlayMaker
 #if UNITY_EDITOR
 
             if (fsm == null || fsm.OwnerObject == null) return;
-            
+
             //Debug.Log("SetDirty: " + FsmUtility.GetFullFsmLabel(fsm));
-            
+
             fsm.Preprocessed = false; // force pre-process to run again
 
             if (fsm.UsedInTemplate != null)
             {
-                EditorUtility.SetDirty(fsm.UsedInTemplate);
+                UnityEditor.EditorUtility.SetDirty(fsm.UsedInTemplate);
             }
             else if (fsm.Owner != null)
             {
-                EditorUtility.SetDirty(fsm.Owner);
+                UnityEditor.EditorUtility.SetDirty(fsm.Owner);
+#if !UNITY_PRE_5_3
+                UnityEditor.SceneManagement.EditorSceneManager.MarkSceneDirty(fsm.Owner.gameObject.scene);
+#elif !UNITY_PRE_5_0
+                // Not sure if we need to do this...?
+                UnityEditor.EditorApplication.MarkSceneDirty();
+#endif
             }
-
 #endif
         }
     }