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

Merge remote-tracking branch 'origin/main' into player/rotation-and-lock-on

Browse Source 
# Conflicts:
#	Assets/Scenes/SampleScene.unity
This commit is contained in:
Chris
2025-03-19 15:53:57 -04:00
parent ee40868efe 2fce76135e
commit 99bd1e586d
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/Core/Materials.meta Normal file
View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f64e41b58b18b734597cfa825b8a4e5e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

17
ProjectSettings/Packages/com.unity.probuilder/Settings.json
View File

@@ -81,6 +81,16 @@
"key": "editor.showEditorNotifications", "key": "editor.showEditorNotifications",
"value": "{\"m_Value\":false}" "value": "{\"m_Value\":false}"
}, },
{
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "editor.autoUpdatePreview",
"value": "{\"m_Value\":false}"
},
{
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "CollapseVertices.collapseToFirst",
"value": "{\"m_Value\":false}"
},
{ {
"type": "UnityEngine.Rendering.ShadowCastingMode, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "type": "UnityEngine.Rendering.ShadowCastingMode, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "mesh.shadowCastingMode", "key": "mesh.shadowCastingMode",
@@ -154,12 +164,17 @@
{ {
"type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "type": "UnityEngine.ProBuilder.SelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "s_SelectMode", "key": "s_SelectMode",
"value": "{\"m_Value\":4}" "value": "{\"m_Value\":1}"
}, },
{ {
"type": "UnityEngine.ProBuilder.RectSelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null", "type": "UnityEngine.ProBuilder.RectSelectMode, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "editor.dragSelectRectMode", "key": "editor.dragSelectRectMode",
"value": "{\"m_Value\":0}" "value": "{\"m_Value\":0}"
},
{
"type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "WeldVertices.weldDistance",
"value": "{\"m_Value\":0.009999999776482582}"
} }
] ]
} }