Squashed commit of the following:

commit a5da8beebf969b462559cc513b3e24948e41c7f2
Author: Andre McGrail <andrem@unity3d.com>
Date:   Mon Jan 18 11:24:23 2021 +0100

    pipeline assets updated

commit b20218652b58f34ca9f4e07410a1258cf379ada4
Author: Andre McGrail <andrem@unity3d.com>
Date:   Mon Jan 18 11:24:04 2021 +0100

    Added debug mode for boat testing

commit 735aaf50ef1db3ba61eac12a43a32648f79a77ad
Merge: f95ad59 d07745c
Author: Andre McGrail <andrem@unity3d.com>
Date:   Mon Jan 18 11:23:24 2021 +0100

    Merge branch 'master' of https://github.com/Unity-Technologies/BoatAttack

commit d07745c0d9bc97cde5fc4ae86186d6c2f0c2a16c
Author: Felipe Lira <felipedrl@gmail.com>
Date:   Thu Jan 7 16:48:52 2021 +0100

    Fix usage of UNITY_REVERSED_Z (#134)

commit f95ad59351cd51c6011ce913924674c28f9bc230
Author: Andre McGrail <andrem@unity3d.com>
Date:   Tue Dec 22 11:08:30 2020 +0100

    demo scene default

commit 22ec6b165614e081f66273a7ea0af1e582a41cd7
Author: Andre McGrail <an...

Assets/Data/UniversalRP/PipelineAsset_High.asset

   m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
   m_Name: PipelineAsset_High
   m_EditorClassIdentifier: 
-  k_AssetVersion: 5
+  k_AssetVersion: 6
   k_AssetPreviousVersion: 5
   m_RendererType: 0
   m_RendererData: {fileID: 11400000, guid: fa301df1a78cf4a9ebe2a3139dc8be8f, type: 2}
   m_MainLightRenderingMode: 1
   m_MainLightShadowsSupported: 1
   m_MainLightShadowmapResolution: 4096
-  m_AdditionalLightsRenderingMode: 0
+  m_AdditionalLightsRenderingMode: 1
-  m_AdditionalLightsShadowmapResolution: 1024
+  m_AdditionalLightsShadowmapResolution: 2048
-  m_ShadowCascades: 2
+  m_ShadowCascadeCount: 4
+  m_Cascade3Split: {x: 0.1, y: 0.3}
   m_Cascade4Split: {x: 0.053413056, y: 0.13206536, z: 0.42623913}
   m_ShadowDepthBias: 0.75
   m_ShadowNormalBias: 0.75
   m_MaxPixelLights: 0
   m_ShadowAtlasResolution: 256
   m_ShaderVariantLogLevel: 0
+  m_ShadowCascades: 2

Assets/Data/UniversalRP/PipelineAsset_Low.asset

   m_Script: {fileID: 11500000, guid: bf2edee5c58d82540a51f03df9d42094, type: 3}
   m_Name: PipelineAsset_Low
   m_EditorClassIdentifier: 
-  k_AssetVersion: 5
+  k_AssetVersion: 6
   k_AssetPreviousVersion: 5
   m_RendererType: 0
   m_RendererData: {fileID: 11400000, guid: fa301df1a78cf4a9ebe2a3139dc8be8f, type: 2}
   m_MainLightRenderingMode: 1
   m_MainLightShadowsSupported: 1
   m_MainLightShadowmapResolution: 1024
-  m_AdditionalLightsRenderingMode: 0
+  m_AdditionalLightsRenderingMode: 1
-  m_ShadowCascades: 0
+  m_ShadowCascadeCount: 1
+  m_Cascade3Split: {x: 0.1, y: 0.3}
   m_Cascade4Split: {x: 0.053413056, y: 0.13206536, z: 0.42623913}
   m_ShadowDepthBias: 0.75
   m_ShadowNormalBias: 0.75
   m_MaxPixelLights: 0
   m_ShadowAtlasResolution: 256
   m_ShaderVariantLogLevel: 0
+  m_ShadowCascades: 0

Assets/Data/UniversalRP/PipelineAsset_Medium.asset

   m_MainLightRenderingMode: 1
   m_MainLightShadowsSupported: 1
   m_MainLightShadowmapResolution: 2048
-  m_AdditionalLightsRenderingMode: 0
+  m_AdditionalLightsRenderingMode: 1
   m_AdditionalLightsPerObjectLimit: 8
   m_AdditionalLightShadowsSupported: 1
   m_AdditionalLightsShadowmapResolution: 1024

Assets/Materials/BlackoutBackface.mat

   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 3
+  version: 4

Assets/Materials/Blocker.mat

   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 3
+  version: 4

Assets/Materials/BushTest.mat

   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 3
+  version: 4

Assets/Materials/Seaweed.mat

   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 3
+  version: 4

Assets/Materials/Splash.mat

   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 3
+  version: 4
 --- !u!21 &2100000
 Material:
   serializedVersion: 6

Assets/Materials/StudioLight.mat

   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 3
+  version: 4
 --- !u!21 &2100000
 Material:
   serializedVersion: 6

Assets/Materials/StudioLight_Bright.mat

   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 3
+  version: 4
 --- !u!21 &2100000
 Material:
   serializedVersion: 6

Assets/Materials/Terrain.mat

   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 3
+  version: 4
 --- !u!21 &2100000
 Material:
   serializedVersion: 6

Assets/Objects/environment/Cliffs/Materials/Env_Cliff_Full_01.mat

         m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_a490b3241735d68e9ee2d1f1bbfed8dc_Texture_1:
+        m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_6E11FCEA: 0.8
     - Vector1_8B35DE98: 65

Assets/Objects/environment/Cliffs/Materials/Env_Cliffs.mat

         m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_a490b3241735d68e9ee2d1f1bbfed8dc_Texture_1:
+        m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_6E11FCEA: 0.8
     - Vector1_8B35DE98: 65

Assets/Objects/environment/Cliffs/Materials/Env_HeroCave.mat

         m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_a490b3241735d68e9ee2d1f1bbfed8dc_Texture_1:
+        m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_6E11FCEA: 0.8
     - Vector1_8B35DE98: 65

Assets/Objects/environment/Cliffs/Materials/Env_HeroLarge.mat

         m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_a490b3241735d68e9ee2d1f1bbfed8dc_Texture_1:
+        m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_6E11FCEA: 0.8
     - Vector1_8B35DE98: 65

Assets/Objects/environment/Cliffs/Materials/Env_Rocks.mat

         m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _SampleTexture2D_a490b3241735d68e9ee2d1f1bbfed8dc_Texture_1:
+        m_Texture: {fileID: 2800000, guid: 0732d346e038a499bacca628b5dc8f4a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     m_Floats:
     - Vector1_6E11FCEA: 0.8
     - Vector1_8B35DE98: 65

Assets/Objects/props/props/Materials/Matr_Props.mat

   m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  version: 3
+  version: 4
 --- !u!21 &2100000
 Material:
   serializedVersion: 6

Assets/Scripts/Boat/Boat.cs

         private static readonly int LiveryPrimary = Shader.PropertyToID("_Color1");
         private static readonly int LiveryTrim = Shader.PropertyToID("_Color2");
 
+        // debug
+        [SerializeField] internal bool debugControl = false;
+
+            if (debugControl)
+            {
+                Setup(1, true, RandomLivery());
+            }
             _spawnPosition = transform.localToWorldMatrix;
             TryGetComponent(out engine.RB);
         }
 
         private void Update()
         {
-            UpdateLaps();
+            if (RaceManager.RaceStarted)
+            {
+                UpdateLaps();
-            if (RaceUi)
-            {
-                RaceUi.UpdatePlaceCounter(Place);
-                RaceUi.UpdateSpeed(engine.VelocityMag);
+                if (RaceUi)
+                {
+                    RaceUi.UpdatePlaceCounter(Place);
+                    RaceUi.UpdateSpeed(engine.VelocityMag);
+                }
             }
         }
 
         {
             if (!RaceManager.RaceStarted)
             {
-                // race not started, make sure to keep boat fairly aligned.
-                var target = WaypointGroup.Instance.StartingPositions[_playerIndex];
-                Vector3 targetPosition = target.GetColumn(3);
-                Vector3 targetForward = target.GetColumn(2);
-                var t = transform;
-                var currentPosition = t.position;
-                var currentForward = t.forward;
+                if(WaypointGroup.Instance) AlignBoatWithStartingLine();
+            }
+        }
-                targetPosition.y = currentPosition.y;
-                engine.RB.AddForce((currentPosition - targetPosition) * 0.25f);
+        private void AlignBoatWithStartingLine()
+        {
+            // race not started, make sure to keep boat fairly aligned.
+            var target = WaypointGroup.Instance.StartingPositions[_playerIndex];
+            Vector3 targetPosition = target.GetColumn(3);
+            Vector3 targetForward = target.GetColumn(2);
+            var t = transform;
+            var currentPosition = t.position;
+            var currentForward = t.forward;
-                engine.RB.MoveRotation(Quaternion.LookRotation(Vector3.Slerp(currentForward, targetForward, 0.1f * Time.fixedDeltaTime)));
+            targetPosition.y = currentPosition.y;
+            engine.RB.AddForce((currentPosition - targetPosition) * 0.25f);
-            }
+            engine.RB.MoveRotation(Quaternion.LookRotation(Vector3.Slerp(currentForward, targetForward, 0.1f * Time.fixedDeltaTime)));
         }
 
         private void UpdateLaps()
         [ContextMenu("Randomize")]
         private void ColorizeInvoke()
         {
-            Colorize(Color.black, Color.black, true);
+            Colorize(RandomLivery());
-        private void Colorize(Color primaryColor, Color trimColor, bool random = false)
+        private void Colorize(Color primaryColor, Color trimColor)
-                primaryColor = random ? ConstantData.GetRandomPaletteColor : primaryColor,
-                trimColor = random ? ConstantData.GetRandomPaletteColor : trimColor
+                primaryColor = primaryColor,
+                trimColor = trimColor
             };
             Colorize(livery);
         }
                 engine.RB.position = resetPoint;
                 engine.RB.rotation = resetMatrix.rotation;
             }
