Merge branch 'master' of https://github.com/HydrogenC/FlaxEngine into HydrogenC-master

Source/Engine/Core/Config/GameSettings.cs

@@ -119,7 +119,7 @@ namespace FlaxEditor.Content.Settings
         /// <summary>
         /// The custom settings to use with a game. Can be specified by the user to define game-specific options and be used by the external plugins (used as key-value pair).
         /// </summary>
-        [EditorOrder(1100), EditorDisplay("Other Settings"), Tooltip("The custom settings to use with a game. Can be specified by the user to define game-specific options and be used by the external plugins (used as key-value pair).")]
+        [EditorOrder(1500), EditorDisplay("Other Settings"), Tooltip("The custom settings to use with a game. Can be specified by the user to define game-specific options and be used by the external plugins (used as key-value pair).")]
         public Dictionary<string, JsonAsset> CustomSettings;
 
 #if FLAX_EDITOR || PLATFORM_WINDOWS

Source/Engine/Core/Config/GameSettings.h

@@ -7,6 +7,8 @@
 #include "Engine/Core/Types/String.h"
 #include "Engine/Core/Collections/Dictionary.h"
 
+class FontFallbackList;
+
 /// <summary>
 /// The main game engine configuration service. Loads and applies game configuration.
 /// </summary>

Source/Engine/Core/Config/GraphicsSettings.h

@@ -6,6 +6,8 @@
 #include "Engine/Graphics/Enums.h"
 #include "Engine/Graphics/PostProcessSettings.h"
 
+class FontFallbackList;
+
 /// <summary>
 /// Graphics rendering settings.
 /// </summary>
@@ -118,6 +120,18 @@ public:
     API_FIELD(Attributes="EditorOrder(10000), EditorDisplay(\"Post Process Settings\", EditorDisplayAttribute.InlineStyle)")
     PostProcessSettings PostProcessSettings;
 
+    /// <summary>
+    /// Whether to enable font fallbacking globally. 
+    /// </summary>
+    API_FIELD(Attributes = "EditorOrder(12000), EditorDisplay(\"Text Render Settings\", EditorDisplayAttribute.InlineStyle)")
+    bool EnableFontFallback = true;
+
+    /// <summary>
+    /// The fallback fonts used for text rendering, ignored if null.
+    /// </summary>
+    API_FIELD(Attributes = "EditorOrder(12005), EditorDisplay(\"Text Render Settings\", EditorDisplayAttribute.InlineStyle)")
+    FontFallbackList* FallbackFonts;
+
 private:
     /// <summary>
     /// Renamed UeeHDRProbes into UseHDRProbes