Merge remote-tracking branch 'origin/master' into 1.12
# Conflicts: # Source/Editor/Options/InterfaceOptions.cs # Source/Engine/Audio/OpenAL/AudioBackendOAL.cpp # Source/Engine/Graphics/Graphics.cpp # Source/Engine/GraphicsDevice/Vulkan/CmdBufferVulkan.cpp # Source/Engine/GraphicsDevice/Vulkan/CmdBufferVulkan.h # Source/Engine/GraphicsDevice/Vulkan/Config.h # Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.cpp # Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.h # Source/Engine/GraphicsDevice/Vulkan/QueueVulkan.cpp
This commit is contained in:
@@ -161,7 +161,7 @@ namespace FlaxEditor.Options
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Options focus Game Window behaviour when play mode is entered.
|
||||
/// Options for focus Game Window behaviour when play mode is entered.
|
||||
/// </summary>
|
||||
public enum PlayModeFocus
|
||||
{
|
||||
@@ -209,6 +209,22 @@ namespace FlaxEditor.Options
|
||||
ClientSide,
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Generic options for a disabled or hidden state. Used for example in create content button.
|
||||
/// </summary>
|
||||
public enum DisabledHidden
|
||||
{
|
||||
/// <summary>
|
||||
/// Disabled state.
|
||||
/// </summary>
|
||||
Disabled,
|
||||
|
||||
/// <summary>
|
||||
/// Hidden state.
|
||||
/// </summary>
|
||||
Hidden,
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the Editor User Interface scale. Applied to all UI elements, windows and text. Can be used to scale the interface up on a bigger display. Editor restart required.
|
||||
/// </summary>
|
||||
@@ -562,6 +578,13 @@ namespace FlaxEditor.Options
|
||||
[EditorDisplay("Visject", "Warn when deleting used parameter"), EditorOrder(552)]
|
||||
public bool WarnOnDeletingUsedVisjectParameter { get; set; } = true;
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets a value indicating what should happen to unavaliable options in the content create menu.
|
||||
/// </summary>
|
||||
[DefaultValue(DisabledHidden.Hidden)]
|
||||
[EditorDisplay("Content"), EditorOrder(600)]
|
||||
public DisabledHidden UnavaliableContentCreateOptions { get; set; } = DisabledHidden.Hidden;
|
||||
|
||||
private static FontAsset DefaultFont => FlaxEngine.Content.LoadAsyncInternal<FontAsset>(EditorAssets.PrimaryFont);
|
||||
private static FontAsset ConsoleFont => FlaxEngine.Content.LoadAsyncInternal<FontAsset>(EditorAssets.InconsolataRegularFont);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user