+        }
+
+        BoatLivery RandomLivery()
+        {
+            var livery = new BoatLivery
+            {
+                primaryColor = ConstantData.GetRandomPaletteColor,
+                trimColor = ConstantData.GetRandomPaletteColor
+            };
+            return livery;
         }
     }
 

Assets/Scripts/Editor/BoatControllerEditor.cs

                 }
                 EditorGUILayout.EndVertical();
 
-
                 EditorGUI.indentLevel--;
             }
             EditorGUILayout.EndFoldoutHeaderGroup();

Packages/com.verasl.water-system/Shaders/WaterCommon.hlsl

 {
 	float rawD = SAMPLE_DEPTH_TEXTURE(_CameraDepthTexture, sampler_ScreenTextures_linear_clamp, uvs);
 	float d = LinearEyeDepth(rawD, _ZBufferParams);
-	return float2(d * additionalData.x - additionalData.y, (rawD * -_ProjectionParams.x) + (1-UNITY_REVERSED_Z));
+
+	// TODO: Changing the usage of UNITY_REVERSED_Z this way to fix testing, but I'm not sure the original code is correct anyway.
+	// In OpenGL, rawD should already have be remmapped before converting depth to linear eye depth.
+#if UNITY_REVERSED_Z
+	float offset = 0;
+#else
+	float offset = 1;
+#endif
+	
+ 	return float2(d * additionalData.x - additionalData.y, (rawD * -_ProjectionParams.x) + offset);
 }
 
 float WaterTextureDepth(float3 posWS)
 	IN.normal += half3(1-waterFX.y, 0.5h, 1-waterFX.z) - 0.5;
 	IN.normal = normalize(IN.normal);
 
