Merge remote-tracking branch 'origin/main' into player/rotation-and-lock-on
# Conflicts: # Assets/Scenes/SampleScene.unity
This commit is contained in:
8
Assets/Core/Materials.meta
Normal file
8
Assets/Core/Materials.meta
Normal file
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f64e41b58b18b734597cfa825b8a4e5e
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user