Merge pull request #15 from matryx/Develop

1.18 Merge
matryx · May 31, 2019 · fe67378 · fe67378
2 parents 4b204cc + b453689
commit fe67378
Show file tree

Hide file tree

Showing 8 changed files with 8,250 additions and 9,872 deletions.
diff --git a/Assets/Avatars/CombinedAvatar.prefab b/Assets/Avatars/CombinedAvatar.prefab
diff --git a/Assets/_Scenes/14 - ElectronOrbitalDensity.unity b/Assets/_Scenes/14 - ElectronOrbitalDensity.unity
@@ -14507,6 +14507,7 @@ MonoBehaviour:
   manageTournamentMenu: {fileID: 0}
   mainPanel: {fileID: 0}
   timeRemainingText: {fileID: 0}
+  timeRemainingIcon: {fileID: 0}
   bountyText: {fileID: 1738718851}
   titleText: {fileID: 1426913084}
   creatorText: {fileID: 0}
@@ -17608,7 +17609,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 2027696674}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: -806885394, guid: b5bd0d848a86e48409fe56688d66ecb5, type: 3}
+  m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
@@ -17619,9 +17620,11 @@ MonoBehaviour:
       m_Calls: []
     m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
       Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
-  m_text: "\t <b>Electron Orbital Shells</b>\n\nView and manipulate various electron
-    subshells and orbitals as well as their configurations in a 3rd Dimension to intuitively
-    understand them like never before."
+  m_text: '<b>Electron Orbital Shells</b>
+
+
+    View and manipulate various electron subshells and orbitals as well as their configurations
+    in a 3rd Dimension to intuitively understand them like never before.'
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -17633,6 +17636,7 @@ MonoBehaviour:
     rgba: 4294967295
   m_fontColor: {r: 1, g: 1, b: 1, a: 1}
   m_enableVertexGradient: 0
+  m_colorMode: 3
   m_fontColorGradient:
     topLeft: {r: 1, g: 1, b: 1, a: 1}
     topRight: {r: 1, g: 1, b: 1, a: 1}
@@ -17655,7 +17659,7 @@ MonoBehaviour:
   m_fontSizeMin: 18
   m_fontSizeMax: 72
   m_fontStyle: 0
-  m_textAlignment: 257
+  m_textAlignment: 258
   m_isAlignmentEnumConverted: 1
   m_characterSpacing: 0
   m_wordSpacing: 0
@@ -17669,6 +17673,7 @@ MonoBehaviour:
   m_firstOverflowCharacterIndex: -1
   m_linkedTextComponent: {fileID: 0}
   m_isLinkedTextComponent: 0
+  m_isTextTruncated: 0
   m_enableKerning: 1
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
@@ -17685,13 +17690,13 @@ MonoBehaviour:
   m_firstVisibleCharacter: 0
   m_useMaxVisibleDescender: 1
   m_pageToDisplay: 1
-  m_margin: {x: -1.0401267, y: -2.885236, z: -0.81211066, w: -2.8966777}
+  m_margin: {x: -1.599257, y: -2.630151, z: -1.3651555, w: -3.1512103}
   m_textInfo:
     textComponent: {fileID: 2027696676}
-    characterCount: 187
+    characterCount: 185
     spriteCount: 0
-    spaceCount: 29
-    wordCount: 28
+    spaceCount: 27
+    wordCount: 27
     linkCount: 0
     lineCount: 7
     pageCount: 1