+    // Distortion
+	half2 distortion = DistortionUVs(depth.x, IN.normal);
+	distortion = screenUV.xy + distortion;// * clamp(depth.x, 0, 5);
+	float d = depth.x;
+	depth.xz = AdjustedDepth(distortion, IN.additionalData);
+	distortion = depth.x < 0 ? screenUV.xy : distortion;
+	depth.x = depth.x < 0 ? d : depth.x;
+
+    // Fresnel
+	half fresnelTerm = CalculateFresnelTerm(IN.normal, IN.viewDir.xyz);
+	//return fresnelTerm.xxxx;
+
-    half shadow = SoftShadows(screenUV, IN.posWS);
+    half shadow = SoftShadows(screenUV, IN.posWS, IN.viewDir.xyz, depth.x);
     half3 GI = SampleSH(IN.normal);
 
     // SSS
 	half foamMask = saturate(length(foamMap * foamBlend) * 1.5 - 0.1);
 	// Foam lighting
 	half3 foam = foamMask.xxx * (mainLight.shadowAttenuation * mainLight.color + GI);
-
-	// Distortion
-	half2 distortion = DistortionUVs(depth.x, IN.normal);
-	distortion = screenUV.xy + distortion;// * clamp(depth.x, 0, 5);
-	float d = depth.x;
-	depth.xz = AdjustedDepth(distortion, IN.additionalData);
-	distortion = depth.x < 0 ? screenUV.xy : distortion;
-	depth.x = depth.x < 0 ? d : depth.x;
-
-	// Fresnel
-	half fresnelTerm = CalculateFresnelTerm(IN.normal, IN.viewDir.xyz);
-	//return fresnelTerm.xxxx;
 
     BRDFData brdfData;
     half alpha = 1;

