Skip to content

Commit af88e7f

Browse files
committed
updated project
1 parent c6abcb5 commit af88e7f

File tree

8 files changed

+49
-43
lines changed

8 files changed

+49
-43
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,4 @@ sysinfo.txt
3737
# Osx finder cache files
3838
.DS_Store
3939
.idea/
40+
UserSettings

Packages/manifest.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"com.unity.ide.rider": "3.0.7",
77
"com.unity.ide.visualstudio": "2.0.9",
88
"com.unity.ide.vscode": "1.2.3",
9-
"com.unity.test-framework": "1.1.24",
9+
"com.unity.test-framework": "1.1.26",
1010
"com.unity.textmeshpro": "3.0.6",
11-
"com.unity.timeline": "1.5.5",
11+
"com.unity.timeline": "1.6.0-pre.5",
1212
"com.unity.ugui": "1.0.0",
1313
"com.unity.xr.legacyinputhelpers": "2.1.7",
1414
"com.unity.modules.ai": "1.0.0",
@@ -21,6 +21,7 @@
2121
"com.unity.modules.imageconversion": "1.0.0",
2222
"com.unity.modules.imgui": "1.0.0",
2323
"com.unity.modules.jsonserialize": "1.0.0",
24+
"com.unity.modules.nvidia": "1.0.0",
2425
"com.unity.modules.particlesystem": "1.0.0",
2526
"com.unity.modules.physics": "1.0.0",
2627
"com.unity.modules.physics2d": "1.0.0",

Packages/packages-lock.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"url": "https://packages.unity.com"
4646
},
4747
"com.unity.test-framework": {
48-
"version": "1.1.24",
48+
"version": "1.1.26",
4949
"depth": 0,
5050
"source": "registry",
5151
"dependencies": {
@@ -65,7 +65,7 @@
6565
"url": "https://packages.unity.com"
6666
},
6767
"com.unity.timeline": {
68-
"version": "1.5.5",
68+
"version": "1.6.0-pre.5",
6969
"depth": 0,
7070
"source": "registry",
7171
"dependencies": {
@@ -160,6 +160,12 @@
160160
"source": "builtin",
161161
"dependencies": {}
162162
},
163+
"com.unity.modules.nvidia": {
164+
"version": "1.0.0",
165+
"depth": 0,
166+
"source": "builtin",
167+
"dependencies": {}
168+
},
163169
"com.unity.modules.particlesystem": {
164170
"version": "1.0.0",
165171
"depth": 0,

ProjectSettings/MemorySettings.asset

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!387306366 &1
4+
MemorySettings:
5+
m_ObjectHideFlags: 0
6+
m_EditorMemorySettings:
7+
m_MainAllocatorBlockSize: -1
8+
m_ThreadAllocatorBlockSize: -1
9+
m_MainGfxBlockSize: -1
10+
m_ThreadGfxBlockSize: -1
11+
m_CacheBlockSize: -1
12+
m_TypetreeBlockSize: -1
13+
m_ProfilerBlockSize: -1
14+
m_ProfilerEditorBlockSize: -1
15+
m_BucketAllocatorGranularity: -1
16+
m_BucketAllocatorBucketsCount: -1
17+
m_BucketAllocatorBlockSize: -1
18+
m_BucketAllocatorBlockCount: -1
19+
m_ProfilerBucketAllocatorGranularity: -1
20+
m_ProfilerBucketAllocatorBucketsCount: -1
21+
m_ProfilerBucketAllocatorBlockSize: -1
22+
m_ProfilerBucketAllocatorBlockCount: -1
23+
m_TempAllocatorSizeMain: -1
24+
m_JobTempAllocatorBlockSize: -1
25+
m_BackgroundJobTempAllocatorBlockSize: -1
26+
m_JobTempAllocatorReducedBlockSize: -1
27+
m_TempAllocatorSizeGIBakingWorker: -1
28+
m_TempAllocatorSizeNavMeshWorker: -1
29+
m_TempAllocatorSizeAudioWorker: -1
30+
m_TempAllocatorSizeCloudWorker: -1
31+
m_TempAllocatorSizeGfx: -1
32+
m_TempAllocatorSizeJobWorker: -1
33+
m_TempAllocatorSizeBackgroundWorker: -1
34+
m_TempAllocatorSizePreloadManager: -1
35+
m_PlatformMemorySettings: {}

ProjectSettings/ProjectVersion.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
m_EditorVersion: 2021.1.12f1
2-
m_EditorVersionWithRevision: 2021.1.12f1 (afcadd793de6)
1+
m_EditorVersion: 2021.2.0b3
2+
m_EditorVersionWithRevision: 2021.2.0b3 (40188ccec128)

ProjectSettings/boot.config

Whitespace-only changes.

UserSettings/EditorUserSettings.asset

Lines changed: 0 additions & 36 deletions
This file was deleted.

UserSettings/Search.settings

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)