thunderstargames/project-reset
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'core/update-to-6.2' into dev

Browse Source 
# Conflicts:
#	Packages/manifest.json
#	ProjectSettings/Packages/com.unity.probuilder/Settings.json
This commit is contained in:
Chris
2025-08-31 17:46:08 -04:00
parent 39376934a5 bbb735c9c1
commit d6973f70b9
9 changed files with 238 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Core/Materials/LockOnMarkerMaterial.mat
View File

@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9
version: 10
--- !u!21 &2100000
Material:
serializedVersion: 8