Upgrade to Unity 2019.3 (#96)

Jamie Brynes · web-flow · commit f6627d14604e · 2020-03-30T17:50:53.000+01:00
diff --git a/.buildkite/premerge.steps.yaml b/.buildkite/premerge.steps.yaml
@@ -13,7 +13,7 @@ windows: &windows
     - "environment=production"
     - "permission_set=builder"
     - "platform=windows"
-    - "queue=v3-1570547724-22c6030099a0f41d-------z"
+    - "queue=${WINDOWS_BUILDER_QUEUE:-v4-20-03-27-114536-bk10005-d340403f-d}"
     - "scaler_version=2"
     - "minimum_instances=1"
     - "agent_count=1"
diff --git a/.buildkite/release-qa.steps.yaml b/.buildkite/release-qa.steps.yaml
@@ -13,7 +13,7 @@ common: &common
     - "environment=production"
     - "permission_set=builder"
     - "platform=windows"
-    - "queue=v3-1570547724-22c6030099a0f41d-------z"
+    - "queue=${WINDOWS_BUILDER_QUEUE:-v4-20-03-27-114536-bk10005-d340403f-d}"
     - "scaler_version=2"
     - "minimum_instances=1"
     - "agent_count=1"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,16 +2,21 @@
 
 ## Unreleased
 
-## `0.3.4` - 2020-03-25
+### Breaking Changes
 
-### Changed
+- The Blank Project now requires Unity 2019.3. [#96](https://github.com/spatialos/gdk-for-unity-blank-project/pull/96)
+
+## `0.3.4` - 2020-03-25
 
-- Upgraded to GDK for Unity version `0.3.4`
 ### Breaking Changes
 
 - The blank project now uses [query-based interest](https://docs.improbable.io/reference/14.4/shared/authority-and-interest/interest/query-based-interest-qbi) instead of [chunk-based interest](https://docs.improbable.io/reference/14.4/shared/authority-and-interest/interest/chunk-based-interest-cbi). [#89](https://github.com/spatialos/gdk-for-unity-blank-project/pull/89)
 - You must now pass in an `EntityId` to create a player `EntityTemplate`. [#90](https://github.com/spatialos/gdk-for-unity-blank-project/pull/90)
 
+### Changed
+
+- Upgraded to GDK for Unity version `0.3.4`.
+
 ## `0.3.3` - 2020-02-14
 
 ### Changed
diff --git a/gdk.pinned b/gdk.pinned
@@ -1 +1 @@
-develop 4b725e86bf5c9bc73e799a7a4d211e36fc5b7ec6
+develop 79dc4b1c77fdf58ba082dc448d6519462cec7159
diff --git a/workers/unity/Assets/BlankProject/Scripts/Config.meta b/workers/unity/Assets/BlankProject/Scripts/Config.meta
diff --git a/workers/unity/Assets/BlankProject/Scripts/Config/EntityTemplates.cs.meta b/workers/unity/Assets/BlankProject/Scripts/Config/EntityTemplates.cs.meta
diff --git a/workers/unity/Assets/Scenes/ClientScene.unity b/workers/unity/Assets/Scenes/ClientScene.unity
@@ -94,8 +94,9 @@ LightmapSettings:
     m_PVRFilteringAtrousPositionSigmaDirect: 0.5
     m_PVRFilteringAtrousPositionSigmaIndirect: 2
     m_PVRFilteringAtrousPositionSigmaAO: 1
-    m_ShowResolutionOverlay: 1
     m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
   m_LightingDataAsset: {fileID: 0}
   m_UseShadowmask: 1
 --- !u!196 &4
@@ -228,8 +229,9 @@ Light:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1978274002}
   m_Enabled: 1
-  serializedVersion: 9
+  serializedVersion: 10
   m_Type: 1
+  m_Shape: 0
   m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
   m_Intensity: 1
   m_Range: 10
diff --git a/workers/unity/Assets/Scenes/DevelopmentScene.unity b/workers/unity/Assets/Scenes/DevelopmentScene.unity
@@ -94,8 +94,9 @@ LightmapSettings:
     m_PVRFilteringAtrousPositionSigmaDirect: 0.5
     m_PVRFilteringAtrousPositionSigmaIndirect: 2
     m_PVRFilteringAtrousPositionSigmaAO: 1
-    m_ShowResolutionOverlay: 1
     m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
   m_LightingDataAsset: {fileID: 0}
   m_UseShadowmask: 1
 --- !u!196 &4
@@ -145,8 +146,9 @@ Light:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 170076733}
   m_Enabled: 1
-  serializedVersion: 9
+  serializedVersion: 10
   m_Type: 1
+  m_Shape: 0
   m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
   m_Intensity: 1
   m_Range: 10
diff --git a/workers/unity/Assets/Scenes/GameLogicScene.unity b/workers/unity/Assets/Scenes/GameLogicScene.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -94,8 +94,9 @@ LightmapSettings:
     m_PVRFilteringAtrousPositionSigmaDirect: 0.5
     m_PVRFilteringAtrousPositionSigmaIndirect: 2
     m_PVRFilteringAtrousPositionSigmaAO: 1
-    m_ShowResolutionOverlay: 1
     m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
   m_LightingDataAsset: {fileID: 0}
   m_UseShadowmask: 1
 --- !u!196 &4
diff --git a/workers/unity/Assets/Scenes/MobileClientScene.unity b/workers/unity/Assets/Scenes/MobileClientScene.unity
@@ -94,8 +94,9 @@ LightmapSettings:
     m_PVRFilteringAtrousPositionSigmaDirect: 0.5
     m_PVRFilteringAtrousPositionSigmaIndirect: 2
     m_PVRFilteringAtrousPositionSigmaAO: 1
-    m_ShowResolutionOverlay: 1
     m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
   m_LightingDataAsset: {fileID: 0}
   m_UseShadowmask: 1
 --- !u!196 &4
@@ -145,8 +146,9 @@ Light:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 626948022}
   m_Enabled: 1
-  serializedVersion: 9
+  serializedVersion: 10
   m_Type: 1
+  m_Shape: 0
   m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
   m_Intensity: 1
   m_Range: 10
diff --git a/workers/unity/Packages/manifest.json b/workers/unity/Packages/manifest.json
@@ -1,23 +1,22 @@
 {
   "dependencies": {
     "com.unity.ads": "2.0.8",
-    "com.unity.analytics": "3.3.2",
-    "com.unity.ide.rider": "1.0.8",
-    "com.unity.package-manager-ui": "2.2.0",
+    "com.unity.analytics": "3.3.5",
+    "com.unity.ide.rider": "1.1.4",
     "com.unity.purchasing": "2.0.6",
-    "com.unity.test-framework": "1.0.13",
+    "com.unity.test-framework": "1.1.11",
     "com.unity.textmeshpro": "2.0.1",
-    "com.unity.timeline": "1.1.0",
+    "com.unity.timeline": "1.2.10",
     "com.unity.ugui": "1.0.0",
-    "com.unity.xr.legacyinputhelpers": "2.0.2",
+    "com.unity.xr.legacyinputhelpers": "2.0.8",
     "io.improbable.gdk.buildsystem": "0.3.4",
     "io.improbable.gdk.core": "0.3.4",
     "io.improbable.gdk.debug": "0.3.4",
     "io.improbable.gdk.deploymentlauncher": "0.3.4",
     "io.improbable.gdk.gameobjectcreation": "0.3.4",
-    "io.improbable.gdk.querybasedinteresthelper": "0.3.4",
     "io.improbable.gdk.mobile": "0.3.4",
     "io.improbable.gdk.playerlifecycle": "0.3.4",
+    "io.improbable.gdk.querybasedinteresthelper": "0.3.4",
     "io.improbable.gdk.testutils": "0.3.4",
     "io.improbable.gdk.tools": "0.3.4",
     "io.improbable.gdk.transformsynchronization": "0.3.4",
@@ -62,4 +61,4 @@
       ]
     }
   ]