Packages/com.verasl.water-system/Shaders/WaterLighting.hlsl

 
 #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Lighting.hlsl"
 
+#define SHADOW_ITERATIONS 4
+
 half CalculateFresnelTerm(half3 normalWS, half3 viewDirectionWS)
 {
     return saturate(pow(1.0 - dot(normalWS, viewDirectionWS), 5));//fresnel TODO - find a better place
 }
 
 //Soft Shadows
-half SoftShadows(float3 screenUV, float3 positionWS)
+half SoftShadows(float3 screenUV, float3 positionWS, half3 viewDir, half depth)
+#if _MAIN_LIGHT_SHADOWS
-	
-	uint loop = 4;
-	float loopDiv = 1.0 / loop;
-	for (uint i = 0u; i < loop; ++i)
+
+	float loopDiv = 1.0 / SHADOW_ITERATIONS;
+	half depthFrac = depth * loopDiv;
+	half3 lightOffset = -viewDir * depthFrac;
+	for (uint i = 0u; i < SHADOW_ITERATIONS; ++i)
-	    float3 lightJitter = positionWS + jitterTexture.xzy * 2;
+	    half3 j = jitterTexture.xzy * depthFrac * i * 0.1;
+	    float3 lightJitter = (positionWS + j) + (lightOffset * (i + jitterTexture.y));
+#else
+    return 1;
+#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////

Packages/manifest.json

 {
   "dependencies": {
     "com.unity.2d.sprite": "1.0.0",
-    "com.unity.addressables": "1.14.2",
+    "com.unity.addressables": "1.16.10",
-    "com.unity.ide.visualstudio": "2.0.3",
-    "com.unity.ide.vscode": "1.2.2",
+    "com.unity.ide.visualstudio": "2.0.5",
+    "com.unity.ide.vscode": "1.2.3",
-    "com.unity.render-pipelines.universal": "10.1.0",
+    "com.unity.render-pipelines.universal": "10.2.2",
     "com.unity.textmeshpro": "3.0.3",
     "com.unity.timeline": "1.4.3",
     "com.unity.ugui": "1.0.0",

Packages/packages-lock.json

       "dependencies": {}
     },
     "com.unity.addressables": {
-      "version": "1.14.2",
+      "version": "1.16.10",
-        "com.unity.scriptablebuildpipeline": "1.11.1",
+        "com.unity.scriptablebuildpipeline": "1.14.1",
         "com.unity.modules.assetbundle": "1.0.0",
         "com.unity.modules.unitywebrequest": "1.0.0",
         "com.unity.modules.unitywebrequestassetbundle": "1.0.0"
       "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
-      "version": "1.0.0",
+      "version": "1.0.5",
       "depth": 2,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.3",
+      "version": "2.0.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
-      "version": "1.2.2",
+      "version": "1.2.3",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.render-pipelines.core": {
-      "version": "10.1.0",
+      "version": "10.2.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {
     },
     "com.unity.render-pipelines.universal": {
-      "version": "10.1.0",
+      "version": "10.2.2",
-        "com.unity.render-pipelines.core": "10.1.0",
-        "com.unity.shadergraph": "10.1.0"
+        "com.unity.render-pipelines.core": "10.2.2",
+        "com.unity.shadergraph": "10.2.2"
-      "version": "1.11.1",
+      "version": "1.14.1",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.shadergraph": {
-      "version": "10.1.0",
+      "version": "10.2.2",
-        "com.unity.render-pipelines.core": "10.1.0",
+        "com.unity.render-pipelines.core": "10.2.2",
-      "version": "1.1.16",
+      "version": "1.1.19",
-        "com.unity.ext.nunit": "1.0.0",
+        "com.unity.ext.nunit": "1.0.5",
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },

ProjectSettings/ProjectVersion.txt

-m_EditorVersion: 2020.2.0b8
-m_EditorVersionWithRevision: 2020.2.0b8 (dff91d65251a)
+m_EditorVersion: 2020.2.0f1
+m_EditorVersionWithRevision: 2020.2.0f1 (3721df5a8b28)

ProjectSettings/URPProjectSettings.asset

   m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_LastMaterialVersion: 3
+  m_LastMaterialVersion: 4

ProjectSettings/VersionControlSettings.asset

-�
� 2020.1.0b1����

�$5�����w���6����):\
7������

