Skip to content

Commit 9e55780

Browse files
committed
Merge branch 'update-ui-for-builds'
2 parents bf2c6f2 + 09c24e3 commit 9e55780

File tree

16 files changed

+784
-240
lines changed

16 files changed

+784
-240
lines changed

.gitattributes

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
# Auto detect text files and perform LF normalization
22
* text=auto
3-
4-
5-
6-
73
*.psd filter=lfs diff=lfs merge=lfs -text
84
*.png filter=lfs diff=lfs merge=lfs -text
95
*.tga filter=lfs diff=lfs merge=lfs -text
@@ -12,3 +8,5 @@
128
*.prefab filter=lfs diff=lfs merge=lfs -text
139
*.fbx filter=lfs diff=lfs merge=lfs -text
1410
*.xcf filter=lfs diff=lfs merge=lfs -text
11+
*.app filter=lfs diff=lfs merge=lfs -text
12+
*.assets filter=lfs diff=lfs merge=lfs -text

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,5 @@ ExportedObj/
4747
Packages/manifest.json
4848

4949
ProjectSettings/PresetManager.asset
50+
51+
_Releases

Assets/TextMesh Pro/Resources/Style Sheets/Default Style Sheet.asset

100755100644
Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
--- !u!114 &11400000
44
MonoBehaviour:
55
m_ObjectHideFlags: 0
6-
m_PrefabParentObject: {fileID: 0}
7-
m_PrefabInternal: {fileID: 0}
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
89
m_GameObject: {fileID: 0}
910
m_Enabled: 1
1011
m_EditorHideFlags: 0
@@ -19,19 +20,19 @@ MonoBehaviour:
1920
m_OpeningTagArray: 3c00000073000000690000007a000000650000003d00000032000000650000006d0000003e0000003c000000620000003e0000003c000000230000003400000030000000660000006600000038000000300000003e0000002a000000
2021
m_ClosingTagArray: 2a0000003c0000002f00000073000000690000007a000000650000003e0000003c0000002f000000620000003e0000003c0000002f000000630000006f0000006c0000006f000000720000003e000000
2122
- m_Name: Quote
22-
m_HashCode: 92254330
23+
m_HashCode: 93368250
2324
m_OpeningDefinition: <i><size=75%><margin=10%>
2425
m_ClosingDefinition: </i></size></width></margin>
2526
m_OpeningTagArray: 3c000000690000003e0000003c00000073000000690000007a000000650000003d0000003700000035000000250000003e0000003c0000006d000000610000007200000067000000690000006e0000003d0000003100000030000000250000003e000000
2627
m_ClosingTagArray: 3c0000002f000000690000003e0000003c0000002f00000073000000690000007a000000650000003e0000003c0000002f00000077000000690000006400000074000000680000003e0000003c0000002f0000006d000000610000007200000067000000690000006e0000003e000000
2728
- m_Name: Link
28-
m_HashCode: 2687968
29+
m_HashCode: 2656128
2930
m_OpeningDefinition: <u><#40a0ff><link="ID_01">
3031
m_ClosingDefinition: </u></color></link>
3132
m_OpeningTagArray: 3c000000750000003e0000003c000000230000003400000030000000610000003000000066000000660000003e0000003c0000006c000000690000006e0000006b0000003d0000002200000049000000440000005f0000003000000031000000220000003e000000
3233
m_ClosingTagArray: 3c0000002f000000750000003e0000003c0000002f000000630000006f0000006c0000006f000000720000003e0000003c0000002f0000006c000000690000006e0000006b0000003e000000
3334
- m_Name: Title
34-
m_HashCode: 98732960
35+
m_HashCode: 97690656
3536
m_OpeningDefinition: <size=125%><b><align=center>
3637
m_ClosingDefinition: </size></b></align>
3738
m_OpeningTagArray: 3c00000073000000690000007a000000650000003d000000310000003200000035000000250000003e0000003c000000620000003e0000003c000000610000006c00000069000000670000006e0000003d00000063000000650000006e0000007400000065000000720000003e000000
@@ -50,9 +51,9 @@ MonoBehaviour:
5051
m_ClosingTagArray: 3c0000002f00000073000000690000007a000000650000003e0000003c0000002f000000620000003e0000003c0000002f000000630000006f0000006c0000006f000000720000003e000000
5152
- m_Name: C1
5253
m_HashCode: 2194
53-
m_OpeningDefinition: <color=#ffff40>
54+
m_OpeningDefinition: <color=#fb3f7c>
5455
m_ClosingDefinition: </color>
55-
m_OpeningTagArray: 3c000000630000006f0000006c0000006f000000720000003d000000230000006600000066000000660000006600000034000000300000003e000000
56+
m_OpeningTagArray: 3c000000630000006f0000006c0000006f000000720000003d000000230000006600000062000000330000006600000037000000630000003e000000
5657
m_ClosingTagArray: 3c0000002f000000630000006f0000006c0000006f000000720000003e000000
5758
- m_Name: C2
5859
m_HashCode: 2193
@@ -66,3 +67,9 @@ MonoBehaviour:
6667
m_ClosingDefinition: </color></b>
6768
m_OpeningTagArray: 3c000000630000006f0000006c0000006f000000720000003d000000230000003800000030000000410000003000000046000000460000003e0000003c000000620000003e000000
6869
m_ClosingTagArray: 3c0000002f000000630000006f0000006c0000006f000000720000003e0000003c0000002f000000620000003e000000
70+
- m_Name: Normal
71+
m_HashCode: -1183493901
72+
m_OpeningDefinition:
73+
m_ClosingDefinition:
74+
m_OpeningTagArray:
75+
m_ClosingTagArray:

0 commit comments

Comments
 (0)