-}
+}
diff --git a/workers/unity/ProjectSettings/AudioManager.asset b/workers/unity/ProjectSettings/AudioManager.asset
@@ -3,6 +3,7 @@
 --- !u!11 &1
 AudioManager:
   m_ObjectHideFlags: 0
+  serializedVersion: 2
   m_Volume: 1
   Rolloff Scale: 1
   Doppler Factor: 1
@@ -15,3 +16,4 @@ AudioManager:
   m_AmbisonicDecoderPlugin: 
   m_DisableAudio: 0
   m_VirtualizeEffects: 1
+  m_RequestedDSPBufferSize: 1024
diff --git a/workers/unity/ProjectSettings/DynamicsManager.asset b/workers/unity/ProjectSettings/DynamicsManager.asset
@@ -3,7 +3,7 @@
 --- !u!55 &1
 PhysicsManager:
   m_ObjectHideFlags: 0
-  serializedVersion: 7
+  serializedVersion: 13
   m_Gravity: {x: 0, y: -9.81, z: 0}
   m_DefaultMaterial: {fileID: 0}
   m_BounceThreshold: 2
@@ -20,10 +20,17 @@ PhysicsManager:
   m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
   m_AutoSimulation: 1
   m_AutoSyncTransforms: 1
+  m_ReuseCollisionCallbacks: 0
   m_ClothInterCollisionSettingsToggle: 0