���
�



H������

1�1�����
@
���

Q�j�



3
�
L�J
@VersionControlSettingsm_ModeCollabEditorSettingsm_CollabEditorSettingsinProgressEnabled

 Visible Meta Files

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!890905787 &1
+VersionControlSettings:
+  m_ObjectHideFlags: 0
+  m_Mode: Visible Meta Files
+  m_CollabEditorSettings:
+    inProgressEnabled: 1

UserSettings/EditorUserSettings.asset

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!162 &1
+EditorUserSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 4
+  m_ConfigSettings:
+    RecentlyUsedScenePath-0:
+      value: 22424703114646480e0b0227036c5b151b1827033f24273e2967083debf42d
+      flags: 0
+    UnityEditor.ShaderGraph.FloatingWindowsLayout2:
+      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b9859884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0ffb0e1e380cafbf2c3adc18e9cd285a2908b87ee819c8395949c9483d38b8d97ddbd90eed2a5a892a2af949aa48bafb19f85bd75a7ed3a7d25658598b7b58bb4b76aaf777690ca2863946c72c6cd81b6b6708f9f879f88769589d91c8f888e64d20f935e796571755c6b546677696a486c781c073c773d756a66771753783a27353f4c504172674347264e2e7a16016c711e4d7d5f686758400216064d1b4f487873735e6d726f6b3f577c7d47786579002d00
+      flags: 0
+    UnityEditor.ShaderGraph.InspectorWindow:
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a560393d3511ea7046333e09f7181d02f50a06241708ee0b05bd4a3d10eb548717f73713d91006c1c309d0effad0d2f9ddffa582f0de8ebeb6fdd1cbfceba0b9f0b3bed8e8f5d0b0818e85dd839099c5e2dbd4
+      flags: 0
+    UnityEditor.ShaderGraph.ToggleSettings:
+      value: 18135d1527590858060c032302276919051e1a26296a7c362c250e36aea23d2bd2f533ffee3f280a3011e63e083b4365f40b0518f34748020227f31d01fa13071ed72ecc09c11d10ce5b46c8cc11c2e69994d7e5d4e4f5e8ccd0b6fbf0f5fcbaafb3f9d5a5a6f99ee8b2
+      flags: 0
+    vcSharedLogLevel:
+      value: 0d5e400f0650
+      flags: 0
+  m_VCAutomaticAdd: 1
+  m_VCDebugCom: 0
+  m_VCDebugCmd: 0
+  m_VCDebugOut: 0
+  m_SemanticMergeMode: 2
+  m_VCShowFailedCheckout: 1
+  m_VCOverwriteFailedCheckoutAssets: 1
+  m_VCProjectOverlayIcons: 1
+  m_VCHierarchyOverlayIcons: 1
+  m_VCOtherOverlayIcons: 1
+  m_VCAllowAsyncUpdate: 0