[fix, docs] Added a new logo, splash image, and some minor editor fixes

Owmacohe · Mar 18, 2024 · 8590c7e · 8590c7e
1 parent 5b14ede
commit 8590c7e
Show file tree

Hide file tree

Showing 44 changed files with 2,236 additions and 137 deletions.
diff --git a/Assets/ConversationUI.prefab b/Assets/ConversationUI.prefab
@@ -519,7 +519,7 @@ RectTransform:
   m_GameObject: {fileID: 8087387361097161738}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 2904968245057490240}

diff --git a/Assets/DescantActorEditorStyleSheet.uss b/Assets/DescantActorEditorStyleSheet.uss
diff --git a/Assets/DescantActorEditorStyleSheet.uss.meta b/Assets/DescantActorEditorStyleSheet.uss.meta
diff --git a/Assets/DescantGraphEditorStyleSheet.uss b/Assets/DescantGraphEditorStyleSheet.uss
@@ -233,6 +233,11 @@ DescantChoiceNode #output TextField TextElement {
     margin: 2;
 }
 
+DescantChoiceNode #output .choice_number {
+    margin-right: 5;
+    font-size: 18;
+}
+
 DescantChoiceNode #contents Button,
 DescantResponseNode #contents Button,
 DescantStartNode #contents Button,

diff --git a/Components/DescantComponentUtilities.cs b/Components/DescantComponentUtilities.cs
@@ -77,8 +77,8 @@ public static float GetComponentMaximum(string componentName)
         /// <param name="type">The type of the parameter</param>
         public static object GetComponentParameterValue(string value, Type type)
         {
-            if (type == typeof(int)) return float.Parse(value);
-            if (type == typeof(float)) return float.Parse(value);
+            if (type == typeof(int)) return value.Trim().Equals("") ? 0 : int.Parse(value);
+            if (type == typeof(float)) return value.Trim().Equals("") ? 0f : float.Parse(value);
             return value;
         }
 

diff --git a/Descant-1.1.1.unitypackage.meta b/Descant-1.1.1.unitypackage.meta
diff --git a/Documentation/Website/.idea/.gitignore b/Documentation/Website/.idea/.gitignore
diff --git a/Documentation/Website/.idea/Website.iml b/Documentation/Website/.idea/Website.iml
diff --git a/Documentation/Website/.idea/modules.xml b/Documentation/Website/.idea/modules.xml
diff --git a/Documentation/Website/.idea/vcs.xml b/Documentation/Website/.idea/vcs.xml
diff --git a/Documentation/Website/Descant_Logo_C_200.png b/Documentation/Website/Descant_Logo_C_200.png
diff --git a/Documentation/Website/Descant_Logo_C_200.png.meta b/Documentation/Website/Descant_Logo_C_200.png.meta
diff --git a/Documentation/Website/Descant_Splash_Image.png b/Documentation/Website/Descant_Splash_Image.png