+  m_ClothGravity: {x: 0, y: -9.81, z: 0}
   m_ContactPairsMode: 0
   m_BroadphaseType: 0
   m_WorldBounds:
     m_Center: {x: 0, y: 0, z: 0}
     m_Extent: {x: 250, y: 250, z: 250}
   m_WorldSubdivisions: 8
+  m_FrictionType: 0
+  m_EnableEnhancedDeterminism: 0
+  m_EnableUnifiedHeightmaps: 1
+  m_SolverType: 0
+  m_DefaultMaxAngularSpeed: 7
diff --git a/workers/unity/ProjectSettings/EditorSettings.asset b/workers/unity/ProjectSettings/EditorSettings.asset
@@ -3,20 +3,33 @@
 --- !u!159 &1
 EditorSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 7
+  serializedVersion: 9
   m_ExternalVersionControlSupport: Visible Meta Files
   m_SerializationMode: 2
   m_LineEndingsForNewScripts: 2
   m_DefaultBehaviorMode: 0
+  m_PrefabRegularEnvironment: {fileID: 0}
+  m_PrefabUIEnvironment: {fileID: 0}
   m_SpritePackerMode: 0
   m_SpritePackerPaddingPower: 1
   m_EtcTextureCompressorBehavior: 1
   m_EtcTextureFastCompressor: 1
   m_EtcTextureNormalCompressor: 2
   m_EtcTextureBestCompressor: 4
-  m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef
+  m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;asmref
   m_ProjectGenerationRootNamespace: 
-  m_UserGeneratedProjectSuffix: 
   m_CollabEditorSettings:
     inProgressEnabled: 1
+  m_EnableTextureStreamingInEditMode: 1
   m_EnableTextureStreamingInPlayMode: 1
+  m_AsyncShaderCompilation: 1
+  m_EnterPlayModeOptionsEnabled: 0
+  m_EnterPlayModeOptions: 3
+  m_ShowLightmapResolutionOverlay: 1
+  m_UseLegacyProbeSampleCount: 1
+  m_AssetPipelineMode: 1
+  m_CacheServerMode: 0
+  m_CacheServerEndpoint: 
+  m_CacheServerNamespacePrefix: default
+  m_CacheServerEnableDownload: 1
+  m_CacheServerEnableUpload: 1
diff --git a/workers/unity/ProjectSettings/GraphicsSettings.asset b/workers/unity/ProjectSettings/GraphicsSettings.asset
@@ -3,7 +3,7 @@
 --- !u!30 &1
 GraphicsSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 12
+  serializedVersion: 13
   m_Deferred:
     m_Mode: 1
     m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
@@ -61,3 +61,5 @@ GraphicsSettings:
   m_AlbedoSwatchInfos: []
   m_LightsUseLinearIntensity: 0
   m_LightsUseColorTemperature: 0
+  m_LogWhenShaderIsCompiled: 0
+  m_AllowEnlightenSupportForUpgradedProject: 1
diff --git a/workers/unity/ProjectSettings/Physics2DSettings.asset b/workers/unity/ProjectSettings/Physics2DSettings.asset
@@ -3,7 +3,7 @@
 --- !u!19 &1
 Physics2DSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 3
