1.5.4.0 update. too much, man

ipodtouch0218 · Mar 29, 2022 · 3e5c8a7 · 3e5c8a7
1 parent 86e6395
commit 3e5c8a7
Show file tree

Hide file tree

Showing 43 changed files with 4,164 additions and 1,831 deletions.
diff --git a/.plastic/plastic.changes b/.plastic/plastic.changes
diff --git a/.plastic/plastic.wktree b/.plastic/plastic.wktree
diff --git a/Assets/Fonts.meta → Assets/Resources/Fonts.meta b/Assets/Fonts.meta → Assets/Resources/Fonts.meta
diff --git a/Assets/Fonts/nsmbds-font.ttf → Assets/Resources/Fonts/NSMBDS-Font.ttf b/Assets/Fonts/nsmbds-font.ttf → Assets/Resources/Fonts/NSMBDS-Font.ttf
diff --git a/Assets/Fonts/nsmbds-font.ttf.meta → Assets/Resources/Fonts/NSMBDS-Font.ttf.meta b/Assets/Fonts/nsmbds-font.ttf.meta → Assets/Resources/Fonts/NSMBDS-Font.ttf.meta
diff --git a/Assets/Fonts/UISymbols.asset → Assets/Resources/Fonts/UISymbols.asset b/Assets/Fonts/UISymbols.asset → Assets/Resources/Fonts/UISymbols.asset
diff --git a/Assets/Fonts/UISymbols.asset.meta → Assets/Resources/Fonts/UISymbols.asset.meta b/Assets/Fonts/UISymbols.asset.meta → Assets/Resources/Fonts/UISymbols.asset.meta
diff --git a/Assets/Menu/bluoutline.asset → Assets/Resources/Fonts/bluoutline.asset b/Assets/Menu/bluoutline.asset → Assets/Resources/Fonts/bluoutline.asset
diff --git a/Assets/Menu/bluoutline.asset.meta → Assets/Resources/Fonts/bluoutline.asset.meta b/Assets/Menu/bluoutline.asset.meta → Assets/Resources/Fonts/bluoutline.asset.meta
diff --git a/Assets/Menu/font SDF.asset → Assets/Resources/Fonts/defaultFont.asset b/Assets/Menu/font SDF.asset → Assets/Resources/Fonts/defaultFont.asset
@@ -9,7 +9,7 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: font SDF Material
   m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
-  m_ShaderKeywords: ETC1_EXTERNAL_ALPHA UNDERLAY_ON
+  m_ShaderKeywords: UNDERLAY_ON
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
@@ -39,6 +39,7 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    m_Ints: []
     m_Floats:
     - _Ambient: 0.5
     - _Bevel: 0.5
@@ -113,7 +114,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 71c1514a6bd24e1e882cebbe1904ce04, type: 3}
-  m_Name: font SDF
+  m_Name: defaultFont
   m_EditorClassIdentifier: 
   hashCode: -1110002718
   material: {fileID: -53834951448225802}
@@ -1825,6 +1826,7 @@ MonoBehaviour:
   - {fileID: 5103018679723274157}
   m_AtlasTextureIndex: 0
   m_IsMultiAtlasTexturesEnabled: 0
+  m_ClearDynamicDataOnBuild: 0
   m_UsedGlyphRects:
   - m_X: 0
     m_Y: 0

diff --git a/Assets/Menu/font SDF.asset.meta → ...ts/Resources/Fonts/defaultFont.asset.meta b/Assets/Menu/font SDF.asset.meta → ...ts/Resources/Fonts/defaultFont.asset.meta
diff --git a/Assets/Menu/outlineless.asset → Assets/Resources/Fonts/outlineless.asset b/Assets/Menu/outlineless.asset → Assets/Resources/Fonts/outlineless.asset
diff --git a/Assets/Menu/outlineless.asset.meta → ...ts/Resources/Fonts/outlineless.asset.meta b/Assets/Menu/outlineless.asset.meta → ...ts/Resources/Fonts/outlineless.asset.meta