Merge branch 'update-ui-for-builds'

sneakaway-studio · Oct 6, 2020 · 9e55780 · 9e55780
2 parents bf2c6f2 + 09c24e3
commit 9e55780
Show file tree

Hide file tree

Showing 16 changed files with 784 additions and 240 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,9 +1,5 @@
 # Auto detect text files and perform LF normalization
 * text=auto
-
-
-
-
 *.psd filter=lfs diff=lfs merge=lfs -text
 *.png filter=lfs diff=lfs merge=lfs -text
 *.tga filter=lfs diff=lfs merge=lfs -text
@@ -12,3 +8,5 @@
 *.prefab filter=lfs diff=lfs merge=lfs -text
 *.fbx filter=lfs diff=lfs merge=lfs -text
 *.xcf filter=lfs diff=lfs merge=lfs -text
+*.app filter=lfs diff=lfs merge=lfs -text
+*.assets filter=lfs diff=lfs merge=lfs -text
diff --git a/.gitignore b/.gitignore
@@ -47,3 +47,5 @@ ExportedObj/
 Packages/manifest.json
 
 ProjectSettings/PresetManager.asset
+
+_Releases
diff --git a/Assets/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset b/Assets/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset
@@ -3,8 +3,9 @@
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
@@ -19,19 +20,19 @@ MonoBehaviour:
     m_OpeningTagArray: 3c00000073000000690000007a000000650000003d00000032000000650000006d0000003e0000003c000000620000003e0000003c000000230000003400000030000000660000006600000038000000300000003e0000002a000000
     m_ClosingTagArray: 2a0000003c0000002f00000073000000690000007a000000650000003e0000003c0000002f000000620000003e0000003c0000002f000000630000006f0000006c0000006f000000720000003e000000
   - m_Name: Quote
-    m_HashCode: 92254330
+    m_HashCode: 93368250
     m_OpeningDefinition: <i><size=75%><margin=10%>
     m_ClosingDefinition: </i></size></width></margin>
     m_OpeningTagArray: 3c000000690000003e0000003c00000073000000690000007a000000650000003d0000003700000035000000250000003e0000003c0000006d000000610000007200000067000000690000006e0000003d0000003100000030000000250000003e000000
     m_ClosingTagArray: 3c0000002f000000690000003e0000003c0000002f00000073000000690000007a000000650000003e0000003c0000002f00000077000000690000006400000074000000680000003e0000003c0000002f0000006d000000610000007200000067000000690000006e0000003e000000
   - m_Name: Link
-    m_HashCode: 2687968
+    m_HashCode: 2656128
     m_OpeningDefinition: <u><#40a0ff><link="ID_01">
     m_ClosingDefinition: </u></color></link>
     m_OpeningTagArray: 3c000000750000003e0000003c000000230000003400000030000000610000003000000066000000660000003e0000003c0000006c000000690000006e0000006b0000003d0000002200000049000000440000005f0000003000000031000000220000003e000000
     m_ClosingTagArray: 3c0000002f000000750000003e0000003c0000002f000000630000006f0000006c0000006f000000720000003e0000003c0000002f0000006c000000690000006e0000006b0000003e000000
   - m_Name: Title
-    m_HashCode: 98732960
+    m_HashCode: 97690656
     m_OpeningDefinition: <size=125%><b><align=center>
     m_ClosingDefinition: </size></b></align>
     m_OpeningTagArray: 3c00000073000000690000007a000000650000003d000000310000003200000035000000250000003e0000003c000000620000003e0000003c000000610000006c00000069000000670000006e0000003d00000063000000650000006e0000007400000065000000720000003e000000
@@ -50,9 +51,9 @@ MonoBehaviour:
     m_ClosingTagArray: 3c0000002f00000073000000690000007a000000650000003e0000003c0000002f000000620000003e0000003c0000002f000000630000006f0000006c0000006f000000720000003e000000
   - m_Name: C1
     m_HashCode: 2194
-    m_OpeningDefinition: <color=#ffff40>
+    m_OpeningDefinition: <color=#fb3f7c>
     m_ClosingDefinition: </color>
-    m_OpeningTagArray: 3c000000630000006f0000006c0000006f000000720000003d000000230000006600000066000000660000006600000034000000300000003e000000
+    m_OpeningTagArray: 3c000000630000006f0000006c0000006f000000720000003d000000230000006600000062000000330000006600000037000000630000003e000000
     m_ClosingTagArray: 3c0000002f000000630000006f0000006c0000006f000000720000003e000000
   - m_Name: C2
     m_HashCode: 2193
@@ -66,3 +67,9 @@ MonoBehaviour:
     m_ClosingDefinition: </color></b>
     m_OpeningTagArray: 3c000000630000006f0000006c0000006f000000720000003d000000230000003800000030000000410000003000000046000000460000003e0000003c000000620000003e000000
     m_ClosingTagArray: 3c0000002f000000630000006f0000006c0000006f000000720000003e0000003c0000002f000000620000003e000000
+  - m_Name: Normal
+    m_HashCode: -1183493901
+    m_OpeningDefinition: 
+    m_ClosingDefinition: 
+    m_OpeningTagArray: 
+    m_ClosingTagArray: