Merge branch 'YARC-Official:dev' into dev

YARC-Official · May 9, 2023 · d55642d · d55642d
2 parents 800b7f9 + ce94cee
commit d55642d
Show file tree

Hide file tree

Showing 135 changed files with 96,007 additions and 15,545 deletions.
diff --git a/Assets/Art/Fonts/Barlow-Bold.ttf b/Assets/Art/Fonts/Barlow-Bold.ttf
diff --git a/Assets/Art/Fonts/Barlow-Bold.ttf.meta b/Assets/Art/Fonts/Barlow-Bold.ttf.meta
diff --git a/...t/Fonts/Barlow/Barlow-Black SDF Frets.mat → ...s/Art/Fonts/Barlow/Barlow-Black Frets.mat b/...t/Fonts/Barlow/Barlow-Black SDF Frets.mat → ...s/Art/Fonts/Barlow/Barlow-Black Frets.mat
@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Barlow-Black SDF Frets
+  m_Name: Barlow-Black Frets
   m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
   m_ValidKeywords: []
   m_InvalidKeywords: []

diff --git a/...ts/Barlow/Barlow-Black SDF Frets.mat.meta → .../Fonts/Barlow/Barlow-Black Frets.mat.meta b/...ts/Barlow/Barlow-Black SDF Frets.mat.meta → .../Fonts/Barlow/Barlow-Black Frets.mat.meta
diff --git a/...s/Art/Fonts/Barlow/Barlow-Black SDF.asset → Assets/Art/Fonts/Barlow/Barlow-Black.asset b/...s/Art/Fonts/Barlow/Barlow-Black SDF.asset → Assets/Art/Fonts/Barlow/Barlow-Black.asset
@@ -115,7 +115,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
-  m_Name: Barlow-Black SDF
+  m_Name: Barlow-Black
   m_EditorClassIdentifier: 
   hashCode: 1300438238
   material: {fileID: -4723213457703258798}

diff --git a/.../Fonts/Barlow/Barlow-Black SDF.asset.meta → .../Art/Fonts/Barlow/Barlow-Black.asset.meta b/.../Fonts/Barlow/Barlow-Black SDF.asset.meta → .../Art/Fonts/Barlow/Barlow-Black.asset.meta