+  serializedVersion: 4
   m_Gravity: {x: 0, y: -9.81}
   m_DefaultMaterial: {fileID: 0}
   m_VelocityIterations: 8
@@ -19,11 +19,30 @@ Physics2DSettings:
   m_LinearSleepTolerance: 0.01
   m_AngularSleepTolerance: 2
   m_DefaultContactOffset: 0.01
+  m_JobOptions:
+    serializedVersion: 2
+    useMultithreading: 0
+    useConsistencySorting: 0
+    m_InterpolationPosesPerJob: 100
+    m_NewContactsPerJob: 30
+    m_CollideContactsPerJob: 100
+    m_ClearFlagsPerJob: 200
+    m_ClearBodyForcesPerJob: 200
+    m_SyncDiscreteFixturesPerJob: 50
+    m_SyncContinuousFixturesPerJob: 50
+    m_FindNearestContactsPerJob: 100
+    m_UpdateTriggerContactsPerJob: 100
+    m_IslandSolverCostThreshold: 100
+    m_IslandSolverBodyCostScale: 1
+    m_IslandSolverContactCostScale: 10
+    m_IslandSolverJointCostScale: 10
+    m_IslandSolverBodiesPerJob: 50
+    m_IslandSolverContactsPerJob: 50
   m_AutoSimulation: 1
   m_QueriesHitTriggers: 1
   m_QueriesStartInColliders: 1
-  m_ChangeStopsCallbacks: 0
   m_CallbacksOnDisable: 1
+  m_ReuseCollisionCallbacks: 0
   m_AutoSyncTransforms: 1
   m_AlwaysShowColliders: 0
   m_ShowColliderSleep: 1
diff --git a/workers/unity/ProjectSettings/PresetManager.asset b/workers/unity/ProjectSettings/PresetManager.asset
@@ -3,25 +3,29 @@
 --- !u!1386491679 &1
 PresetManager:
   m_ObjectHideFlags: 0
-  m_DefaultList:
-  - type:
-      m_NativeTypeID: 108
-      m_ManagedTypePPtr: {fileID: 0}
-      m_ManagedTypeFallback: 
-    defaultPresets:
-    - m_Preset: {fileID: 2655988077585873504, guid: c1cf8506f04ef2c4a88b64b6c4202eea,
-        type: 2}
-  - type:
+  serializedVersion: 2
+  m_DefaultPresets:
+  - first:
       m_NativeTypeID: 1020
       m_ManagedTypePPtr: {fileID: 0}
       m_ManagedTypeFallback: 
-    defaultPresets:
+    second:
     - m_Preset: {fileID: 2655988077585873504, guid: 0cd792cc87e492d43b4e95b205fc5cc6,
         type: 2}
-  - type:
+      m_Filter: 
+  - first:
       m_NativeTypeID: 1006
       m_ManagedTypePPtr: {fileID: 0}
       m_ManagedTypeFallback: 
-    defaultPresets:
+    second:
     - m_Preset: {fileID: 2655988077585873504, guid: 7a99f8aa944efe94cb9bd74562b7d5f9,
         type: 2}
+      m_Filter: 
+  - first:
+      m_NativeTypeID: 108
+      m_ManagedTypePPtr: {fileID: 0}
+      m_ManagedTypeFallback: 
+    second:
+    - m_Preset: {fileID: 2655988077585873504, guid: c1cf8506f04ef2c4a88b64b6c4202eea,
+        type: 2}
+      m_Filter: 
diff --git a/workers/unity/ProjectSettings/ProjectSettings.asset b/workers/unity/ProjectSettings/ProjectSettings.asset
diff --git a/workers/unity/ProjectSettings/ProjectVersion.txt b/workers/unity/ProjectSettings/ProjectVersion.txt
diff --git a/workers/unity/ProjectSettings/QualitySettings.asset b/workers/unity/ProjectSettings/QualitySettings.asset
diff --git a/workers/unity/ProjectSettings/VFXManager.asset b/workers/unity/ProjectSettings/VFXManager.asset

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-develop 4b725e86bf5c9bc73e799a7a4d211e36fc5b7ec6`
	`1`	`+develop 79dc4b1c77fdf58ba082dc448d6519462cec7159`