Skip to content

Commit

Permalink
updated project
Browse files Browse the repository at this point in the history
  • Loading branch information
alelievr committed Jul 5, 2021
1 parent c6abcb5 commit af88e7f
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 43 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,4 @@ sysinfo.txt
# Osx finder cache files
.DS_Store
.idea/
UserSettings
5 changes: 3 additions & 2 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
"com.unity.ide.rider": "3.0.7",
"com.unity.ide.visualstudio": "2.0.9",
"com.unity.ide.vscode": "1.2.3",
"com.unity.test-framework": "1.1.24",
"com.unity.test-framework": "1.1.26",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.5.5",
"com.unity.timeline": "1.6.0-pre.5",
"com.unity.ugui": "1.0.0",
"com.unity.xr.legacyinputhelpers": "2.1.7",
"com.unity.modules.ai": "1.0.0",
Expand All @@ -21,6 +21,7 @@
"com.unity.modules.imageconversion": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.nvidia": "1.0.0",
"com.unity.modules.particlesystem": "1.0.0",
"com.unity.modules.physics": "1.0.0",
"com.unity.modules.physics2d": "1.0.0",
Expand Down
10 changes: 8 additions & 2 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.1.24",
"version": "1.1.26",
"depth": 0,
"source": "registry",
"dependencies": {
Expand All @@ -65,7 +65,7 @@
"url": "https://packages.unity.com"
},
"com.unity.timeline": {
"version": "1.5.5",
"version": "1.6.0-pre.5",
"depth": 0,
"source": "registry",
"dependencies": {
Expand Down Expand Up @@ -160,6 +160,12 @@
"source": "builtin",
"dependencies": {}
},
"com.unity.modules.nvidia": {
"version": "1.0.0",
"depth": 0,
"source": "builtin",
"dependencies": {}
},
"com.unity.modules.particlesystem": {
"version": "1.0.0",
"depth": 0,
Expand Down
35 changes: 35 additions & 0 deletions ProjectSettings/MemorySettings.asset
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!387306366 &1
MemorySettings:
m_ObjectHideFlags: 0
m_EditorMemorySettings:
m_MainAllocatorBlockSize: -1
m_ThreadAllocatorBlockSize: -1
m_MainGfxBlockSize: -1
m_ThreadGfxBlockSize: -1
m_CacheBlockSize: -1
m_TypetreeBlockSize: -1
m_ProfilerBlockSize: -1
m_ProfilerEditorBlockSize: -1
m_BucketAllocatorGranularity: -1
m_BucketAllocatorBucketsCount: -1
m_BucketAllocatorBlockSize: -1
m_BucketAllocatorBlockCount: -1
m_ProfilerBucketAllocatorGranularity: -1
m_ProfilerBucketAllocatorBucketsCount: -1
m_ProfilerBucketAllocatorBlockSize: -1
m_ProfilerBucketAllocatorBlockCount: -1
m_TempAllocatorSizeMain: -1
m_JobTempAllocatorBlockSize: -1
m_BackgroundJobTempAllocatorBlockSize: -1
m_JobTempAllocatorReducedBlockSize: -1
m_TempAllocatorSizeGIBakingWorker: -1
m_TempAllocatorSizeNavMeshWorker: -1
m_TempAllocatorSizeAudioWorker: -1
m_TempAllocatorSizeCloudWorker: -1
m_TempAllocatorSizeGfx: -1
m_TempAllocatorSizeJobWorker: -1
m_TempAllocatorSizeBackgroundWorker: -1
m_TempAllocatorSizePreloadManager: -1
m_PlatformMemorySettings: {}
4 changes: 2 additions & 2 deletions ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
m_EditorVersion: 2021.1.12f1
m_EditorVersionWithRevision: 2021.1.12f1 (afcadd793de6)
m_EditorVersion: 2021.2.0b3
m_EditorVersionWithRevision: 2021.2.0b3 (40188ccec128)
Empty file added ProjectSettings/boot.config
Empty file.
36 changes: 0 additions & 36 deletions UserSettings/EditorUserSettings.asset

This file was deleted.

1 change: 0 additions & 1 deletion UserSettings/Search.settings

This file was deleted.

0 comments on commit af88e7f

Please sign in to comment.