diff --git a/Assets/Plugins/LibreMetaverse/LibreMetaverseAssembly.asmdef b/Assets/Plugins/LibreMetaverse/LibreMetaverseAssembly.asmdef index 6091ff9..016719b 100644 --- a/Assets/Plugins/LibreMetaverse/LibreMetaverseAssembly.asmdef +++ b/Assets/Plugins/LibreMetaverse/LibreMetaverseAssembly.asmdef @@ -1,9 +1,7 @@ { "name": "LibreMetaverseAssembly", "rootNamespace": "", - "references": [ - "GUID:76f8bd3fe0677274192d7e8f6b160b17" - ], + "references": [], "includePlatforms": [], "excludePlatforms": [], "allowUnsafeCode": true, diff --git a/Assets/Plugins/log4net.meta b/Assets/Plugins/log4net.meta new file mode 100644 index 0000000..cc8792f --- /dev/null +++ b/Assets/Plugins/log4net.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0d267f7b521bfc44da9fdc8f9c25c08e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Plugins/log4net.dll b/Assets/Plugins/log4net/log4net.dll similarity index 100% rename from Assets/Plugins/log4net.dll rename to Assets/Plugins/log4net/log4net.dll diff --git a/Assets/Plugins/log4net.dll.meta b/Assets/Plugins/log4net/log4net.dll.meta similarity index 100% rename from Assets/Plugins/log4net.dll.meta rename to Assets/Plugins/log4net/log4net.dll.meta diff --git a/Assets/Raindrop/RaindropUnity.asmdef b/Assets/Raindrop/RaindropUnity.asmdef index 75f1316..d884be7 100644 --- a/Assets/Raindrop/RaindropUnity.asmdef +++ b/Assets/Raindrop/RaindropUnity.asmdef @@ -12,8 +12,6 @@ "GUID:247a163e3cc6efb42bd22b9023b87ff3", "GUID:0c752da273b17c547ae705acf0f2adf2", "GUID:0d8beb7f090555447a6cf5ce9e54dbb4", - "GUID:9e24947de15b9834991c9d8411ea37cf", - "GUID:84651a3751eca9349aac36a66bba901b", "GUID:11f3455556175aa41b2b4d4f2ec8b146" ], "includePlatforms": [], diff --git a/Packages/manifest.json b/Packages/manifest.json index b80ef49..08d171f 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -3,16 +3,15 @@ "com.gameframe.gui": "https://github.com/coryleach/UnityGUI.git#2.0.0", "com.unity.2d.sprite": "1.0.0", "com.unity.burst": "1.5.4", - "com.unity.collab-proxy": "1.3.9", "com.unity.collections": "0.17.0-preview.18", "com.unity.ide.rider": "2.0.7", - "com.unity.ide.visualstudio": "2.0.7", + "com.unity.ide.visualstudio": "2.0.11", "com.unity.ide.vscode": "1.2.3", "com.unity.jobs": "0.8.0-preview.23", "com.unity.memoryprofiler": "0.2.9-preview.3", - "com.unity.test-framework": "1.1.24", - "com.unity.textmeshpro": "3.0.4", - "com.unity.timeline": "1.4.7", + "com.unity.test-framework": "1.1.27", + "com.unity.textmeshpro": "3.0.6", + "com.unity.timeline": "1.4.8", "com.unity.ugui": "1.0.0", "jillejr.newtonsoft.json-for-unity": "https://github.com/jilleJr/Newtonsoft.Json-for-Unity.git#upm", "com.unity.modules.ai": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index f125aa0..ad3a271 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -24,13 +24,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.collab-proxy": { - "version": "1.3.9", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.collections": { "version": "0.17.0-preview.18", "depth": 0, @@ -64,7 +57,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.7", + "version": "2.0.11", "depth": 0, "source": "registry", "dependencies": { @@ -106,7 +99,7 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.24", + "version": "1.1.27", "depth": 0, "source": "registry", "dependencies": { @@ -117,7 +110,7 @@ "url": "https://packages.unity.com" }, "com.unity.textmeshpro": { - "version": "3.0.4", + "version": "3.0.6", "depth": 0, "source": "registry", "dependencies": { @@ -126,7 +119,7 @@ "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.4.7", + "version": "1.4.8", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/BurstAotSettings_Android.json b/ProjectSettings/BurstAotSettings_Android.json index 34c31b5..b7d5011 100644 --- a/ProjectSettings/BurstAotSettings_Android.json +++ b/ProjectSettings/BurstAotSettings_Android.json @@ -1,7 +1,7 @@ { "MonoBehaviour": { "Version": 3, - "EnableBurstCompilation": false, + "EnableBurstCompilation": true, "EnableOptimisations": false, "EnableSafetyChecks": false, "EnableDebugInAllBuilds": true, diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index e61124b..1f8bbcd 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -657,6 +657,7 @@ PlayerSettings: ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 ps4CompatibilityPS5: 0 + ps4AllowPS5Detection: 0 ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 4e87e30..5ac0724 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2020.3.8f1 -m_EditorVersionWithRevision: 2020.3.8f1 (507919d4fff5) +m_EditorVersion: 2020.3.15f2 +m_EditorVersionWithRevision: 2020.3.15f2 (6cf78cb77498) diff --git a/ProjectSettings/SceneTemplateSettings.json b/ProjectSettings/SceneTemplateSettings.json new file mode 100644 index 0000000..6f3e60f --- /dev/null +++ b/ProjectSettings/SceneTemplateSettings.json @@ -0,0 +1,167 @@ +{ + "templatePinStates": [], + "dependencyTypeInfos": [ + { + "userAdded": false, + "type": "UnityEngine.AnimationClip", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.Animations.AnimatorController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.AnimatorOverrideController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.Audio.AudioMixerController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.ComputeShader", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Cubemap", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.GameObject", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.LightingDataAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": false + }, + { + "userAdded": false, + "type": "UnityEngine.LightingSettings", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Material", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.MonoScript", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicMaterial", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial2D", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.VolumeProfile", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.SceneAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": false + }, + { + "userAdded": false, + "type": "UnityEngine.Shader", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.ShaderVariantCollection", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Texture", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Texture2D", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Timeline.TimelineAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + } + ], + "defaultDependencyTypeInfo": { + "userAdded": false, + "type": "", + "ignore": false, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + "newSceneOverride": 0 +} \ No newline at end of file