diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..1060b04 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,56 @@ +{ + "files.exclude": + { + "**/.DS_Store":true, + "**/.git":true, + "**/.gitignore":true, + "**/.gitmodules":true, + "**/*.booproj":true, + "**/*.pidb":true, + "**/*.suo":true, + "**/*.user":true, + "**/*.userprefs":true, + "**/*.unityproj":true, + "**/*.dll":true, + "**/*.exe":true, + "**/*.pdf":true, + "**/*.mid":true, + "**/*.midi":true, + "**/*.wav":true, + "**/*.gif":true, + "**/*.ico":true, + "**/*.jpg":true, + "**/*.jpeg":true, + "**/*.png":true, + "**/*.psd":true, + "**/*.tga":true, + "**/*.tif":true, + "**/*.tiff":true, + "**/*.3ds":true, + "**/*.3DS":true, + "**/*.fbx":true, + "**/*.FBX":true, + "**/*.lxo":true, + "**/*.LXO":true, + "**/*.ma":true, + "**/*.MA":true, + "**/*.obj":true, + "**/*.OBJ":true, + "**/*.asset":true, + "**/*.cubemap":true, + "**/*.flare":true, + "**/*.mat":true, + "**/*.meta":true, + "**/*.prefab":true, + "**/*.unity":true, + "build/":true, + "Build/":true, + "Library/":true, + "library/":true, + "obj/":true, + "Obj/":true, + "ProjectSettings/":true, + "temp/":true, + "Temp/":true + } +} \ No newline at end of file diff --git a/Assets/NatureStarterKit2/Editor/ImageEffects/BloomAndFlaresEditor.cs b/Assets/NatureStarterKit2/Editor/ImageEffects/BloomAndFlaresEditor.cs index 2966e5d..42d3803 100644 --- a/Assets/NatureStarterKit2/Editor/ImageEffects/BloomAndFlaresEditor.cs +++ b/Assets/NatureStarterKit2/Editor/ImageEffects/BloomAndFlaresEditor.cs @@ -77,7 +77,7 @@ public override void OnInspectorGUI () { // display info text when screen blend mode cannot be used Camera cam = (target as BloomAndFlares).GetComponent(); if (cam != null) { - if (screenBlendMode.enumValueIndex==0 && ((cam.hdr && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) { + if (screenBlendMode.enumValueIndex==0 && ((cam.allowHDR && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) { EditorGUILayout.HelpBox("Screen blend is not supported in HDR. Using 'Add' instead.", MessageType.Info); } } diff --git a/Assets/NatureStarterKit2/Editor/ImageEffects/BloomEditor.cs b/Assets/NatureStarterKit2/Editor/ImageEffects/BloomEditor.cs index 6957591..58c9628 100644 --- a/Assets/NatureStarterKit2/Editor/ImageEffects/BloomEditor.cs +++ b/Assets/NatureStarterKit2/Editor/ImageEffects/BloomEditor.cs @@ -85,7 +85,7 @@ public override void OnInspectorGUI () { // display info text when screen blend mode cannot be used Camera cam = (target as Bloom).GetComponent(); if (cam != null) { - if (screenBlendMode.enumValueIndex==0 && ((cam.hdr && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) { + if (screenBlendMode.enumValueIndex==0 && ((cam.allowHDR && hdr.enumValueIndex==0) || (hdr.enumValueIndex==1))) { EditorGUILayout.HelpBox("Screen blend is not supported in HDR. Using 'Add' instead.", MessageType.Info); } } diff --git a/Assets/NatureStarterKit2/Editor/ImageEffects/TonemappingEditor.cs b/Assets/NatureStarterKit2/Editor/ImageEffects/TonemappingEditor.cs index 613631f..f6128a4 100644 --- a/Assets/NatureStarterKit2/Editor/ImageEffects/TonemappingEditor.cs +++ b/Assets/NatureStarterKit2/Editor/ImageEffects/TonemappingEditor.cs @@ -42,7 +42,7 @@ public override void OnInspectorGUI () { Camera cam = (target as Tonemapping).GetComponent(); if (cam != null) { - if (!cam.hdr) { + if (!cam.allowHDR) { EditorGUILayout.HelpBox("The camera is not HDR enabled. This will likely break the Tonemapper.", MessageType.Warning); } else if (!(target as Tonemapping).validRenderTextureFormat) { diff --git a/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/Bloom.cs b/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/Bloom.cs index d5fd7a6..15f39ff 100644 --- a/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/Bloom.cs +++ b/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/Bloom.cs @@ -106,7 +106,7 @@ public void OnRenderImage (RenderTexture source, RenderTexture destination) doHdr = false; if (hdr == HDRBloomMode.Auto) - doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent().hdr; + doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent().allowHDR; else { doHdr = hdr == HDRBloomMode.On; } diff --git a/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/BloomAndFlares.cs b/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/BloomAndFlares.cs index 3769c21..da269f5 100644 --- a/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/BloomAndFlares.cs +++ b/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/BloomAndFlares.cs @@ -109,7 +109,7 @@ void OnRenderImage(RenderTexture source, RenderTexture destination) doHdr = false; if (hdr == HDRBloomMode.Auto) - doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent().hdr; + doHdr = source.format == RenderTextureFormat.ARGBHalf && GetComponent().allowHDR; else { doHdr = hdr == HDRBloomMode.On; diff --git a/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/DepthOfField.cs b/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/DepthOfField.cs index 4b4ba8e..2ab0668 100644 --- a/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/DepthOfField.cs +++ b/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/DepthOfField.cs @@ -91,7 +91,7 @@ void ReleaseComputeResources () { void CreateComputeResources () { if (cbDrawArgs == null) { - cbDrawArgs = new ComputeBuffer (1, 16, ComputeBufferType.DrawIndirect); + cbDrawArgs = new ComputeBuffer (1, 16, ComputeBufferType.IndirectArguments); var args= new int[4]; args[0] = 0; args[1] = 1; args[2] = 0; args[3] = 0; cbDrawArgs.SetData (args); @@ -256,7 +256,7 @@ void OnRenderImage (RenderTexture source, RenderTexture destination) { dx11bokehMaterial.SetVector ("_Screen", new Vector3(1.0f/(1.0f*source.width), 1.0f/(1.0f*source.height), internalBlurWidth)); dx11bokehMaterial.SetPass (2); - Graphics.DrawProceduralIndirect (MeshTopology.Points, cbDrawArgs, 0); + Graphics.DrawProceduralIndirectNow (MeshTopology.Points, cbDrawArgs, 0); Graphics.Blit (dest2, destination); // hackaround for DX11 high resolution flipfun (OPTIMIZEME) @@ -330,7 +330,7 @@ void OnRenderImage (RenderTexture source, RenderTexture destination) { dx11bokehMaterial.SetTexture ("_MainTex", dx11BokehTexture); dx11bokehMaterial.SetVector ("_Screen", new Vector3(1.0f/(1.0f*rtLow2.width), 1.0f/(1.0f*rtLow2.height), internalBlurWidth)); dx11bokehMaterial.SetPass (1); - Graphics.DrawProceduralIndirect (MeshTopology.Points, cbDrawArgs, 0); + Graphics.DrawProceduralIndirectNow (MeshTopology.Points, cbDrawArgs, 0); // upsample & combine dofHdrMaterial.SetTexture ("_LowRez", rtLow2); diff --git a/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/SunShafts.cs b/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/SunShafts.cs index 480ef25..508ea52 100644 --- a/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/SunShafts.cs +++ b/Assets/NatureStarterKit2/Standard Assets/Effects/ImageEffects/Scripts/SunShafts.cs @@ -90,7 +90,7 @@ void OnRenderImage (RenderTexture source, RenderTexture destination) { sunShaftsMaterial.SetVector ("_SunThreshold", sunThreshold); if (!useDepthTexture) { - var format= GetComponent().hdr ? RenderTextureFormat.DefaultHDR: RenderTextureFormat.Default; + var format= GetComponent().allowHDR ? RenderTextureFormat.DefaultHDR: RenderTextureFormat.Default; RenderTexture tmpBuffer = RenderTexture.GetTemporary (source.width, source.height, 0, format); RenderTexture.active = tmpBuffer; GL.ClearWithSkybox (false, GetComponent()); diff --git a/Assets/_TerrainAutoUpgrade.meta b/Assets/_TerrainAutoUpgrade.meta new file mode 100644 index 0000000..ed06245 --- /dev/null +++ b/Assets/_TerrainAutoUpgrade.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ebe264cc1542dbd42a58bb202763b9b3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_TerrainAutoUpgrade/layer_ground012023054508611406.terrainlayer b/Assets/_TerrainAutoUpgrade/layer_ground012023054508611406.terrainlayer new file mode 100644 index 0000000..1142490 Binary files /dev/null and b/Assets/_TerrainAutoUpgrade/layer_ground012023054508611406.terrainlayer differ diff --git a/Assets/_TerrainAutoUpgrade/layer_ground012023054508611406.terrainlayer.meta b/Assets/_TerrainAutoUpgrade/layer_ground012023054508611406.terrainlayer.meta new file mode 100644 index 0000000..a0ff9d0 --- /dev/null +++ b/Assets/_TerrainAutoUpgrade/layer_ground012023054508611406.terrainlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ba4ed6c5a312a9b46bfd25b4804e794e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_TerrainAutoUpgrade/layer_ground01793646612c42751.terrainlayer b/Assets/_TerrainAutoUpgrade/layer_ground01793646612c42751.terrainlayer new file mode 100644 index 0000000..7ffec49 Binary files /dev/null and b/Assets/_TerrainAutoUpgrade/layer_ground01793646612c42751.terrainlayer differ diff --git a/Assets/_TerrainAutoUpgrade/layer_ground01793646612c42751.terrainlayer.meta b/Assets/_TerrainAutoUpgrade/layer_ground01793646612c42751.terrainlayer.meta new file mode 100644 index 0000000..901b3dc --- /dev/null +++ b/Assets/_TerrainAutoUpgrade/layer_ground01793646612c42751.terrainlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 581afafd8c3d1964a95422071200ef60 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_TerrainAutoUpgrade/layer_ground02ddfc8d7f3483abd.terrainlayer b/Assets/_TerrainAutoUpgrade/layer_ground02ddfc8d7f3483abd.terrainlayer new file mode 100644 index 0000000..a2a8a2a Binary files /dev/null and b/Assets/_TerrainAutoUpgrade/layer_ground02ddfc8d7f3483abd.terrainlayer differ diff --git a/Assets/_TerrainAutoUpgrade/layer_ground02ddfc8d7f3483abd.terrainlayer.meta b/Assets/_TerrainAutoUpgrade/layer_ground02ddfc8d7f3483abd.terrainlayer.meta new file mode 100644 index 0000000..799c997 --- /dev/null +++ b/Assets/_TerrainAutoUpgrade/layer_ground02ddfc8d7f3483abd.terrainlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd2bfe7c1261db74188b8db91f5f2821 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_TerrainAutoUpgrade/layer_ground038f9406e577a89d2d.terrainlayer b/Assets/_TerrainAutoUpgrade/layer_ground038f9406e577a89d2d.terrainlayer new file mode 100644 index 0000000..174662e Binary files /dev/null and b/Assets/_TerrainAutoUpgrade/layer_ground038f9406e577a89d2d.terrainlayer differ diff --git a/Assets/_TerrainAutoUpgrade/layer_ground038f9406e577a89d2d.terrainlayer.meta b/Assets/_TerrainAutoUpgrade/layer_ground038f9406e577a89d2d.terrainlayer.meta new file mode 100644 index 0000000..f867c23 --- /dev/null +++ b/Assets/_TerrainAutoUpgrade/layer_ground038f9406e577a89d2d.terrainlayer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ee78c054005e2a74abefec1af2724168 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Logs/Packages-Update.log b/Logs/Packages-Update.log new file mode 100644 index 0000000..42aff81 --- /dev/null +++ b/Logs/Packages-Update.log @@ -0,0 +1,45 @@ + +=== Sun Aug 8 20:26:44 2021 + +Packages were changed. +Update Mode: resetToDefaultDependencies + +The following packages were added: + com.unity.collab-proxy@1.2.16 + com.unity.ide.rider@1.1.4 + com.unity.ide.vscode@1.2.3 + com.unity.modules.ai@1.0.0 + com.unity.modules.androidjni@1.0.0 + com.unity.modules.animation@1.0.0 + com.unity.modules.assetbundle@1.0.0 + com.unity.modules.audio@1.0.0 + com.unity.modules.cloth@1.0.0 + com.unity.modules.director@1.0.0 + com.unity.modules.imageconversion@1.0.0 + com.unity.modules.imgui@1.0.0 + com.unity.modules.jsonserialize@1.0.0 + com.unity.modules.particlesystem@1.0.0 + com.unity.modules.physics@1.0.0 + com.unity.modules.physics2d@1.0.0 + com.unity.modules.screencapture@1.0.0 + com.unity.modules.terrain@1.0.0 + com.unity.modules.terrainphysics@1.0.0 + com.unity.modules.tilemap@1.0.0 + com.unity.modules.ui@1.0.0 + com.unity.modules.uielements@1.0.0 + com.unity.modules.umbra@1.0.0 + com.unity.modules.unityanalytics@1.0.0 + com.unity.modules.unitywebrequest@1.0.0 + com.unity.modules.unitywebrequestassetbundle@1.0.0 + com.unity.modules.unitywebrequestaudio@1.0.0 + com.unity.modules.unitywebrequesttexture@1.0.0 + com.unity.modules.unitywebrequestwww@1.0.0 + com.unity.modules.vehicles@1.0.0 + com.unity.modules.video@1.0.0 + com.unity.modules.vr@1.0.0 + com.unity.modules.wind@1.0.0 + com.unity.modules.xr@1.0.0 + com.unity.test-framework@1.1.20 + com.unity.textmeshpro@2.1.1 + com.unity.timeline@1.2.17 + com.unity.ugui@1.0.0 diff --git a/Packages/manifest.json b/Packages/manifest.json new file mode 100644 index 0000000..4b8fc96 --- /dev/null +++ b/Packages/manifest.json @@ -0,0 +1,42 @@ +{ + "dependencies": { + "com.unity.collab-proxy": "1.2.16", + "com.unity.ide.rider": "1.1.4", + "com.unity.ide.vscode": "1.2.3", + "com.unity.test-framework": "1.1.20", + "com.unity.textmeshpro": "2.1.1", + "com.unity.timeline": "1.2.17", + "com.unity.ugui": "1.0.0", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } +} diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json new file mode 100644 index 0000000..5518649 --- /dev/null +++ b/Packages/packages-lock.json @@ -0,0 +1,312 @@ +{ + "dependencies": { + "com.unity.collab-proxy": { + "version": "1.2.16", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ext.nunit": { + "version": "1.0.6", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ide.rider": { + "version": "1.1.4", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.vscode": { + "version": "1.2.3", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.test-framework": { + "version": "1.1.20", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.textmeshpro": { + "version": "2.1.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.timeline": { + "version": "1.2.17", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ugui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, + "com.unity.modules.ai": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.androidjni": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.animation": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.assetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.audio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.cloth": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.director": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.animation": "1.0.0" + } + }, + "com.unity.modules.imageconversion": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imgui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.jsonserialize": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.particlesystem": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics2d": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.screencapture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.subsystems": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.terrain": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.terrainphysics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0" + } + }, + "com.unity.modules.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics2d": "1.0.0" + } + }, + "com.unity.modules.ui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.uielements": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.umbra": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unityanalytics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.unitywebrequest": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unitywebrequestassetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestaudio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.audio": "1.0.0" + } + }, + "com.unity.modules.unitywebrequesttexture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestwww": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.vehicles": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.video": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.vr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } + }, + "com.unity.modules.wind": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.xr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.subsystems": "1.0.0" + } + } + } +} diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index c9c2060..89910c3 100644 Binary files a/ProjectSettings/EditorSettings.asset and b/ProjectSettings/EditorSettings.asset differ diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset new file mode 100644 index 0000000..6920e3a --- /dev/null +++ b/ProjectSettings/PackageManagerSettings.asset @@ -0,0 +1,38 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_ScopedRegistriesSettingsExpanded: 1 + oneTimeWarningShown: 0 + m_Registries: + - m_Id: main + m_Name: + m_Url: https://packages.unity.com + m_Scopes: [] + m_IsDefault: 1 + m_UserSelectedRegistryName: + m_UserAddingNewScopedRegistry: 0 + m_RegistryInfoDraft: + m_ErrorMessage: + m_Original: + m_Id: + m_Name: + m_Url: + m_Scopes: [] + m_IsDefault: 0 + m_Modified: 0 + m_Name: + m_Url: + m_Scopes: + - + m_SelectedScopeIndex: 0 diff --git a/ProjectSettings/PresetManager.asset b/ProjectSettings/PresetManager.asset new file mode 100644 index 0000000..1d4bb8e Binary files /dev/null and b/ProjectSettings/PresetManager.asset differ diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 54fa55b..d8ee6b5 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1,2 @@ -m_EditorVersion: 5.6.3p1 +m_EditorVersion: 2019.4.18f1 +m_EditorVersionWithRevision: 2019.4.18f1 (3310a4d4f880) diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset new file mode 100644 index 0000000..b2a0a30 Binary files /dev/null and b/ProjectSettings/VFXManager.asset differ diff --git a/ProjectSettings/XRSettings.asset b/ProjectSettings/XRSettings.asset new file mode 100644 index 0000000..482590c --- /dev/null +++ b/ProjectSettings/XRSettings.asset @@ -0,0 +1,10 @@ +{ + "m_SettingKeys": [ + "VR Device Disabled", + "VR Device User Alert" + ], + "m_SettingValues": [ + "False", + "False" + ] +} \ No newline at end of file