Update to unity 2017.2

nihohit · Oct 14, 2017 · 6744d0a · 6744d0a
1 parent f6e7b9a
commit 6744d0a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/God Game/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Batch.cs b/God Game/Assets/UnityTestTools/IntegrationTestsFramework/TestRunner/Editor/Batch.cs
@@ -68,12 +68,12 @@ private static void BuildAndRun(BuildTarget target, List<string> testScenes, Lis
                 port = port
             };
 
-            if (Application.isWebPlayer)
-            {
-                config.sendResultsOverNetwork = false;
-                Debug.Log("You can't use WebPlayer as active platform for running integration tests. Switching to Standalone");
-                EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTarget.StandaloneWindows);
-            }
+            //if (Application.isWebPlayer)
+            //{
+            //    config.sendResultsOverNetwork = false;
+            //    Debug.Log("You can't use WebPlayer as active platform for running integration tests. Switching to Standalone");
+            //    EditorUserBuildSettings.SwitchActiveBuildTarget(BuildTarget.StandaloneWindows);
+            //}
 
             PlatformRunner.BuildAndRunInPlayer(config);
         }

diff --git a/God Game/ProjectSettings/DynamicsManager.asset b/God Game/ProjectSettings/DynamicsManager.asset
@@ -17,3 +17,4 @@ PhysicsManager:
   m_EnablePCM: 1
   m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
   m_AutoSimulation: 1
+  m_AutoSyncTransforms: 1
diff --git a/God Game/ProjectSettings/Physics2DSettings.asset b/God Game/ProjectSettings/Physics2DSettings.asset
@@ -24,6 +24,7 @@ Physics2DSettings:
   m_QueriesStartInColliders: 1
   m_ChangeStopsCallbacks: 0
   m_CallbacksOnDisable: 1
+  m_AutoSyncTransforms: 1
   m_AlwaysShowColliders: 0
   m_ShowColliderSleep: 1
   m_ShowColliderContacts: 0

diff --git a/God Game/ProjectSettings/ProjectVersion.txt b/God Game/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2017.1.0f3
+m_EditorVersion: 2017.2.0f3
diff --git a/God Game/UnityPackageManager/manifest.json b/God Game/UnityPackageManager/manifest.json
@@ -0,0 +1,4 @@
+{
+	"dependencies": {
+	}
+}