From 39f4c00135eb46232a051131b01ff23d14e3871f Mon Sep 17 00:00:00 2001
From: envision3d <envision3d@envision3d.org>
Date: Wed, 28 Jun 2023 02:02:10 -0500
Subject: [PATCH 01/22] add play button actions, number of players

- add context menu support for toolstrip buttons
- add "Play Game" vs. "Play Scenes"
- add context menu for choosing play button action to toolstrip button
- add number of game client selection for cook & run
- add context menu for cook & run to toolstrip button
- add menu items for the above
- add editor option entries for saving user preferences for the above
---
 .../ContextMenuSingleSelectGroup.cs           | 108 ++++++++++++
 Source/Editor/GUI/ToolStrip.cs                |  24 ++-
 Source/Editor/GUI/ToolStripButton.cs          |  62 +++++--
 Source/Editor/Modules/UIModule.cs             | 140 +++++++++++++++-
 Source/Editor/Options/InterfaceOptions.cs     |  38 ++++-
 Source/Editor/Windows/GameCookerWindow.cs     | 157 ++++++++++--------
 .../Editor/Windows/Profiler/ProfilerWindow.cs |   2 +-
 7 files changed, 427 insertions(+), 104 deletions(-)
 create mode 100644 Source/Editor/GUI/ContextMenu/ContextMenuSingleSelectGroup.cs

diff --git a/Source/Editor/GUI/ContextMenu/ContextMenuSingleSelectGroup.cs b/Source/Editor/GUI/ContextMenu/ContextMenuSingleSelectGroup.cs
new file mode 100644
index 000000000..794729547
--- /dev/null
+++ b/Source/Editor/GUI/ContextMenu/ContextMenuSingleSelectGroup.cs
@@ -0,0 +1,108 @@
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using FlaxEngine;
+using FlaxEngine.GUI;
+
+namespace FlaxEditor.GUI.ContextMenu
+{
+    /// <summary>
+    /// Context menu single select group.
+    /// </summary>
+    [HideInEditor]
+    class ContextMenuSingleSelectGroup<T>
+    {
+        public struct SingleSelectGroupItem<U>
+        {
+            public string text;
+            public U value;
+            public Action onSelected;
+            public List<ContextMenuButton> buttons;
+        }
+
+        private List<ContextMenu> _menus = new List<ContextMenu>();
+        private List<SingleSelectGroupItem<T>> _items = new List<SingleSelectGroupItem<T>>();
+        public Action<T> OnSelectionChanged;
+
+        public SingleSelectGroupItem<T> activeItem;
+
+        public ContextMenuSingleSelectGroup<T> AddItem(string text, T value, Action onSelected = null)
+        {
+            var item = new SingleSelectGroupItem<T>
+            {
+                text = text,
+                value = value,
+                onSelected = onSelected,
+                buttons = new List<ContextMenuButton>()
+            };
+            _items.Add(item);
+
+            foreach (var contextMenu in _menus)
+                AddItemToContextMenu(contextMenu, item);
+
+            return this;
+        }
+
+        public ContextMenuSingleSelectGroup<T> AddItemsToContextMenu(ContextMenu contextMenu)
+        {
+            _menus.Add(contextMenu);
+
+            for (int i = 0; i < _items.Count; i++)
+            {
+                AddItemToContextMenu(contextMenu, _items[i]);
+            }
+
+            return this;
+        }
+
+        private void AddItemToContextMenu(ContextMenu contextMenu, SingleSelectGroupItem<T> item)
+        {
+            var btn = contextMenu.AddButton(item.text, () =>
+            {
+                SetItemAsActive(item);
+            });
+
+            item.buttons.Add(btn);
+
+            if (item.Equals(activeItem))
+            {
+                btn.Checked = true;
+            }
+        }
+
+        private void DeselectAll()
+        {
+            foreach (var item in _items)
+            {
+                foreach (var btn in item.buttons) btn.Checked = false;
+            }
+        }
+
+        public void SetItemAsActive(T value)
+        {
+            var index = _items.FindIndex(x => x.value.Equals(value));
+
+            if (index == -1) return;
+
+            SetItemAsActive(_items[index]);
+        }
+
+        private void SetItemAsActive(SingleSelectGroupItem<T> item)
+        {
+            DeselectAll();
+
+            var index = _items.IndexOf(item);
+            OnSelectionChanged?.Invoke(item.value);
+            item.onSelected?.Invoke();
+
+            foreach (var btn in item.buttons)
+            {
+                btn.Checked = true;
+            }
+
+            activeItem = item;
+        }
+    }
+}
diff --git a/Source/Editor/GUI/ToolStrip.cs b/Source/Editor/GUI/ToolStrip.cs
index 6a881281f..858e21b51 100644
--- a/Source/Editor/GUI/ToolStrip.cs
+++ b/Source/Editor/GUI/ToolStrip.cs
@@ -23,9 +23,14 @@ namespace FlaxEditor.GUI
         public const int DefaultMarginH = 2;
 
         /// <summary>
-        /// Event fired when button gets clicked.
+        /// Event fired when button gets clicked with the primary mouse button.
         /// </summary>
-        public Action<ToolStripButton> ButtonClicked;
+        public Action<ToolStripButton> ButtonPrimaryClicked;
+
+        /// <summary>
+        /// Event fired when button gets clicked with the secondary mouse button.
+        /// </summary>
+        public Action<ToolStripButton> ButtonSecondaryClicked;
 
         /// <summary>
         /// Tries to get the last button.
@@ -91,7 +96,7 @@ namespace FlaxEditor.GUI
                 Parent = this,
             };
             if (onClick != null)
-                button.Clicked += onClick;
+                button.PrimaryClicked += onClick;
             return button;
         }
 
@@ -110,7 +115,7 @@ namespace FlaxEditor.GUI
                 Parent = this,
             };
             if (onClick != null)
-                button.Clicked += onClick;
+                button.PrimaryClicked += onClick;
             return button;
         }
 
@@ -128,7 +133,7 @@ namespace FlaxEditor.GUI
                 Parent = this,
             };
             if (onClick != null)
-                button.Clicked += onClick;
+                button.PrimaryClicked += onClick;
             return button;
         }
 
@@ -141,9 +146,14 @@ namespace FlaxEditor.GUI
             return AddChild(new ToolStripSeparator(ItemsHeight));
         }
 
-        internal void OnButtonClicked(ToolStripButton button)
+        internal void OnButtonPrimaryClicked(ToolStripButton button)
         {
-            ButtonClicked?.Invoke(button);
+            ButtonPrimaryClicked?.Invoke(button);
+        }
+
+        internal void OnButtonSecondaryClicked(ToolStripButton button)
+        {
+            ButtonSecondaryClicked?.Invoke(button);
         }
 
         /// <inheritdoc />
diff --git a/Source/Editor/GUI/ToolStripButton.cs b/Source/Editor/GUI/ToolStripButton.cs
index 09a26b940..f8d032696 100644
--- a/Source/Editor/GUI/ToolStripButton.cs
+++ b/Source/Editor/GUI/ToolStripButton.cs
@@ -11,8 +11,12 @@ namespace FlaxEditor.GUI
     /// </summary>
     /// <seealso cref="FlaxEngine.GUI.Control" />
     [HideInEditor]
-    public class ToolStripButton : Control
+    public partial class ToolStripButton : Control
     {
+        // TODO: abstracted for potential future in-editor input configuration (ex. for left handed mouse users)
+        private const MouseButton PRIMARY_MOUSE_BUTTON = MouseButton.Left;
+        private const MouseButton SECONDARY_MOUSE_BUTTON = MouseButton.Right;
+
         /// <summary>
         /// The default margin for button parts (icon, text, etc.).
         /// </summary>
@@ -20,12 +24,18 @@ namespace FlaxEditor.GUI
 
         private SpriteHandle _icon;
         private string _text;
-        private bool _mouseDown;
+        private bool _primaryMouseDown;
+        private bool _secondaryMouseDown;
 
         /// <summary>
         /// Event fired when user clicks the button.
         /// </summary>
-        public Action Clicked;
+        public Action PrimaryClicked;
+
+        /// <summary>
+        /// Event fired when user clicks the button.
+        /// </summary>
+        public Action SecondaryClicked;
 
         /// <summary>
         /// The checked state.
@@ -63,6 +73,11 @@ namespace FlaxEditor.GUI
             }
         }
 
+        /// <summary>
+        /// A reference to a context menu to raise when the secondary mouse button is pressed.
+        /// </summary>
+        public ContextMenu.ContextMenu ContextMenu;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ToolStripButton"/> class.
         /// </summary>
@@ -108,10 +123,11 @@ namespace FlaxEditor.GUI
             var iconRect = new Rectangle(DefaultMargin, DefaultMargin, iconSize, iconSize);
             var textRect = new Rectangle(DefaultMargin, 0, 0, Height);
             bool enabled = EnabledInHierarchy;
+            bool mouseButtonDown = _primaryMouseDown || _secondaryMouseDown;
 
             // Draw background
             if (enabled && (IsMouseOver || IsNavFocused || Checked))
-                Render2D.FillRectangle(clientRect, Checked ? style.BackgroundSelected : _mouseDown ? style.BackgroundHighlighted : (style.LightBackground * 1.3f));
+                Render2D.FillRectangle(clientRect, Checked ? style.BackgroundSelected : mouseButtonDown ? style.BackgroundHighlighted : (style.LightBackground * 1.3f));
 
             // Draw icon
             if (_icon.IsValid)
@@ -153,10 +169,18 @@ namespace FlaxEditor.GUI
         /// <inheritdoc />
         public override bool OnMouseDown(Float2 location, MouseButton button)
         {
-            if (button == MouseButton.Left)
+            if (button == PRIMARY_MOUSE_BUTTON)
             {
                 // Set flag
-                _mouseDown = true;
+                _primaryMouseDown = true;
+
+                Focus();
+                return true;
+            }
+            else if (button == SECONDARY_MOUSE_BUTTON)
+            {
+                // Set flag
+                _secondaryMouseDown = true;
 
                 Focus();
                 return true;
@@ -168,16 +192,28 @@ namespace FlaxEditor.GUI
         /// <inheritdoc />
         public override bool OnMouseUp(Float2 location, MouseButton button)
         {
-            if (button == MouseButton.Left && _mouseDown)
+            if (button == PRIMARY_MOUSE_BUTTON && _primaryMouseDown)
             {
                 // Clear flag
-                _mouseDown = false;
+                _primaryMouseDown = false;
 
                 // Fire events
                 if (AutoCheck)
                     Checked = !Checked;
-                Clicked?.Invoke();
-                (Parent as ToolStrip)?.OnButtonClicked(this);
+                PrimaryClicked?.Invoke();
+                (Parent as ToolStrip)?.OnButtonPrimaryClicked(this);
+
+                return true;
+            }
+            else if (button == SECONDARY_MOUSE_BUTTON && _secondaryMouseDown)
+            {
+                // Clear flag
+                _secondaryMouseDown = false;
+
+                SecondaryClicked?.Invoke();
+                (Parent as ToolStrip)?.OnButtonSecondaryClicked(this);
+
+                ContextMenu?.Show(this, new Float2(0, Height));
 
                 return true;
             }
@@ -189,7 +225,8 @@ namespace FlaxEditor.GUI
         public override void OnMouseLeave()
         {
             // Clear flag
-            _mouseDown = false;
+            _primaryMouseDown = false;
+            _secondaryMouseDown = false;
 
             base.OnMouseLeave();
         }
@@ -198,7 +235,8 @@ namespace FlaxEditor.GUI
         public override void OnLostFocus()
         {
             // Clear flag
-            _mouseDown = false;
+            _primaryMouseDown = false;
+            _secondaryMouseDown = false;
 
             base.OnLostFocus();
         }
diff --git a/Source/Editor/Modules/UIModule.cs b/Source/Editor/Modules/UIModule.cs
index 858ef2b1a..c41ccbec3 100644
--- a/Source/Editor/Modules/UIModule.cs
+++ b/Source/Editor/Modules/UIModule.cs
@@ -20,6 +20,8 @@ using FlaxEngine.GUI;
 using FlaxEngine.Json;
 using DockHintWindow = FlaxEditor.GUI.Docking.DockHintWindow;
 using MasterDockPanel = FlaxEditor.GUI.Docking.MasterDockPanel;
+using FlaxEditor.Content.Settings;
+using static FlaxEditor.Options.InterfaceOptions;
 
 namespace FlaxEditor.Modules
 {
@@ -36,6 +38,9 @@ namespace FlaxEditor.Modules
         private ContentStats _contentStats;
         private bool _progressFailed;
 
+        ContextMenuSingleSelectGroup<int> _numberOfClientsGroup = new ContextMenuSingleSelectGroup<int>();
+        private Scene[] _scenesToReload;
+
         private ContextMenuButton _menuFileSaveScenes;
         private ContextMenuButton _menuFileCloseScenes;
         private ContextMenuButton _menuFileGenerateScriptsProjectFiles;
@@ -54,7 +59,9 @@ namespace FlaxEditor.Modules
         private ContextMenuButton _menuSceneAlignViewportWithActor;
         private ContextMenuButton _menuScenePilotActor;
         private ContextMenuButton _menuSceneCreateTerrain;
-        private ContextMenuButton _menuGamePlay;
+        private ContextMenuButton _menuGamePlayGame;
+        private ContextMenuButton _menuGamePlayCurrentScenes;
+        private ContextMenuButton _menuGameStop;
         private ContextMenuButton _menuGamePause;
         private ContextMenuButton _menuToolsBuildScenes;
         private ContextMenuButton _menuToolsBakeLightmaps;
@@ -74,6 +81,7 @@ namespace FlaxEditor.Modules
         private ToolStripButton _toolStripRotate;
         private ToolStripButton _toolStripScale;
         private ToolStripButton _toolStripBuildScenes;
+        private ToolStripButton _toolStripCook;
         private ToolStripButton _toolStripPlay;
         private ToolStripButton _toolStripPause;
         private ToolStripButton _toolStripStep;
@@ -351,6 +359,7 @@ namespace FlaxEditor.Modules
             // Update window background
             mainWindow.BackgroundColor = Style.Current.Background;
 
+            InitSharedMenus();
             InitMainMenu(mainWindow);
             InitToolstrip(mainWindow);
             InitStatusBar(mainWindow);
@@ -466,6 +475,19 @@ namespace FlaxEditor.Modules
             return dialog;
         }
 
+        private void InitSharedMenus()
+        {
+            for (int i = 1; i <= 4; i++) _numberOfClientsGroup.AddItem(i.ToString(), i);
+
+            _numberOfClientsGroup.SetItemAsActive(Editor.Options.Options.Interface.NumberOfGameClientsToLaunch);
+            _numberOfClientsGroup.OnSelectionChanged = (value) =>
+            {
+                var options = Editor.Options.Options;
+                options.Interface.NumberOfGameClientsToLaunch = value;
+                Editor.Options.Apply(options);
+            };
+        }
+
         private void InitMainMenu(RootControl mainWindow)
         {
             MainMenu = new MainMenu(mainWindow)
@@ -523,11 +545,19 @@ namespace FlaxEditor.Modules
             MenuGame = MainMenu.AddButton("Game");
             cm = MenuGame.ContextMenu;
             cm.VisibleChanged += OnMenuGameShowHide;
-            _menuGamePlay = cm.AddButton("Play", inputOptions.Play.ToString(), Editor.Simulation.RequestStartPlay);
+
+            _menuGamePlayGame = cm.AddButton("Play Game", PlayGame);
+            _menuGamePlayCurrentScenes = cm.AddButton("Play Current Scenes", inputOptions.Play.ToString(), PlayScenes);
+            _menuGameStop = cm.AddButton("Stop Game", Editor.Simulation.RequestStopPlay);
             _menuGamePause = cm.AddButton("Pause", inputOptions.Pause.ToString(), Editor.Simulation.RequestPausePlay);
+
             cm.AddSeparator();
-            cm.AddButton("Cook & Run", Editor.Windows.GameCookerWin.BuildAndRun).LinkTooltip("Runs Game Cooker to build the game for this platform and runs the game after.");
-            cm.AddButton("Run cooked game", Editor.Windows.GameCookerWin.RunCooked).LinkTooltip("Runs the game build from the last cooking output. Use Cook&Play or Game Cooker first.");
+            var numberOfClientsMenu = cm.AddChildMenu("Number of game clients");
+            _numberOfClientsGroup.AddItemsToContextMenu(numberOfClientsMenu.ContextMenu);
+
+            cm.AddSeparator();
+            cm.AddButton("Cook & Run", CookAndRun).LinkTooltip("Runs Game Cooker to build the game for this platform and runs the game after.");
+            cm.AddButton("Run cooked game", RunCookedGame).LinkTooltip("Runs the game build from the last cooking output. Use Cook&Play or Game Cooker first.");
 
             // Tools
             MenuTools = MainMenu.AddButton("Tools");
@@ -603,7 +633,7 @@ namespace FlaxEditor.Modules
             _menuEditDuplicate.ShortKeys = inputOptions.Duplicate.ToString();
             _menuEditSelectAll.ShortKeys = inputOptions.SelectAll.ToString();
             _menuEditFind.ShortKeys = inputOptions.Search.ToString();
-            _menuGamePlay.ShortKeys = inputOptions.Play.ToString();
+            _menuGamePlayCurrentScenes.ShortKeys = inputOptions.Play.ToString();
             _menuGamePause.ShortKeys = inputOptions.Pause.ToString();
 
             MainMenuShortcutKeysUpdated?.Invoke();
@@ -611,6 +641,8 @@ namespace FlaxEditor.Modules
 
         private void InitToolstrip(RootControl mainWindow)
         {
+            var inputOptions = Editor.Options.Options.Input;
+
             ToolStrip = new ToolStrip(34.0f, MainMenu.Bottom)
             {
                 Parent = mainWindow,
@@ -627,8 +659,34 @@ namespace FlaxEditor.Modules
             ToolStrip.AddSeparator();
             _toolStripBuildScenes = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Build64, Editor.BuildScenesOrCancel).LinkTooltip("Build scenes data - CSG, navmesh, static lighting, env probes - configurable via Build Actions in editor options (Ctrl+F10)");
             ToolStrip.AddSeparator();
-            _toolStripPlay = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Play64, Editor.Simulation.RequestPlayOrStopPlay).LinkTooltip("Start/Stop game (F5)");
-            _toolStripPause = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Pause64, Editor.Simulation.RequestResumeOrPause).LinkTooltip("Pause/Resume game(F6)");
+
+            // build
+            _toolStripCook = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.BuildSettings128, CookAndRun).LinkTooltip("Cook and run");
+            _toolStripCook.ContextMenu = new ContextMenu();
+            _toolStripCook.ContextMenu.AddButton("Run cooked game", RunCookedGame);
+            _toolStripCook.ContextMenu.AddSeparator();
+            var numberOfClientsMenu = _toolStripCook.ContextMenu.AddChildMenu("Number of game clients");
+            _numberOfClientsGroup.AddItemsToContextMenu(numberOfClientsMenu.ContextMenu);
+
+            // play
+            _toolStripPlay = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Play64, OnPlayPressed).LinkTooltip("Play Game");
+            _toolStripPlay.ContextMenu = new ContextMenu();
+            ContextMenuChildMenu playSubMenu;
+
+            // play - button action
+            playSubMenu = _toolStripPlay.ContextMenu.AddChildMenu("Play button action");
+            var playActionGroup = new ContextMenuSingleSelectGroup<PlayAction>();
+            playActionGroup.AddItem("Play Game", PlayAction.PlayGame);
+            playActionGroup.AddItem("Play Scenes", PlayAction.PlayScenes);
+            playActionGroup.AddItemsToContextMenu(playSubMenu.ContextMenu);
+            playActionGroup.SetItemAsActive(Editor.Options.Options.Interface.PlayButtonAction);
+            // important to add the handler after setting the initial item as active above or the editor will crash
+            playActionGroup.OnSelectionChanged = SetPlayAction;
+            // TODO: there are some holes in the syncing of these values
+            // - when changing in the editor, the options will be updated, but the options UI in-editor will not
+            // - when updating the value in the options UI, the value in the tool strip will not update (adding an options changed event handler results in a crash)
+
+            _toolStripPause = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Pause64, Editor.Simulation.RequestResumeOrPause).LinkTooltip($"Pause/Resume game({inputOptions.Pause.ToString()})");
             _toolStripStep = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Skip64, Editor.Simulation.RequestPlayOneFrame).LinkTooltip("Step one frame in game");
 
             UpdateToolstrip();
@@ -786,7 +844,9 @@ namespace FlaxEditor.Modules
             var isPlayMode = Editor.StateMachine.IsPlayMode;
             var canPlay = Level.IsAnySceneLoaded;
 
-            _menuGamePlay.Enabled = !isPlayMode && canPlay;
+            _menuGamePlayGame.Enabled = !isPlayMode && canPlay;
+            _menuGamePlayCurrentScenes.Enabled = !isPlayMode && canPlay;
+            _menuGameStop.Enabled = isPlayMode && canPlay;
             _menuGamePause.Enabled = isPlayMode && canPlay;
 
             c.PerformLayout();
@@ -968,6 +1028,70 @@ namespace FlaxEditor.Modules
             projectInfo.Save();
         }
 
+        private void SetPlayAction(PlayAction newPlayAction)
+        {
+            var options = Editor.Options.Options;
+            options.Interface.PlayButtonAction = newPlayAction;
+            Editor.Options.Apply(options);
+        }
+
+        private void OnPlayPressed()
+        {
+            switch (Editor.Options.Options.Interface.PlayButtonAction)
+            {
+                case PlayAction.PlayGame:
+                    if (Editor.IsPlayMode)
+                        Editor.Simulation.RequestStopPlay();
+                    else
+                        PlayGame();
+                    return;
+                case PlayAction.PlayScenes: PlayScenes(); return;
+            }
+        }
+
+        private void PlayGame()
+        {
+            var firstScene = GameSettings.Load().FirstScene;
+
+            if (firstScene == Guid.Empty)
+            {
+                if (Level.IsAnySceneLoaded) Editor.Simulation.RequestStartPlay();
+                return;
+            }
+
+            _scenesToReload = Level.Scenes;
+            Level.UnloadAllScenes();
+            Level.LoadScene(firstScene);
+
+            Editor.PlayModeEnd += OnPlayGameSceneEnding;
+            Editor.Simulation.RequestPlayOrStopPlay();
+        }
+
+        private void OnPlayGameSceneEnding()
+        {
+            Editor.PlayModeEnd -= OnPlayGameSceneEnding;
+
+            Level.UnloadAllScenes();
+
+            foreach (var scene in _scenesToReload)
+                Level.LoadScene(scene.ID);
+        }
+
+        private void PlayScenes()
+        {
+            Editor.Simulation.RequestPlayOrStopPlay();
+        }
+
+        private void CookAndRun()
+        {
+            Editor.Windows.GameCookerWin.BuildAndRun();
+        }
+
+        private void RunCookedGame()
+        {
+            Editor.Windows.GameCookerWin.RunCooked();
+        }
+
         private void OnMainWindowClosing()
         {
             // Clear UI references (GUI cannot be used after window closing)
diff --git a/Source/Editor/Options/InterfaceOptions.cs b/Source/Editor/Options/InterfaceOptions.cs
index acfb7f5e8..7d97fecd6 100644
--- a/Source/Editor/Options/InterfaceOptions.cs
+++ b/Source/Editor/Options/InterfaceOptions.cs
@@ -74,6 +74,21 @@ namespace FlaxEditor.Options
             DockBottom = DockState.DockBottom
         }
 
+        /// <summary>
+        /// Options for the action taken by the play button.
+        /// </summary>
+        public enum PlayAction
+        {
+            /// <summary>
+            /// Launches the game from the First Scene defined in the project settings.
+            /// </summary>
+            PlayGame,
+            /// <summary>
+            /// Launches the game using the scenes currently loaded in the editor.
+            /// </summary>
+            PlayScenes
+        }
+
         /// <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>
@@ -196,30 +211,45 @@ namespace FlaxEditor.Options
         [EditorDisplay("Play In-Editor", "Focus Game Window On Play"), EditorOrder(400), Tooltip("Determines whether auto-focus game window on play mode start.")]
         public bool FocusGameWinOnPlay { get; set; } = true;
 
+        /// <summary>
+        /// Gets or sets a value indicating what action should be taken upon pressing the play button.
+        /// </summary>
+        [DefaultValue(PlayAction.PlayScenes)]
+        [EditorDisplay("Play In-Editor", "Play Button Action"), EditorOrder(410), Tooltip("Determines the action taken when the play button is pressed.")]
+        public PlayAction PlayButtonAction { get; set; } = PlayAction.PlayScenes;
+
+        /// <summary>
+        /// Gets or sets a value indicating the number of game clients to launch when building and/or running cooked game.
+        /// </summary>
+        [DefaultValue(1)]
+        [EditorDisplay("Cook & Run", "Number Of GameClients To Launch"), EditorOrder(500), Tooltip("Determines the number of game clients to launch when building and/or running cooked game.")]
+        [Range(1, 4)]
+        public int NumberOfGameClientsToLaunch = 1;
+
         private static FontAsset DefaultFont => FlaxEngine.Content.LoadAsyncInternal<FontAsset>(EditorAssets.PrimaryFont);
 
         /// <summary>
         /// Gets or sets the title font for editor UI.
         /// </summary>
-        [EditorDisplay("Fonts"), EditorOrder(500), Tooltip("The title font for editor UI.")]
+        [EditorDisplay("Fonts"), EditorOrder(600), Tooltip("The title font for editor UI.")]
         public FontReference TitleFont { get; set; } = new FontReference(DefaultFont, 18);
 
         /// <summary>
         /// Gets or sets the large font for editor UI.
         /// </summary>
-        [EditorDisplay("Fonts"), EditorOrder(510), Tooltip("The large font for editor UI.")]
+        [EditorDisplay("Fonts"), EditorOrder(610), Tooltip("The large font for editor UI.")]
         public FontReference LargeFont { get; set; } = new FontReference(DefaultFont, 14);
 
         /// <summary>
         /// Gets or sets the medium font for editor UI.
         /// </summary>
-        [EditorDisplay("Fonts"), EditorOrder(520), Tooltip("The medium font for editor UI.")]
+        [EditorDisplay("Fonts"), EditorOrder(620), Tooltip("The medium font for editor UI.")]
         public FontReference MediumFont { get; set; } = new FontReference(DefaultFont, 9);
 
         /// <summary>
         /// Gets or sets the small font for editor UI.
         /// </summary>
-        [EditorDisplay("Fonts"), EditorOrder(530), Tooltip("The small font for editor UI.")]
+        [EditorDisplay("Fonts"), EditorOrder(630), Tooltip("The small font for editor UI.")]
         public FontReference SmallFont { get; set; } = new FontReference(DefaultFont, 9);
     }
 }
diff --git a/Source/Editor/Windows/GameCookerWindow.cs b/Source/Editor/Windows/GameCookerWindow.cs
index f3fd753d1..f88fa36f5 100644
--- a/Source/Editor/Windows/GameCookerWindow.cs
+++ b/Source/Editor/Windows/GameCookerWindow.cs
@@ -110,14 +110,14 @@ namespace FlaxEditor.Windows
 #if PLATFORM_WINDOWS
                     switch (BuildPlatform)
                     {
-                    case BuildPlatform.MacOSx64:
-                    case BuildPlatform.MacOSARM64:
-                    case BuildPlatform.iOSARM64:
-                        IsSupported = false;
-                        break;
-                    default:
-                        IsSupported = true;
-                        break;
+                        case BuildPlatform.MacOSx64:
+                        case BuildPlatform.MacOSARM64:
+                        case BuildPlatform.iOSARM64:
+                            IsSupported = false;
+                            break;
+                        default:
+                            IsSupported = true;
+                            break;
                     }
 #elif PLATFORM_LINUX
                     switch (BuildPlatform)
@@ -160,17 +160,17 @@ namespace FlaxEditor.Windows
                     {
                         switch (BuildPlatform)
                         {
-                        case BuildPlatform.Windows32:
-                        case BuildPlatform.Windows64:
-                        case BuildPlatform.UWPx86:
-                        case BuildPlatform.UWPx64:
-                        case BuildPlatform.LinuxX64:
-                        case BuildPlatform.AndroidARM64:
-                            layout.Label("Use Flax Launcher and download the required package.", TextAlignment.Center);
-                            break;
-                        default:
-                            layout.Label("Engine source is required to target this platform.", TextAlignment.Center);
-                            break;
+                            case BuildPlatform.Windows32:
+                            case BuildPlatform.Windows64:
+                            case BuildPlatform.UWPx86:
+                            case BuildPlatform.UWPx64:
+                            case BuildPlatform.LinuxX64:
+                            case BuildPlatform.AndroidARM64:
+                                layout.Label("Use Flax Launcher and download the required package.", TextAlignment.Center);
+                                break;
+                            default:
+                                layout.Label("Engine source is required to target this platform.", TextAlignment.Center);
+                                break;
                         }
                     }
                     else
@@ -272,43 +272,43 @@ namespace FlaxEditor.Windows
                         string name;
                         switch (_platform)
                         {
-                        case PlatformType.Windows:
-                            name = "Windows";
-                            break;
-                        case PlatformType.XboxOne:
-                            name = "Xbox One";
-                            break;
-                        case PlatformType.UWP:
-                            name = "Windows Store";
-                            layout.Label("UWP (Windows Store) platform has been deprecated and is no longer supported", TextAlignment.Center).Label.TextColor = Color.Red;
-                            break;
-                        case PlatformType.Linux:
-                            name = "Linux";
-                            break;
-                        case PlatformType.PS4:
-                            name = "PlayStation 4";
-                            break;
-                        case PlatformType.XboxScarlett:
-                            name = "Xbox Scarlett";
-                            break;
-                        case PlatformType.Android:
-                            name = "Android";
-                            break;
-                        case PlatformType.Switch:
-                            name = "Switch";
-                            break;
-                        case PlatformType.PS5:
-                            name = "PlayStation 5";
-                            break;
-                        case PlatformType.Mac:
-                            name = "Mac";
-                            break;
-                        case PlatformType.iOS:
-                            name = "iOS";
-                            break;
-                        default:
-                            name = Utilities.Utils.GetPropertyNameUI(_platform.ToString());
-                            break;
+                            case PlatformType.Windows:
+                                name = "Windows";
+                                break;
+                            case PlatformType.XboxOne:
+                                name = "Xbox One";
+                                break;
+                            case PlatformType.UWP:
+                                name = "Windows Store";
+                                layout.Label("UWP (Windows Store) platform has been deprecated and is no longer supported", TextAlignment.Center).Label.TextColor = Color.Red;
+                                break;
+                            case PlatformType.Linux:
+                                name = "Linux";
+                                break;
+                            case PlatformType.PS4:
+                                name = "PlayStation 4";
+                                break;
+                            case PlatformType.XboxScarlett:
+                                name = "Xbox Scarlett";
+                                break;
+                            case PlatformType.Android:
+                                name = "Android";
+                                break;
+                            case PlatformType.Switch:
+                                name = "Switch";
+                                break;
+                            case PlatformType.PS5:
+                                name = "PlayStation 5";
+                                break;
+                            case PlatformType.Mac:
+                                name = "Mac";
+                                break;
+                            case PlatformType.iOS:
+                                name = "iOS";
+                                break;
+                            default:
+                                name = Utilities.Utils.GetPropertyNameUI(_platform.ToString());
+                                break;
                         }
                         var group = layout.Group(name);
 
@@ -659,16 +659,24 @@ namespace FlaxEditor.Windows
         {
             Editor.Log("Building and running");
             GameCooker.GetCurrentPlatform(out var platform, out var buildPlatform, out var buildConfiguration);
-            _buildingQueue.Enqueue(new QueueItem
+            var numberOfClients = Editor.Options.Options.Interface.NumberOfGameClientsToLaunch;
+
+            for (int i = 0; i < numberOfClients; i++)
             {
-                Target = new BuildTarget
+                var buildOptions = BuildOptions.AutoRun;
+                if (i > 0) buildOptions |= BuildOptions.NoCook;
+
+                _buildingQueue.Enqueue(new QueueItem
                 {
-                    Output = _buildTabProxy.PerPlatformOptions[platform].Output,
-                    Platform = buildPlatform,
-                    Mode = buildConfiguration,
-                },
-                Options = BuildOptions.AutoRun,
-            });
+                    Target = new BuildTarget
+                    {
+                        Output = _buildTabProxy.PerPlatformOptions[platform].Output,
+                        Platform = buildPlatform,
+                        Mode = buildConfiguration,
+                    },
+                    Options = buildOptions,
+                });
+            }
         }
 
         /// <summary>
@@ -678,16 +686,21 @@ namespace FlaxEditor.Windows
         {
             Editor.Log("Running cooked build");
             GameCooker.GetCurrentPlatform(out var platform, out var buildPlatform, out var buildConfiguration);
-            _buildingQueue.Enqueue(new QueueItem
+            var numberOfClients = Editor.Options.Options.Interface.NumberOfGameClientsToLaunch;
+
+            for (int i = 0; i < numberOfClients; i++)
             {
-                Target = new BuildTarget
+                _buildingQueue.Enqueue(new QueueItem
                 {
-                    Output = _buildTabProxy.PerPlatformOptions[platform].Output,
-                    Platform = buildPlatform,
-                    Mode = buildConfiguration,
-                },
-                Options = BuildOptions.AutoRun | BuildOptions.NoCook,
-            });
+                    Target = new BuildTarget
+                    {
+                        Output = _buildTabProxy.PerPlatformOptions[platform].Output,
+                        Platform = buildPlatform,
+                        Mode = buildConfiguration,
+                    },
+                    Options = BuildOptions.AutoRun | BuildOptions.NoCook,
+                });
+            }
         }
 
         private void BuildTarget()
diff --git a/Source/Editor/Windows/Profiler/ProfilerWindow.cs b/Source/Editor/Windows/Profiler/ProfilerWindow.cs
index f5a5c6f86..b35641bf6 100644
--- a/Source/Editor/Windows/Profiler/ProfilerWindow.cs
+++ b/Source/Editor/Windows/Profiler/ProfilerWindow.cs
@@ -93,7 +93,7 @@ namespace FlaxEditor.Windows.Profiler
             _liveRecordingButton = toolstrip.AddButton(editor.Icons.Play64);
             _liveRecordingButton.LinkTooltip("Live profiling events recording");
             _liveRecordingButton.AutoCheck = true;
-            _liveRecordingButton.Clicked += () => _liveRecordingButton.Icon = LiveRecording ? editor.Icons.Stop64 : editor.Icons.Play64;
+            _liveRecordingButton.PrimaryClicked += () => _liveRecordingButton.Icon = LiveRecording ? editor.Icons.Stop64 : editor.Icons.Play64;
             _clearButton = toolstrip.AddButton(editor.Icons.Rotate32, Clear);
             _clearButton.LinkTooltip("Clear data");
             toolstrip.AddSeparator();

From 940b0e02e5d8410b3e6db7f39dfc40ce2faecdc7 Mon Sep 17 00:00:00 2001
From: envision3d <envision3d@envision3d.org>
Date: Wed, 28 Jun 2023 04:08:36 -0500
Subject: [PATCH 02/22] improve state syncing of context menus and editor
 options

---
 .../ContextMenuSingleSelectGroup.cs           |  3 +--
 Source/Editor/Modules/UIModule.cs             | 19 +++++++++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Source/Editor/GUI/ContextMenu/ContextMenuSingleSelectGroup.cs b/Source/Editor/GUI/ContextMenu/ContextMenuSingleSelectGroup.cs
index 794729547..9b58c09a8 100644
--- a/Source/Editor/GUI/ContextMenu/ContextMenuSingleSelectGroup.cs
+++ b/Source/Editor/GUI/ContextMenu/ContextMenuSingleSelectGroup.cs
@@ -92,6 +92,7 @@ namespace FlaxEditor.GUI.ContextMenu
         private void SetItemAsActive(SingleSelectGroupItem<T> item)
         {
             DeselectAll();
+            activeItem = item;
 
             var index = _items.IndexOf(item);
             OnSelectionChanged?.Invoke(item.value);
@@ -101,8 +102,6 @@ namespace FlaxEditor.GUI.ContextMenu
             {
                 btn.Checked = true;
             }
-
-            activeItem = item;
         }
     }
 }
diff --git a/Source/Editor/Modules/UIModule.cs b/Source/Editor/Modules/UIModule.cs
index c41ccbec3..5e0af20fe 100644
--- a/Source/Editor/Modules/UIModule.cs
+++ b/Source/Editor/Modules/UIModule.cs
@@ -486,6 +486,14 @@ namespace FlaxEditor.Modules
                 options.Interface.NumberOfGameClientsToLaunch = value;
                 Editor.Options.Apply(options);
             };
+
+            Editor.Options.OptionsChanged += (options) =>
+            {
+                if (options.Interface.NumberOfGameClientsToLaunch != _numberOfClientsGroup.activeItem.value)
+                {
+                    _numberOfClientsGroup.SetItemAsActive(options.Interface.NumberOfGameClientsToLaunch);
+                }
+            };
         }
 
         private void InitMainMenu(RootControl mainWindow)
@@ -682,9 +690,16 @@ namespace FlaxEditor.Modules
             playActionGroup.SetItemAsActive(Editor.Options.Options.Interface.PlayButtonAction);
             // important to add the handler after setting the initial item as active above or the editor will crash
             playActionGroup.OnSelectionChanged = SetPlayAction;
-            // TODO: there are some holes in the syncing of these values
+            // TODO: there is a hole in the syncing of these values:
             // - when changing in the editor, the options will be updated, but the options UI in-editor will not
-            // - when updating the value in the options UI, the value in the tool strip will not update (adding an options changed event handler results in a crash)
+
+            Editor.Options.OptionsChanged += (options) =>
+            {
+                if (options.Interface.PlayButtonAction != playActionGroup.activeItem.value)
+                {
+                    playActionGroup.SetItemAsActive(options.Interface.PlayButtonAction);
+                }
+            };
 
             _toolStripPause = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Pause64, Editor.Simulation.RequestResumeOrPause).LinkTooltip($"Pause/Resume game({inputOptions.Pause.ToString()})");
             _toolStripStep = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Skip64, Editor.Simulation.RequestPlayOneFrame).LinkTooltip("Step one frame in game");

From 83427ba1d492e3239e64e7a6669d8aa1db3d3470 Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Thu, 20 Jul 2023 23:02:26 -0500
Subject: [PATCH 03/22] Add batch creating prefabs from mutiple selected actors
 in the scene tree.

---
 .../Content/GUI/ContentView.DragDrop.cs       | 10 ++++-
 Source/Editor/Modules/PrefabsModule.cs        | 44 ++++++++++++-------
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/Source/Editor/Content/GUI/ContentView.DragDrop.cs b/Source/Editor/Content/GUI/ContentView.DragDrop.cs
index 3c0993b93..348e2b443 100644
--- a/Source/Editor/Content/GUI/ContentView.DragDrop.cs
+++ b/Source/Editor/Content/GUI/ContentView.DragDrop.cs
@@ -45,8 +45,14 @@ namespace FlaxEditor.Content.GUI
 
         private void ImportActors(DragActors actors, ContentFolder location)
         {
-            // Use only the first actor
-            Editor.Instance.Prefabs.CreatePrefab(actors.Objects[0].Actor);
+            foreach (var actorNode in actors.Objects)
+            {
+                var actor = actorNode.Actor;
+                if (actors.Objects.Contains(actorNode.ParentNode as ActorNode))
+                    continue;
+
+                Editor.Instance.Prefabs.CreatePrefab(actor, false);
+            }
         }
 
         /// <inheritdoc />
diff --git a/Source/Editor/Modules/PrefabsModule.cs b/Source/Editor/Modules/PrefabsModule.cs
index ed422e991..7b3ffebb3 100644
--- a/Source/Editor/Modules/PrefabsModule.cs
+++ b/Source/Editor/Modules/PrefabsModule.cs
@@ -37,6 +37,11 @@ namespace FlaxEditor.Modules
         /// </summary>
         public event Action<Prefab, Actor> PrefabApplied;
 
+        /// <summary>
+        /// Locally cached actor for prefab creation.
+        /// </summary>
+        private Actor _prefabCreationActor;
+
         internal PrefabsModule(Editor editor)
         : base(editor)
         {
@@ -78,6 +83,16 @@ namespace FlaxEditor.Modules
         /// </remarks>
         /// <param name="actor">The root prefab actor.</param>
         public void CreatePrefab(Actor actor)
+        {
+            CreatePrefab(actor, true);
+        }
+
+        /// <summary>
+        /// Starts the creating prefab for the given actor by showing the new item creation dialog in <see cref="ContentWindow"/>.
+        /// </summary>
+        /// <param name="actor">The root prefab actor.</param>
+        /// <param name="rename">Allow renaming or not</param>
+        public void CreatePrefab(Actor actor, bool rename)
         {
             // Skip in invalid states
             if (!Editor.StateMachine.CurrentState.CanEditContent)
@@ -90,7 +105,8 @@ namespace FlaxEditor.Modules
             PrefabCreating?.Invoke(actor);
 
             var proxy = Editor.ContentDatabase.GetProxy<Prefab>();
-            Editor.Windows.ContentWin.NewItem(proxy, actor, OnPrefabCreated, actor.Name);
+            _prefabCreationActor = actor;
+            Editor.Windows.ContentWin.NewItem(proxy, actor, OnPrefabCreated, actor.Name, rename);
         }
 
         private void OnPrefabCreated(ContentItem contentItem)
@@ -107,25 +123,21 @@ namespace FlaxEditor.Modules
             // Record undo for prefab creating (backend links the target instance with the prefab)
             if (Editor.Undo.Enabled)
             {
-                var selection = Editor.SceneEditing.Selection.Where(x => x is ActorNode).ToList().BuildNodesParents();
-                if (selection.Count == 0)
+                if (!_prefabCreationActor)
                     return;
 
-                if (selection.Count == 1)
+                var actorsList = new List<Actor>();
+                Utilities.Utils.GetActorsTree(actorsList, _prefabCreationActor);
+                
+                var actions = new IUndoAction[actorsList.Count];
+                for (int i = 0; i < actorsList.Count; i++)
                 {
-                    var action = BreakPrefabLinkAction.Linked(((ActorNode)selection[0]).Actor);
-                    Undo.AddAction(action);
-                }
-                else
-                {
-                    var actions = new IUndoAction[selection.Count];
-                    for (int i = 0; i < selection.Count; i++)
-                    {
-                        var action = BreakPrefabLinkAction.Linked(((ActorNode)selection[i]).Actor);
-                        actions[i] = action;
-                    }
-                    Undo.AddAction(new MultiUndoAction(actions));
+                    var action = BreakPrefabLinkAction.Linked(actorsList[i]);
+                    actions[i] = action;
                 }
+                Undo.AddAction(new MultiUndoAction(actions));
+
+                _prefabCreationActor = null;
             }
 
             Editor.Instance.Windows.PropertiesWin.Presenter.BuildLayout();

From 3bd8d930e09c06b974db198d8406dd05862a6a40 Mon Sep 17 00:00:00 2001
From: NoriteSC <53096989+NoriteSC@users.noreply.github.com>
Date: Tue, 25 Jul 2023 15:27:18 +0200
Subject: [PATCH 04/22] doc fixes and code corections

mathf UnwindRadians has fixed coust
added UnwindRadiansAccurate oldversion
---
 Source/Engine/Core/Math/Mathd.cs | 49 +++++++++++++++-----
 Source/Engine/Core/Math/Mathf.cs | 78 +++++++++++++++++++++++++-------
 2 files changed, 100 insertions(+), 27 deletions(-)

diff --git a/Source/Engine/Core/Math/Mathd.cs b/Source/Engine/Core/Math/Mathd.cs
index 29bcc9420..d671d310b 100644
--- a/Source/Engine/Core/Math/Mathd.cs
+++ b/Source/Engine/Core/Math/Mathd.cs
@@ -880,7 +880,19 @@ namespace FlaxEngine
         /// <returns>Valid angle in radians.</returns>
         public static double UnwindRadians(double angle)
         {
-            // TODO: make it faster?
+            //[nori_sc] made it faster has fixed cost but with large angle values starts to lose accuracy floating point problem
+            // 1 call teaks ~20-30 ns with anny value
+            var a = angle - Floor(angle / TwoPi) * TwoPi; //loop funcion betwine 0 and TwoPi
+            return a > Pi ? (a - TwoPi) : a; // change range so it become Pi and -Pi
+        }
+        /// <summary>
+        /// the same as <see cref="UnwindRadians"/> but is more computation intensive with large <see href="angle"/> and has better accuracy with large <see href="angle"/>
+        /// <br>cost of this funcion is <see href="angle"/> % <see cref="Pi"/></br>
+        /// </summary>
+        /// <param name="angle">Angle in radians to unwind.</param>
+        /// <returns>Valid angle in radians.</returns>
+        public static double UnwindRadiansAccurate(double angle)
+        {
             while (angle > Pi)
             {
                 angle -= TwoPi;
@@ -899,14 +911,26 @@ namespace FlaxEngine
         /// <returns>Valid angle in degrees.</returns>
         public static double UnwindDegrees(double angle)
         {
-            // TODO: make it faster?
-            while (angle > 180.0f)
+            //[nori_sc] made it faster for large values has fixed cost but with large angle values starts to lose accuracy floating point problem
+            // 1 call teaks ~20 ns with anny value
+            var a = angle - Floor(angle / 360.0) * 360.0; //loop funcion betwine 0 and 360
+            return a > 180 ? (a - 360.0) : a; // change range so it become 180 and -180
+        }
+        /// <summary>
+        /// the same as <see cref="UnwindDegrees"/> but is more computation intensive with large <see href="angle"/> and has better accuracy with large <see href="angle"/>
+        /// <br>cost of this funcion is <see href="angle"/> % 180.0f</br>
+        /// </summary>
+        /// <param name="angle">Angle in radians to unwind.</param>
+        /// <returns>Valid angle in radians.</returns>
+        public static double UnwindDegreesAccurate(double angle)
+        {
+            while (angle > 180.0)
             {
-                angle -= 360.0f;
+                angle -= 360.0;
             }
-            while (angle < -180.0f)
+            while (angle < -180.0)
             {
-                angle += 360.0f;
+                angle += 360.0;
             }
             return angle;
         }
@@ -927,8 +951,9 @@ namespace FlaxEngine
         /// Interpolates between two values using a linear function by a given amount.
         /// </summary>
         /// <remarks>
-        /// See http://www.encyclopediaofmath.org/index.php/Linear_interpolation and
-        /// http://fgiesen.wordpress.com/2012/08/15/linear-interpolation-past-present-and-future/
+        /// See:
+        /// <br><seealso href="http://www.encyclopediaofmath.org/index.php/Linear_interpolation"/></br>
+        /// <br><seealso href="http://fgiesen.wordpress.com/2012/08/15/linear-interpolation-past-present-and-future/"/></br>
         /// </remarks>
         /// <param name="from">Value to interpolate from.</param>
         /// <param name="to">Value to interpolate to.</param>
@@ -944,7 +969,8 @@ namespace FlaxEngine
         /// Performs smooth (cubic Hermite) interpolation between 0 and 1.
         /// </summary>
         /// <remarks>
-        /// See https://en.wikipedia.org/wiki/Smoothstep
+        /// See: 
+        /// <br><seealso href="https://en.wikipedia.org/wiki/Smoothstep"/></br>
         /// </remarks>
         /// <param name="amount">Value between 0 and 1 indicating interpolation amount.</param>
         public static double SmoothStep(double amount)
@@ -956,7 +982,8 @@ namespace FlaxEngine
         /// Performs a smooth(er) interpolation between 0 and 1 with 1st and 2nd order derivatives of zero at endpoints.
         /// </summary>
         /// <remarks>
-        /// See https://en.wikipedia.org/wiki/Smoothstep
+        /// See: 
+        /// <br><seealso href="https://en.wikipedia.org/wiki/Smoothstep"/></br>
         /// </remarks>
         /// <param name="amount">Value between 0 and 1 indicating interpolation amount.</param>
         public static double SmootherStep(double amount)
@@ -1013,7 +1040,7 @@ namespace FlaxEngine
 
         /// <summary>
         /// Gauss function.
-        /// http://en.wikipedia.org/wiki/Gaussian_function#Two-dimensional_Gaussian_function
+        /// <br><seealso href="http://en.wikipedia.org/wiki/Gaussian_function#Two-dimensional_Gaussian_function"/></br>
         /// </summary>
         /// <param name="amplitude">Curve amplitude.</param>
         /// <param name="x">Position X.</param>
diff --git a/Source/Engine/Core/Math/Mathf.cs b/Source/Engine/Core/Math/Mathf.cs
index 9463c13cb..09000e0cb 100644
--- a/Source/Engine/Core/Math/Mathf.cs
+++ b/Source/Engine/Core/Math/Mathf.cs
@@ -1180,7 +1180,19 @@ namespace FlaxEngine
         /// <returns>Valid angle in radians.</returns>
         public static float UnwindRadians(float angle)
         {
-            // TODO: make it faster?
+            //[nori_sc] made it faster has fixed cost but with large angle values (100 for example) starts to lose accuracy floating point problem
+            // 1 call teaks ~20-30 ns with anny value
+            var a = angle - Mathf.Floor(angle / Mathf.TwoPi) * Mathf.TwoPi; //loop funcion betwine 0 and TwoPi
+            return a > Mathf.Pi ? (a - Mathf.TwoPi) : a; // change range so it become Pi and -Pi
+        }
+        /// <summary>
+        /// the same as <see cref="UnwindRadians"/> but is more computation intensive with large <see href="angle"/> and has better accuracy with large <see href="angle"/>
+        /// <br>cost of this funcion is <see href="angle"/> % <see cref="Pi"/></br>
+        /// </summary>
+        /// <param name="angle">Angle in radians to unwind.</param>
+        /// <returns>Valid angle in radians.</returns>
+        public static float UnwindRadiansAccurate(float angle)
+        {
             while (angle > Pi)
             {
                 angle -= TwoPi;
@@ -1191,7 +1203,6 @@ namespace FlaxEngine
             }
             return angle;
         }
-
         /// <summary>
         /// Utility to ensure angle is between +/- 180 degrees by unwinding
         /// </summary>
@@ -1199,7 +1210,19 @@ namespace FlaxEngine
         /// <returns>Valid angle in degrees.</returns>
         public static float UnwindDegrees(float angle)
         {
-            // TODO: make it faster?
+            //[nori_sc] made it faster for large values has fixed cost but with large angle values (1 000 000 for example) starts to lose accuracy floating point problem
+            // 1 call teaks ~20 ns with anny value
+            var a = angle - Floor(angle / 360.0f) * 360.0f; //loop funcion betwine 0 and 360
+            return a > 180 ? (a - 360.0f) : a; // change range so it become 180 and -180
+        }
+        /// <summary>
+        /// the same as <see cref="UnwindDegrees"/> but is more computation intensive with large <see href="angle"/> and has better accuracy with large <see href="angle"/>
+        /// <br>cost of this funcion is <see href="angle"/> % 180.0f</br>
+        /// </summary>
+        /// <param name="angle">Angle in radians to unwind.</param>
+        /// <returns>Valid angle in radians.</returns>
+        public static float UnwindDegreesAccurate(float angle)
+        {
             while (angle > 180.0f)
             {
                 angle -= 360.0f;
@@ -1210,7 +1233,6 @@ namespace FlaxEngine
             }
             return angle;
         }
-
         /// <summary>
         /// Clamps the specified value.
         /// </summary>
@@ -1299,8 +1321,12 @@ namespace FlaxEngine
         /// <summary>
         /// Interpolates between two values using a linear function by a given amount.
         /// </summary>
-        /// <remarks>See http://www.encyclopediaofmath.org/index.php/Linear_interpolation and http://fgiesen.wordpress.com/2012/08/15/linear-interpolation-past-present-and-future/</remarks>
-        /// <param name="from">Value to interpolate from.</param>
+        /// <remarks>
+        /// See:
+        /// <br><seealso href="http://www.encyclopediaofmath.org/index.php/Linear_interpolation"/></br>
+        /// <br><seealso href="http://fgiesen.wordpress.com/2012/08/15/linear-interpolation-past-present-and-future/"/></br>
+        /// </remarks>
+        /// /// <param name="from">Value to interpolate from.</param>
         /// <param name="to">Value to interpolate to.</param>
         /// <param name="amount">Interpolation amount.</param>
         /// <returns>The result of linear interpolation of values based on the amount.</returns>
@@ -1312,8 +1338,12 @@ namespace FlaxEngine
         /// <summary>
         /// Interpolates between two values using a linear function by a given amount.
         /// </summary>
-        /// <remarks>See http://www.encyclopediaofmath.org/index.php/Linear_interpolation and http://fgiesen.wordpress.com/2012/08/15/linear-interpolation-past-present-and-future/</remarks>
-        /// <param name="from">Value to interpolate from.</param>
+        /// <remarks>
+        /// See:
+        /// <br><seealso href="http://www.encyclopediaofmath.org/index.php/Linear_interpolation"/></br>
+        /// <br><seealso href="http://fgiesen.wordpress.com/2012/08/15/linear-interpolation-past-present-and-future/"/></br>
+        /// </remarks>       
+        /// /// <param name="from">Value to interpolate from.</param>
         /// <param name="to">Value to interpolate to.</param>
         /// <param name="amount">Interpolation amount.</param>
         /// <returns>The result of linear interpolation of values based on the amount.</returns>
@@ -1325,8 +1355,12 @@ namespace FlaxEngine
         /// <summary>
         /// Interpolates between two values using a linear function by a given amount.
         /// </summary>
-        /// <remarks>See http://www.encyclopediaofmath.org/index.php/Linear_interpolation and http://fgiesen.wordpress.com/2012/08/15/linear-interpolation-past-present-and-future/</remarks>
-        /// <param name="from">Value to interpolate from.</param>
+        /// <remarks>
+        /// See:
+        /// <br><seealso href="http://www.encyclopediaofmath.org/index.php/Linear_interpolation"/></br>
+        /// <br><seealso href="http://fgiesen.wordpress.com/2012/08/15/linear-interpolation-past-present-and-future/"/></br>
+        /// </remarks>
+        /// /// <param name="from">Value to interpolate from.</param>
         /// <param name="to">Value to interpolate to.</param>
         /// <param name="amount">Interpolation amount.</param>
         /// <returns>The result of linear interpolation of values based on the amount.</returns>
@@ -1338,7 +1372,10 @@ namespace FlaxEngine
         /// <summary>
         /// Performs smooth (cubic Hermite) interpolation between 0 and 1.
         /// </summary>
-        /// <remarks>See https://en.wikipedia.org/wiki/Smoothstep</remarks>
+        /// <remarks>
+        /// See: 
+        /// <br><seealso href="https://en.wikipedia.org/wiki/Smoothstep"/></br>
+        /// </remarks>
         /// <param name="amount">Value between 0 and 1 indicating interpolation amount.</param>
         public static float SmoothStep(float amount)
         {
@@ -1348,7 +1385,10 @@ namespace FlaxEngine
         /// <summary>
         /// Performs smooth (cubic Hermite) interpolation between 0 and 1.
         /// </summary>
-        /// <remarks>See https://en.wikipedia.org/wiki/Smoothstep</remarks>
+        /// <remarks>
+        /// See: 
+        /// <br><seealso href="https://en.wikipedia.org/wiki/Smoothstep"/></br>
+        /// </remarks>
         /// <param name="amount">Value between 0 and 1 indicating interpolation amount.</param>
         public static double SmoothStep(double amount)
         {
@@ -1358,7 +1398,10 @@ namespace FlaxEngine
         /// <summary>
         /// Performs a smooth(er) interpolation between 0 and 1 with 1st and 2nd order derivatives of zero at endpoints.
         /// </summary>
-        /// <remarks>See https://en.wikipedia.org/wiki/Smoothstep</remarks>
+        /// <remarks>
+        /// See: 
+        /// <br><seealso href="https://en.wikipedia.org/wiki/Smoothstep"/></br>
+        /// </remarks>
         /// <param name="amount">Value between 0 and 1 indicating interpolation amount.</param>
         public static float SmootherStep(float amount)
         {
@@ -1368,7 +1411,10 @@ namespace FlaxEngine
         /// <summary>
         /// Performs a smooth(er) interpolation between 0 and 1 with 1st and 2nd order derivatives of zero at endpoints.
         /// </summary>
-        /// <remarks>See https://en.wikipedia.org/wiki/Smoothstep</remarks>
+        /// <remarks>
+        /// See: 
+        /// <br><seealso href="https://en.wikipedia.org/wiki/Smoothstep"/></br>
+        /// </remarks>
         /// <param name="amount">Value between 0 and 1 indicating interpolation amount.</param>
         public static double SmootherStep(double amount)
         {
@@ -1446,7 +1492,7 @@ namespace FlaxEngine
 
         /// <summary>
         /// Gauss function.
-        /// http://en.wikipedia.org/wiki/Gaussian_function#Two-dimensional_Gaussian_function
+        /// <br><seealso href="http://en.wikipedia.org/wiki/Gaussian_function#Two-dimensional_Gaussian_function"/></br>
         /// </summary>
         /// <param name="amplitude">Curve amplitude.</param>
         /// <param name="x">Position X.</param>
@@ -1463,7 +1509,7 @@ namespace FlaxEngine
 
         /// <summary>
         /// Gauss function.
-        /// http://en.wikipedia.org/wiki/Gaussian_function#Two-dimensional_Gaussian_function
+        /// <br><seealso href="http://en.wikipedia.org/wiki/Gaussian_function#Two-dimensional_Gaussian_function"/></br>
         /// </summary>
         /// <param name="amplitude">Curve amplitude.</param>
         /// <param name="x">Position X.</param>

From c2fffbcfdb5b07fccf5403f6a4d6cdcb0a8f6d8c Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@kapsi.fi>
Date: Tue, 25 Jul 2023 20:48:51 +0300
Subject: [PATCH 05/22] Fix API_INJECT_CODE injecting duplicated code

---
 Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
index 087dc898f..fc3e6a534 100644
--- a/Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
+++ b/Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
@@ -2059,7 +2059,7 @@ namespace Flax.Build.Bindings
                         if (code.StartsWith("using"))
                             CSharpUsedNamespaces.Add(code.Substring(6));
                         else if (code.Length > 0)
-                            contents.Append(injectCodeInfo.Code).AppendLine(";");
+                            contents.Append(code).AppendLine(";");
                     }
                 }
                 else

From fae20daac947a98d3ad1736566b58b4f7de8b4f7 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 26 Jul 2023 19:28:55 +0200
Subject: [PATCH 06/22] Cleanup code #1267

---
 Source/Engine/Core/Math/Mathd.cs | 34 ++++++++++++------------------
 Source/Engine/Core/Math/Mathf.cs | 36 +++++++++++++-------------------
 2 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/Source/Engine/Core/Math/Mathd.cs b/Source/Engine/Core/Math/Mathd.cs
index d671d310b..48db547df 100644
--- a/Source/Engine/Core/Math/Mathd.cs
+++ b/Source/Engine/Core/Math/Mathd.cs
@@ -876,62 +876,54 @@ namespace FlaxEngine
         /// <summary>
         /// Given a heading which may be outside the +/- PI range, 'unwind' it back into that range.
         /// </summary>
+        /// <remarks>Optimized version of <see cref="UnwindRadiansAccurate"/> that is it faster and has fixed cost but with large angle values (100 for example) starts to lose accuracy floating point problem.</remarks>
         /// <param name="angle">Angle in radians to unwind.</param>
         /// <returns>Valid angle in radians.</returns>
         public static double UnwindRadians(double angle)
         {
-            //[nori_sc] made it faster has fixed cost but with large angle values starts to lose accuracy floating point problem
-            // 1 call teaks ~20-30 ns with anny value
-            var a = angle - Floor(angle / TwoPi) * TwoPi; //loop funcion betwine 0 and TwoPi
-            return a > Pi ? (a - TwoPi) : a; // change range so it become Pi and -Pi
+            var a = angle - Math.Floor(angle / TwoPi) * TwoPi; // Loop function between 0 and TwoPi
+            return a > Pi ? a - TwoPi : a; // Change range so it become Pi and -Pi
         }
+
         /// <summary>
-        /// the same as <see cref="UnwindRadians"/> but is more computation intensive with large <see href="angle"/> and has better accuracy with large <see href="angle"/>
-        /// <br>cost of this funcion is <see href="angle"/> % <see cref="Pi"/></br>
+        /// The same as <see cref="UnwindRadians"/> but is more computation intensive with large <see href="angle"/> and has better accuracy with large <see href="angle"/>.
+        /// <br>cost of this function is <see href="angle"/> % <see cref="Pi"/></br>
         /// </summary>
         /// <param name="angle">Angle in radians to unwind.</param>
         /// <returns>Valid angle in radians.</returns>
         public static double UnwindRadiansAccurate(double angle)
         {
             while (angle > Pi)
-            {
                 angle -= TwoPi;
-            }
             while (angle < -Pi)
-            {
                 angle += TwoPi;
-            }
             return angle;
         }
 
         /// <summary>
-        /// Utility to ensure angle is between +/- 180 degrees by unwinding
+        /// Utility to ensure angle is between +/- 180 degrees by unwinding.
         /// </summary>
+        /// <remarks>Optimized version of <see cref="UnwindDegreesAccurate"/> that is it faster and has fixed cost but with large angle values (100 for example) starts to lose accuracy floating point problem.</remarks>
         /// <param name="angle">Angle in degrees to unwind.</param>
         /// <returns>Valid angle in degrees.</returns>
         public static double UnwindDegrees(double angle)
         {
-            //[nori_sc] made it faster for large values has fixed cost but with large angle values starts to lose accuracy floating point problem
-            // 1 call teaks ~20 ns with anny value
-            var a = angle - Floor(angle / 360.0) * 360.0; //loop funcion betwine 0 and 360
-            return a > 180 ? (a - 360.0) : a; // change range so it become 180 and -180
+            var a = angle - Math.Floor(angle / 360.0) * 360.0; // Loop function between 0 and 360
+            return a > 180 ? a - 360.0 : a; // Change range so it become 180 and -180
         }
+
         /// <summary>
-        /// the same as <see cref="UnwindDegrees"/> but is more computation intensive with large <see href="angle"/> and has better accuracy with large <see href="angle"/>
-        /// <br>cost of this funcion is <see href="angle"/> % 180.0f</br>
+        /// The same as <see cref="UnwindDegrees"/> but is more computation intensive with large <see href="angle"/> and has better accuracy with large <see href="angle"/>.
+        /// <br>cost of this function is <see href="angle"/> % 180.0f</br>
         /// </summary>
         /// <param name="angle">Angle in radians to unwind.</param>
         /// <returns>Valid angle in radians.</returns>
         public static double UnwindDegreesAccurate(double angle)
         {
             while (angle > 180.0)
-            {
                 angle -= 360.0;
-            }
             while (angle < -180.0)
-            {
                 angle += 360.0;
-            }
             return angle;
         }
 
diff --git a/Source/Engine/Core/Math/Mathf.cs b/Source/Engine/Core/Math/Mathf.cs
index 09000e0cb..cea81a779 100644
--- a/Source/Engine/Core/Math/Mathf.cs
+++ b/Source/Engine/Core/Math/Mathf.cs
@@ -1176,63 +1176,57 @@ namespace FlaxEngine
         /// <summary>
         /// Given a heading which may be outside the +/- PI range, 'unwind' it back into that range.
         /// </summary>
+        /// <remarks>Optimized version of <see cref="UnwindRadiansAccurate"/> that is it faster and has fixed cost but with large angle values (100 for example) starts to lose accuracy floating point problem.</remarks>
         /// <param name="angle">Angle in radians to unwind.</param>
         /// <returns>Valid angle in radians.</returns>
         public static float UnwindRadians(float angle)
         {
-            //[nori_sc] made it faster has fixed cost but with large angle values (100 for example) starts to lose accuracy floating point problem
-            // 1 call teaks ~20-30 ns with anny value
-            var a = angle - Mathf.Floor(angle / Mathf.TwoPi) * Mathf.TwoPi; //loop funcion betwine 0 and TwoPi
-            return a > Mathf.Pi ? (a - Mathf.TwoPi) : a; // change range so it become Pi and -Pi
+            var a = angle - (float)Math.Floor(angle / TwoPi) * TwoPi; // Loop function between 0 and TwoPi
+            return a > Pi ? a - TwoPi : a; // Change range so it become Pi and -Pi
         }
+
         /// <summary>
-        /// the same as <see cref="UnwindRadians"/> but is more computation intensive with large <see href="angle"/> and has better accuracy with large <see href="angle"/>
-        /// <br>cost of this funcion is <see href="angle"/> % <see cref="Pi"/></br>
+        /// The same as <see cref="UnwindRadians"/> but is more computation intensive with large <see href="angle"/> and has better accuracy with large <see href="angle"/>.
+        /// <br>cost of this function is <see href="angle"/> % <see cref="Pi"/></br>
         /// </summary>
         /// <param name="angle">Angle in radians to unwind.</param>
         /// <returns>Valid angle in radians.</returns>
         public static float UnwindRadiansAccurate(float angle)
         {
             while (angle > Pi)
-            {
                 angle -= TwoPi;
-            }
             while (angle < -Pi)
-            {
                 angle += TwoPi;
-            }
             return angle;
         }
+
         /// <summary>
-        /// Utility to ensure angle is between +/- 180 degrees by unwinding
+        /// Utility to ensure angle is between +/- 180 degrees by unwinding.
         /// </summary>
+        /// <remarks>Optimized version of <see cref="UnwindDegreesAccurate"/> that is it faster and has fixed cost but with large angle values (100 for example) starts to lose accuracy floating point problem.</remarks>
         /// <param name="angle">Angle in degrees to unwind.</param>
         /// <returns>Valid angle in degrees.</returns>
         public static float UnwindDegrees(float angle)
         {
-            //[nori_sc] made it faster for large values has fixed cost but with large angle values (1 000 000 for example) starts to lose accuracy floating point problem
-            // 1 call teaks ~20 ns with anny value
-            var a = angle - Floor(angle / 360.0f) * 360.0f; //loop funcion betwine 0 and 360
-            return a > 180 ? (a - 360.0f) : a; // change range so it become 180 and -180
+            var a = angle - (float)Math.Floor(angle / 360.0f) * 360.0f; // Loop function between 0 and 360
+            return a > 180 ? a - 360.0f : a; // Change range so it become 180 and -180
         }
+
         /// <summary>
-        /// the same as <see cref="UnwindDegrees"/> but is more computation intensive with large <see href="angle"/> and has better accuracy with large <see href="angle"/>
-        /// <br>cost of this funcion is <see href="angle"/> % 180.0f</br>
+        /// The same as <see cref="UnwindDegrees"/> but is more computation intensive with large <see href="angle"/> and has better accuracy with large <see href="angle"/>.
+        /// <br>cost of this function is <see href="angle"/> % 180.0f</br>
         /// </summary>
         /// <param name="angle">Angle in radians to unwind.</param>
         /// <returns>Valid angle in radians.</returns>
         public static float UnwindDegreesAccurate(float angle)
         {
             while (angle > 180.0f)
-            {
                 angle -= 360.0f;
-            }
             while (angle < -180.0f)
-            {
                 angle += 360.0f;
-            }
             return angle;
         }
+
         /// <summary>
         /// Clamps the specified value.
         /// </summary>

From 77daf85fc1855b32728b243b4d71d95a3a7b930e Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 26 Jul 2023 19:31:43 +0200
Subject: [PATCH 07/22] Add unit test for angles unwind math #1267

---
 Source/Engine/Tests/TestMath.cs | 47 +++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 Source/Engine/Tests/TestMath.cs

diff --git a/Source/Engine/Tests/TestMath.cs b/Source/Engine/Tests/TestMath.cs
new file mode 100644
index 000000000..bc1bc1a8d
--- /dev/null
+++ b/Source/Engine/Tests/TestMath.cs
@@ -0,0 +1,47 @@
+// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+
+#if FLAX_TESTS
+using NUnit.Framework;
+
+namespace FlaxEngine.Tests
+{
+    /// <summary>
+    /// Tests for <see cref="Mathf"/> and <see cref="Mathd"/>.
+    /// </summary>
+    [TestFixture]
+    public class TestMath
+    {
+        /// <summary>
+        /// Test unwinding angles.
+        /// </summary>
+        [Test]
+        public void TestUnwind()
+        {
+            Assert.AreEqual(0.0f, Mathf.UnwindDegreesAccurate(0.0f));
+            Assert.AreEqual(45.0f, Mathf.UnwindDegreesAccurate(45.0f));
+            Assert.AreEqual(90.0f, Mathf.UnwindDegreesAccurate(90.0f));
+            Assert.AreEqual(180.0f, Mathf.UnwindDegreesAccurate(180.0f));
+            Assert.AreEqual(0.0f, Mathf.UnwindDegreesAccurate(360.0f));
+            Assert.AreEqual(0.0f, Mathf.UnwindDegrees(0.0f));
+            Assert.AreEqual(45.0f, Mathf.UnwindDegrees(45.0f));
+            Assert.AreEqual(90.0f, Mathf.UnwindDegrees(90.0f));
+            Assert.AreEqual(180.0f, Mathf.UnwindDegrees(180.0f));
+            Assert.AreEqual(0.0f, Mathf.UnwindDegrees(360.0f));
+            var fError = 0.001f;
+            var dError = 0.00001;
+            for (float f = -400.0f; f <= 400.0f; f += 0.1f)
+            {
+                var f1 = Mathf.UnwindDegreesAccurate(f);
+                var f2 = Mathf.UnwindDegrees(f);
+                if (Mathf.Abs(f1 - f2) >= fError)
+                    throw new Exception($"Failed on angle={f}, {f1} != {f2}");
+                var d = (double)f;
+                var d1 = Mathd.UnwindDegreesAccurate(d);
+                var d2 = Mathd.UnwindDegrees(d);
+                if (Mathd.Abs(d1 - d2) >= dError)
+                    throw new Exception($"Failed on angle={d}, {d1} != {d2}");
+            }
+        }
+    }
+}
+#endif

From 95922bb38b180aaa8345a15ba3d8c5f83acc3d54 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Wed, 26 Jul 2023 21:18:22 +0200
Subject: [PATCH 08/22] Fix compilation

---
 Source/Engine/Tests/TestMath.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Engine/Tests/TestMath.cs b/Source/Engine/Tests/TestMath.cs
index bc1bc1a8d..b8eda936b 100644
--- a/Source/Engine/Tests/TestMath.cs
+++ b/Source/Engine/Tests/TestMath.cs
@@ -1,6 +1,7 @@
 // Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
 
 #if FLAX_TESTS
+using System;
 using NUnit.Framework;
 
 namespace FlaxEngine.Tests

From 5cd72c9b24937386bc722d73e66fc2a9ca4668df Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Thu, 27 Jul 2023 16:51:44 -0500
Subject: [PATCH 09/22] Fix duplicating actor in scene on shift click if the
 actor has not been moved

---
 Source/Editor/Gizmo/TransformGizmoBase.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Editor/Gizmo/TransformGizmoBase.cs b/Source/Editor/Gizmo/TransformGizmoBase.cs
index d17913dfd..dd5cc6c76 100644
--- a/Source/Editor/Gizmo/TransformGizmoBase.cs
+++ b/Source/Editor/Gizmo/TransformGizmoBase.cs
@@ -469,7 +469,7 @@ namespace FlaxEditor.Gizmo
                     }
 
                     // Apply transformation (but to the parents, not whole selection pool)
-                    if (anyValid || (!_isTransforming && Owner.UseDuplicate))
+                    if (anyValid || (_isTransforming && Owner.UseDuplicate))
                     {
                         StartTransforming();
                         LastDelta = new Transform(translationDelta, rotationDelta, scaleDelta);

From eb641e142ec87d66229461dcc3eedd65b0a43e08 Mon Sep 17 00:00:00 2001
From: Wiktor Kocielski <withaust@gmail.com>
Date: Sat, 29 Jul 2023 01:00:07 +0300
Subject: [PATCH 10/22] ShadowOfMordor terrain fix

---
 Source/Engine/ShadowsOfMordor/Builder.Jobs.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Source/Engine/ShadowsOfMordor/Builder.Jobs.cpp b/Source/Engine/ShadowsOfMordor/Builder.Jobs.cpp
index 59704800a..26204a94a 100644
--- a/Source/Engine/ShadowsOfMordor/Builder.Jobs.cpp
+++ b/Source/Engine/ShadowsOfMordor/Builder.Jobs.cpp
@@ -151,6 +151,12 @@ void ShadowsOfMordor::Builder::onJobRender(GPUContext* context)
                 auto patch = terrain->GetPatch(entry.AsTerrain.PatchIndex);
                 auto chunk = &patch->Chunks[entry.AsTerrain.ChunkIndex];
                 auto chunkSize = terrain->GetChunkSize();
+                if (!patch->Heightmap)
+                {
+                    LOG(Error, "Terrain actor {0} is missing heightmap for baking, skipping baking stage.", terrain->GetName());
+                    _wasStageDone = true;
+                    return;
+                }
                 const auto heightmap = patch->Heightmap.Get()->GetTexture();
 
                 Matrix world;

From 8250f92af3c742ced56714db3df4aa440f3ec4a9 Mon Sep 17 00:00:00 2001
From: Wiktor Kocielski <withaust@gmail.com>
Date: Sat, 29 Jul 2023 13:34:46 +0300
Subject: [PATCH 11/22] Add grid scale to the editor viewport settings

---
 Source/Editor/Gizmo/GridGizmo.cs         | 6 +++---
 Source/Editor/Options/ViewportOptions.cs | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Source/Editor/Gizmo/GridGizmo.cs b/Source/Editor/Gizmo/GridGizmo.cs
index 8b4f49986..d9e080982 100644
--- a/Source/Editor/Gizmo/GridGizmo.cs
+++ b/Source/Editor/Gizmo/GridGizmo.cs
@@ -49,17 +49,17 @@ namespace FlaxEditor.Gizmo
                 float space, size;
                 if (dst <= 500.0f)
                 {
-                    space = 50;
+                    space = Editor.Instance.Options.Options.Viewport.ViewportGridScale;
                     size = 8000;
                 }
                 else if (dst <= 2000.0f)
                 {
-                    space = 100;
+                    space = Editor.Instance.Options.Options.Viewport.ViewportGridScale * 2;
                     size = 8000;
                 }
                 else
                 {
-                    space = 1000;
+                    space = Editor.Instance.Options.Options.Viewport.ViewportGridScale * 20;
                     size = 100000;
                 }
 
diff --git a/Source/Editor/Options/ViewportOptions.cs b/Source/Editor/Options/ViewportOptions.cs
index 495aa85d0..cee63a562 100644
--- a/Source/Editor/Options/ViewportOptions.cs
+++ b/Source/Editor/Options/ViewportOptions.cs
@@ -59,5 +59,12 @@ namespace FlaxEditor.Options
         [DefaultValue(false)]
         [EditorDisplay("Defaults"), EditorOrder(150), Tooltip("Invert the panning direction for the viewport camera.")]
         public bool DefaultInvertPanning { get; set; } = false;
+
+        /// <summary>
+        /// Scales editor viewport grid.
+        /// </summary>
+        [DefaultValue(50.0f), Limit(25.0f, 500.0f, 5.0f)]
+        [EditorDisplay("Defaults"), EditorOrder(160), Tooltip("Scales editor viewport grid.")]
+        public float ViewportGridScale { get; set; } = 50.0f;
     }
 }

From 383b21c108a7cf387a7834ee150f8cc2782686cd Mon Sep 17 00:00:00 2001
From: Wiktor Kocielski <118038102+Withaust@users.noreply.github.com>
Date: Sat, 29 Jul 2023 18:55:29 +0300
Subject: [PATCH 12/22] Softlock fix

---
 Source/Engine/ShadowsOfMordor/Builder.Jobs.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Engine/ShadowsOfMordor/Builder.Jobs.cpp b/Source/Engine/ShadowsOfMordor/Builder.Jobs.cpp
index 26204a94a..afe384d6c 100644
--- a/Source/Engine/ShadowsOfMordor/Builder.Jobs.cpp
+++ b/Source/Engine/ShadowsOfMordor/Builder.Jobs.cpp
@@ -155,6 +155,7 @@ void ShadowsOfMordor::Builder::onJobRender(GPUContext* context)
                 {
                     LOG(Error, "Terrain actor {0} is missing heightmap for baking, skipping baking stage.", terrain->GetName());
                     _wasStageDone = true;
+                    scene->EntriesLocker.Unlock();
                     return;
                 }
                 const auto heightmap = patch->Heightmap.Get()->GetTexture();

From 06250fcb6d1ab6101530aae2a15517ad60cae6b1 Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@kapsi.fi>
Date: Sun, 30 Jul 2023 20:39:45 +0300
Subject: [PATCH 13/22] Implement a generic version of
 `AssetReferenceAttribute`

---
 .../Editor/AssetReferenceAttribute.cs           | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/Source/Engine/Scripting/Attributes/Editor/AssetReferenceAttribute.cs b/Source/Engine/Scripting/Attributes/Editor/AssetReferenceAttribute.cs
index 62040d224..6d6107588 100644
--- a/Source/Engine/Scripting/Attributes/Editor/AssetReferenceAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/AssetReferenceAttribute.cs
@@ -53,4 +53,21 @@ namespace FlaxEngine
             UseSmallPicker = useSmallPicker;
         }
     }
+
+    /// <summary>
+    /// Specifies a options for an asset reference picker in the editor. Allows to customize view or provide custom value assign policy.
+    /// </summary>
+    /// <seealso cref="System.Attribute" />
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
+    public class AssetReferenceAttribute<T> : AssetReferenceAttribute
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AssetReferenceAttribute"/> class for generic type T.
+        /// </summary>
+        /// <param name="useSmallPicker">True if use asset picker with a smaller height (single line), otherwise will use with full icon.</param>
+        public AssetReferenceAttribute(bool useSmallPicker = false)
+            : base(typeof(T), useSmallPicker)
+        {
+        }
+    }
 }

From bf351f71bfe933c7a37b06e438298a84c1ebc27d Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@kapsi.fi>
Date: Sun, 30 Jul 2023 20:48:18 +0300
Subject: [PATCH 14/22] Guard generic `AssetReferenceAttribute` to work only in
 .NET 7

---
 .../Scripting/Attributes/Editor/AssetReferenceAttribute.cs      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Source/Engine/Scripting/Attributes/Editor/AssetReferenceAttribute.cs b/Source/Engine/Scripting/Attributes/Editor/AssetReferenceAttribute.cs
index 6d6107588..5bb79b81b 100644
--- a/Source/Engine/Scripting/Attributes/Editor/AssetReferenceAttribute.cs
+++ b/Source/Engine/Scripting/Attributes/Editor/AssetReferenceAttribute.cs
@@ -54,6 +54,7 @@ namespace FlaxEngine
         }
     }
 
+#if USE_NETCORE
     /// <summary>
     /// Specifies a options for an asset reference picker in the editor. Allows to customize view or provide custom value assign policy.
     /// </summary>
@@ -70,4 +71,5 @@ namespace FlaxEngine
         {
         }
     }
+#endif
 }

From 3ba05f52df35d56e809f50237a65abb57cb0aed4 Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@kapsi.fi>
Date: Sun, 30 Jul 2023 21:41:32 +0300
Subject: [PATCH 15/22] Add common .NET SDK preprocessor definitions

---
 Source/Engine/Scripting/Scripting.Build.cs | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/Source/Engine/Scripting/Scripting.Build.cs b/Source/Engine/Scripting/Scripting.Build.cs
index 21f4477d0..10fc2aff9 100644
--- a/Source/Engine/Scripting/Scripting.Build.cs
+++ b/Source/Engine/Scripting/Scripting.Build.cs
@@ -17,10 +17,29 @@ public class Scripting : EngineModule
         {
             if (EngineConfiguration.WithDotNet(options))
             {
+                void AddFrameworkDefines(string template, int major, int latestMinor)
+                {
+                    for (int minor = latestMinor; minor >= 0; minor--)
+                    {
+                        options.ScriptingAPI.Defines.Add(string.Format(template, major, minor));
+                        options.ScriptingAPI.Defines.Add(string.Format($"{template}_OR_GREATER", major, minor));
+                    }
+                }
+
                 // .NET
                 options.PrivateDependencies.Add("nethost");
                 options.ScriptingAPI.Defines.Add("USE_NETCORE");
 
+                // .NET SDK
+                AddFrameworkDefines("NET{0}_{1}", 7, 0); // "NET7_0" and "NET7_0_OR_GREATER"
+                AddFrameworkDefines("NET{0}_{1}", 6, 0);
+                AddFrameworkDefines("NET{0}_{1}", 5, 0);
+                options.ScriptingAPI.Defines.Add("NET");
+                AddFrameworkDefines("NETCOREAPP{0}_{1}", 3, 1); // "NETCOREAPP3_1" and "NETCOREAPP3_1_OR_GREATER"
+                AddFrameworkDefines("NETCOREAPP{0}_{1}", 2, 2);
+                AddFrameworkDefines("NETCOREAPP{0}_{1}", 1, 1);
+                options.ScriptingAPI.Defines.Add("NETCOREAPP");
+
                 if (options.Target is EngineTarget engineTarget && engineTarget.UseSeparateMainExecutable(options))
                 {
                     // Build target doesn't support linking again main executable (eg. Linux) thus additional shared library is used for the engine (eg. libFlaxEditor.so)

From 13e11091fc1504ae63d922e9685e230c5d28481f Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@kapsi.fi>
Date: Sun, 30 Jul 2023 21:43:28 +0300
Subject: [PATCH 16/22] Support user defined .NET analyzers/source generators
 in Flax.Build

---
 .../Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs |  6 ++++--
 .../Flax.Build/Build/NativeCpp/BuildOptions.cs      | 13 ++++++++++---
 .../Projects/VisualStudio/CSSDKProjectGenerator.cs  |  8 ++++++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs b/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs
index 13433f92c..2cdc57686 100644
--- a/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs
+++ b/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs
@@ -272,8 +272,10 @@ namespace Flax.Build
             foreach (var reference in fileReferences)
                 args.Add(string.Format("/reference:\"{0}\"", reference));
 #if USE_NETCORE
-            foreach (var analyzer in buildOptions.ScriptingAPI.SystemAnalyzers)
-                args.Add(string.Format("/analyzer:\"{0}{1}.dll\"", referenceAnalyzers, analyzer));
+            foreach (var systemAnalyzer in buildOptions.ScriptingAPI.SystemAnalyzers)
+                args.Add(string.Format("/analyzer:\"{0}{1}.dll\"", referenceAnalyzers, systemAnalyzer));
+            foreach (var analyzer in buildOptions.ScriptingAPI.Analyzers)
+                args.Add(string.Format("/analyzer:\"{0}\"", analyzer));
 #endif
             foreach (var sourceFile in sourceFiles)
                 args.Add("\"" + sourceFile + "\"");
diff --git a/Source/Tools/Flax.Build/Build/NativeCpp/BuildOptions.cs b/Source/Tools/Flax.Build/Build/NativeCpp/BuildOptions.cs
index ef365d3b7..e612c0a95 100644
--- a/Source/Tools/Flax.Build/Build/NativeCpp/BuildOptions.cs
+++ b/Source/Tools/Flax.Build/Build/NativeCpp/BuildOptions.cs
@@ -200,14 +200,19 @@ namespace Flax.Build.NativeCpp
             public HashSet<string> SystemReferences;
 
             /// <summary>
-            /// The .Net libraries references (dll or exe files paths).
+            /// The system analyzers/source generators.
+            /// </summary>
+            public HashSet<string> SystemAnalyzers;
+
+            /// <summary>
+            /// The .NET libraries references (dll or exe files paths).
             /// </summary>
             public HashSet<string> FileReferences;
 
             /// <summary>
-            /// The .Net libraries references (dll or exe files paths).
+            /// The .NET analyzers (dll or exe files paths).
             /// </summary>
-            public HashSet<string> SystemAnalyzers;
+            public HashSet<string> Analyzers;
 
             /// <summary>
             /// True if ignore compilation warnings due to missing code documentation comments.
@@ -232,6 +237,7 @@ namespace Flax.Build.NativeCpp
                 Defines.AddRange(other.Defines);
                 SystemReferences.AddRange(other.SystemReferences);
                 FileReferences.AddRange(other.FileReferences);
+                Analyzers.AddRange(other.Analyzers);
                 IgnoreMissingDocumentationWarnings |= other.IgnoreMissingDocumentationWarnings;
             }
         }
@@ -305,6 +311,7 @@ namespace Flax.Build.NativeCpp
                 "Microsoft.Interop.SourceGeneration",
             },
             FileReferences = new HashSet<string>(),
+            Analyzers = new HashSet<string>(),
         };
 
         /// <summary>
diff --git a/Source/Tools/Flax.Build/Projects/VisualStudio/CSSDKProjectGenerator.cs b/Source/Tools/Flax.Build/Projects/VisualStudio/CSSDKProjectGenerator.cs
index efce04776..5fba0dc43 100644
--- a/Source/Tools/Flax.Build/Projects/VisualStudio/CSSDKProjectGenerator.cs
+++ b/Source/Tools/Flax.Build/Projects/VisualStudio/CSSDKProjectGenerator.cs
@@ -247,6 +247,14 @@ namespace Flax.Build.Projects.VisualStudio
                     csProjectFileContent.AppendLine("  </ItemGroup>");
                 }
             }
+            foreach (var analyzer in configuration.TargetBuildOptions.ScriptingAPI.Analyzers)
+            {
+                csProjectFileContent.AppendLine(string.Format("  <ItemGroup Condition=\" '$(Configuration)|$(Platform)' == '{0}' \">", configuration.Name));
+                csProjectFileContent.AppendLine(string.Format("    <Analyzer Include=\"{0}\">", Path.GetFileNameWithoutExtension(analyzer)));
+                csProjectFileContent.AppendLine(string.Format("      <HintPath>{0}</HintPath>", Utilities.MakePathRelativeTo(analyzer, projectDirectory).Replace('/', '\\')));
+                csProjectFileContent.AppendLine("    </Analyzer>");
+                csProjectFileContent.AppendLine("  </ItemGroup>");
+            }
 
             csProjectFileContent.AppendLine("");
         }

From 735b2e30f00c29aec9ad3906a4bf4fc17dcbc41b Mon Sep 17 00:00:00 2001
From: Ari Vuollet <ari.vuollet@kapsi.fi>
Date: Sun, 30 Jul 2023 21:55:23 +0300
Subject: [PATCH 17/22] Output generated .NET source generator files to
 Intermediate folder

Mostly useful for debugging source generators, VS doesn't seem to
utilize these files in any way.
---
 Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs b/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs
index 2cdc57686..d6772379f 100644
--- a/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs
+++ b/Source/Tools/Flax.Build/Build/DotNet/Builder.DotNet.cs
@@ -159,6 +159,7 @@ namespace Flax.Build
             var outputPath = Path.GetDirectoryName(buildData.Target.GetOutputFilePath(buildOptions));
             var outputFile = Path.Combine(outputPath, name + ".dll");
             var outputDocFile = Path.Combine(outputPath, name + ".xml");
+            var outputGeneratedFiles = Path.Combine(buildOptions.IntermediateFolder);
             string cscPath, referenceAssemblies;
 #if USE_NETCORE
             var dotnetSdk = DotNetSdk.Instance;
@@ -263,6 +264,9 @@ namespace Flax.Build
 #endif
             args.Add(string.Format("/out:\"{0}\"", outputFile));
             args.Add(string.Format("/doc:\"{0}\"", outputDocFile));
+#if USE_NETCORE
+            args.Add(string.Format("/generatedfilesout:\"{0}\"", outputGeneratedFiles));
+#endif
             if (buildOptions.ScriptingAPI.Defines.Count != 0)
                 args.Add("/define:" + string.Join(";", buildOptions.ScriptingAPI.Defines));
             if (buildData.Configuration == TargetConfiguration.Debug)

From 71bce781f7de08e31237b5daa503f2bf9c0b1d10 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Mon, 31 Jul 2023 17:24:47 +0200
Subject: [PATCH 18/22] Force disable flot128 in fmt

---
 Source/ThirdParty/fmt/core.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/ThirdParty/fmt/core.h b/Source/ThirdParty/fmt/core.h
index a8b208508..31049d410 100644
--- a/Source/ThirdParty/fmt/core.h
+++ b/Source/ThirdParty/fmt/core.h
@@ -30,6 +30,7 @@ Customizations done to fmt lib:
 #define FMT_USE_USER_DEFINED_LITERALS 0
 #define FMT_USE_STRING 0
 #define FMT_USE_LONG_DOUBLE 0
+#define FMT_USE_FLOAT128 0
 #define FMT_USE_ITERATOR 0
 #define FMT_USE_LOCALE_GROUPING 0
 #define FMT_EXCEPTIONS 0

From 81860e5f189de65f0ca23e954fdf22dee83f40b0 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Mon, 31 Jul 2023 19:02:53 +0200
Subject: [PATCH 19/22] Cleanup code #1215 and add cook game icon

---
 Content/Editor/IconsAtlas.flax                |   4 +-
 Source/Editor/EditorIcons.cs                  |   1 +
 .../ContextMenuSingleSelectGroup.cs           | 104 ++++++--------
 Source/Editor/GUI/ToolStrip.cs                |  18 +--
 Source/Editor/GUI/ToolStripButton.cs          |  43 ++----
 Source/Editor/Modules/UIModule.cs             |  93 ++++++-------
 Source/Editor/Options/InterfaceOptions.cs     |  12 +-
 Source/Editor/Windows/GameCookerWindow.cs     | 130 ++++++++++--------
 .../Editor/Windows/Profiler/ProfilerWindow.cs |   2 +-
 9 files changed, 186 insertions(+), 221 deletions(-)

diff --git a/Content/Editor/IconsAtlas.flax b/Content/Editor/IconsAtlas.flax
index 3318b811b..ae46fcf06 100644
--- a/Content/Editor/IconsAtlas.flax
+++ b/Content/Editor/IconsAtlas.flax
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d867a994701f09964335ddf51cd4060a54728b9de4420ad3f0bfbd8847bc7602
-size 5611659
+oid sha256:745ce418c493445abde98aea91a34592b00c5c46b68cd7e61604a05b3043c76c
+size 5608587
diff --git a/Source/Editor/EditorIcons.cs b/Source/Editor/EditorIcons.cs
index 127ba3f6f..fb3c46a41 100644
--- a/Source/Editor/EditorIcons.cs
+++ b/Source/Editor/EditorIcons.cs
@@ -96,6 +96,7 @@ namespace FlaxEditor
         public SpriteHandle Link64;
         public SpriteHandle Build64;
         public SpriteHandle Add64;
+        public SpriteHandle ShipIt64;
 
         // 96px
         public SpriteHandle Toolbox96;
diff --git a/Source/Editor/GUI/ContextMenu/ContextMenuSingleSelectGroup.cs b/Source/Editor/GUI/ContextMenu/ContextMenuSingleSelectGroup.cs
index 9b58c09a8..5abb52b4a 100644
--- a/Source/Editor/GUI/ContextMenu/ContextMenuSingleSelectGroup.cs
+++ b/Source/Editor/GUI/ContextMenu/ContextMenuSingleSelectGroup.cs
@@ -2,106 +2,92 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using FlaxEngine;
-using FlaxEngine.GUI;
 
 namespace FlaxEditor.GUI.ContextMenu
 {
     /// <summary>
-    /// Context menu single select group.
+    /// Context menu for a single selectable option from range of values (eg. enum).
     /// </summary>
     [HideInEditor]
     class ContextMenuSingleSelectGroup<T>
     {
-        public struct SingleSelectGroupItem<U>
+        private struct SingleSelectGroupItem
         {
-            public string text;
-            public U value;
-            public Action onSelected;
-            public List<ContextMenuButton> buttons;
+            public string Text;
+            public string Tooltip;
+            public T Value;
+            public Action Selected;
+            public List<ContextMenuButton> Buttons;
         }
 
         private List<ContextMenu> _menus = new List<ContextMenu>();
-        private List<SingleSelectGroupItem<T>> _items = new List<SingleSelectGroupItem<T>>();
-        public Action<T> OnSelectionChanged;
+        private List<SingleSelectGroupItem> _items = new List<SingleSelectGroupItem>();
+        private SingleSelectGroupItem _selectedItem;
 
-        public SingleSelectGroupItem<T> activeItem;
-
-        public ContextMenuSingleSelectGroup<T> AddItem(string text, T value, Action onSelected = null)
+        public T Selected
         {
-            var item = new SingleSelectGroupItem<T>
+            get => _selectedItem.Value;
+            set
             {
-                text = text,
-                value = value,
-                onSelected = onSelected,
-                buttons = new List<ContextMenuButton>()
+                var index = _items.FindIndex(x => x.Value.Equals(value));
+                if (index != -1 && !_selectedItem.Value.Equals(value))
+                {
+                    SetSelected(_items[index]);
+                }
+            }
+        }
+
+        public Action<T> SelectedChanged;
+
+        public ContextMenuSingleSelectGroup<T> AddItem(string text, T value, Action selected = null, string tooltip = null)
+        {
+            var item = new SingleSelectGroupItem
+            {
+                Text = text,
+                Tooltip = tooltip,
+                Value = value,
+                Selected = selected,
+                Buttons = new List<ContextMenuButton>()
             };
             _items.Add(item);
-
             foreach (var contextMenu in _menus)
                 AddItemToContextMenu(contextMenu, item);
-
             return this;
         }
 
         public ContextMenuSingleSelectGroup<T> AddItemsToContextMenu(ContextMenu contextMenu)
         {
             _menus.Add(contextMenu);
-
             for (int i = 0; i < _items.Count; i++)
-            {
                 AddItemToContextMenu(contextMenu, _items[i]);
-            }
-
             return this;
         }
 
-        private void AddItemToContextMenu(ContextMenu contextMenu, SingleSelectGroupItem<T> item)
+        private void AddItemToContextMenu(ContextMenu contextMenu, SingleSelectGroupItem item)
         {
-            var btn = contextMenu.AddButton(item.text, () =>
-            {
-                SetItemAsActive(item);
-            });
-
-            item.buttons.Add(btn);
-
-            if (item.Equals(activeItem))
-            {
+            var btn = contextMenu.AddButton(item.Text, () => { SetSelected(item); });
+            if (item.Tooltip != null)
+                btn.TooltipText = item.Tooltip;
+            item.Buttons.Add(btn);
+            if (item.Equals(_selectedItem))
                 btn.Checked = true;
-            }
         }
 
-        private void DeselectAll()
+        private void SetSelected(SingleSelectGroupItem item)
         {
-            foreach (var item in _items)
+            foreach (var e in _items)
             {
-                foreach (var btn in item.buttons) btn.Checked = false;
+                foreach (var btn in e.Buttons)
+                    btn.Checked = false;
             }
-        }
+            _selectedItem = item;
 
-        public void SetItemAsActive(T value)
-        {
-            var index = _items.FindIndex(x => x.value.Equals(value));
+            SelectedChanged?.Invoke(item.Value);
+            item.Selected?.Invoke();
 
-            if (index == -1) return;
-
-            SetItemAsActive(_items[index]);
-        }
-
-        private void SetItemAsActive(SingleSelectGroupItem<T> item)
-        {
-            DeselectAll();
-            activeItem = item;
-
-            var index = _items.IndexOf(item);
-            OnSelectionChanged?.Invoke(item.value);
-            item.onSelected?.Invoke();
-
-            foreach (var btn in item.buttons)
-            {
+            foreach (var btn in item.Buttons)
                 btn.Checked = true;
-            }
         }
     }
 }
diff --git a/Source/Editor/GUI/ToolStrip.cs b/Source/Editor/GUI/ToolStrip.cs
index 858e21b51..0dac241ed 100644
--- a/Source/Editor/GUI/ToolStrip.cs
+++ b/Source/Editor/GUI/ToolStrip.cs
@@ -25,12 +25,12 @@ namespace FlaxEditor.GUI
         /// <summary>
         /// Event fired when button gets clicked with the primary mouse button.
         /// </summary>
-        public Action<ToolStripButton> ButtonPrimaryClicked;
+        public Action<ToolStripButton> ButtonClicked;
 
         /// <summary>
         /// Event fired when button gets clicked with the secondary mouse button.
         /// </summary>
-        public Action<ToolStripButton> ButtonSecondaryClicked;
+        public Action<ToolStripButton> SecondaryButtonClicked;
 
         /// <summary>
         /// Tries to get the last button.
@@ -96,7 +96,7 @@ namespace FlaxEditor.GUI
                 Parent = this,
             };
             if (onClick != null)
-                button.PrimaryClicked += onClick;
+                button.Clicked += onClick;
             return button;
         }
 
@@ -115,7 +115,7 @@ namespace FlaxEditor.GUI
                 Parent = this,
             };
             if (onClick != null)
-                button.PrimaryClicked += onClick;
+                button.Clicked += onClick;
             return button;
         }
 
@@ -133,7 +133,7 @@ namespace FlaxEditor.GUI
                 Parent = this,
             };
             if (onClick != null)
-                button.PrimaryClicked += onClick;
+                button.Clicked += onClick;
             return button;
         }
 
@@ -146,14 +146,14 @@ namespace FlaxEditor.GUI
             return AddChild(new ToolStripSeparator(ItemsHeight));
         }
 
-        internal void OnButtonPrimaryClicked(ToolStripButton button)
+        internal void OnButtonClicked(ToolStripButton button)
         {
-            ButtonPrimaryClicked?.Invoke(button);
+            ButtonClicked?.Invoke(button);
         }
 
-        internal void OnButtonSecondaryClicked(ToolStripButton button)
+        internal void OnSecondaryButtonClicked(ToolStripButton button)
         {
-            ButtonSecondaryClicked?.Invoke(button);
+            SecondaryButtonClicked?.Invoke(button);
         }
 
         /// <inheritdoc />
diff --git a/Source/Editor/GUI/ToolStripButton.cs b/Source/Editor/GUI/ToolStripButton.cs
index f8d032696..e839a7356 100644
--- a/Source/Editor/GUI/ToolStripButton.cs
+++ b/Source/Editor/GUI/ToolStripButton.cs
@@ -11,12 +11,8 @@ namespace FlaxEditor.GUI
     /// </summary>
     /// <seealso cref="FlaxEngine.GUI.Control" />
     [HideInEditor]
-    public partial class ToolStripButton : Control
+    public class ToolStripButton : Control
     {
-        // TODO: abstracted for potential future in-editor input configuration (ex. for left handed mouse users)
-        private const MouseButton PRIMARY_MOUSE_BUTTON = MouseButton.Left;
-        private const MouseButton SECONDARY_MOUSE_BUTTON = MouseButton.Right;
-
         /// <summary>
         /// The default margin for button parts (icon, text, etc.).
         /// </summary>
@@ -30,7 +26,7 @@ namespace FlaxEditor.GUI
         /// <summary>
         /// Event fired when user clicks the button.
         /// </summary>
-        public Action PrimaryClicked;
+        public Action Clicked;
 
         /// <summary>
         /// Event fired when user clicks the button.
@@ -140,13 +136,7 @@ namespace FlaxEditor.GUI
             if (!string.IsNullOrEmpty(_text))
             {
                 textRect.Size.X = Width - DefaultMargin - textRect.Left;
-                Render2D.DrawText(
-                    style.FontMedium,
-                    _text,
-                    textRect,
-                    enabled ? style.Foreground : style.ForegroundDisabled,
-                    TextAlignment.Near,
-                    TextAlignment.Center);
+                Render2D.DrawText(style.FontMedium, _text, textRect, enabled ? style.Foreground : style.ForegroundDisabled, TextAlignment.Near, TextAlignment.Center);
             }
         }
 
@@ -169,19 +159,15 @@ namespace FlaxEditor.GUI
         /// <inheritdoc />
         public override bool OnMouseDown(Float2 location, MouseButton button)
         {
-            if (button == PRIMARY_MOUSE_BUTTON)
+            if (button == MouseButton.Left)
             {
-                // Set flag
                 _primaryMouseDown = true;
-
                 Focus();
                 return true;
             }
-            else if (button == SECONDARY_MOUSE_BUTTON)
+            if (button == MouseButton.Right)
             {
-                // Set flag
                 _secondaryMouseDown = true;
-
                 Focus();
                 return true;
             }
@@ -192,29 +178,22 @@ namespace FlaxEditor.GUI
         /// <inheritdoc />
         public override bool OnMouseUp(Float2 location, MouseButton button)
         {
-            if (button == PRIMARY_MOUSE_BUTTON && _primaryMouseDown)
+            if (button == MouseButton.Left && _primaryMouseDown)
             {
-                // Clear flag
                 _primaryMouseDown = false;
-
-                // Fire events
                 if (AutoCheck)
                     Checked = !Checked;
-                PrimaryClicked?.Invoke();
-                (Parent as ToolStrip)?.OnButtonPrimaryClicked(this);
+                Clicked?.Invoke();
+                (Parent as ToolStrip)?.OnButtonClicked(this);
 
                 return true;
             }
-            else if (button == SECONDARY_MOUSE_BUTTON && _secondaryMouseDown)
+            if (button == MouseButton.Right && _secondaryMouseDown)
             {
-                // Clear flag
                 _secondaryMouseDown = false;
-
                 SecondaryClicked?.Invoke();
-                (Parent as ToolStrip)?.OnButtonSecondaryClicked(this);
-
+                (Parent as ToolStrip)?.OnSecondaryButtonClicked(this);
                 ContextMenu?.Show(this, new Float2(0, Height));
-
                 return true;
             }
 
@@ -224,7 +203,6 @@ namespace FlaxEditor.GUI
         /// <inheritdoc />
         public override void OnMouseLeave()
         {
-            // Clear flag
             _primaryMouseDown = false;
             _secondaryMouseDown = false;
 
@@ -234,7 +212,6 @@ namespace FlaxEditor.GUI
         /// <inheritdoc />
         public override void OnLostFocus()
         {
-            // Clear flag
             _primaryMouseDown = false;
             _secondaryMouseDown = false;
 
diff --git a/Source/Editor/Modules/UIModule.cs b/Source/Editor/Modules/UIModule.cs
index 5e0af20fe..38c61942a 100644
--- a/Source/Editor/Modules/UIModule.cs
+++ b/Source/Editor/Modules/UIModule.cs
@@ -21,7 +21,7 @@ using FlaxEngine.Json;
 using DockHintWindow = FlaxEditor.GUI.Docking.DockHintWindow;
 using MasterDockPanel = FlaxEditor.GUI.Docking.MasterDockPanel;
 using FlaxEditor.Content.Settings;
-using static FlaxEditor.Options.InterfaceOptions;
+using FlaxEditor.Options;
 
 namespace FlaxEditor.Modules
 {
@@ -203,6 +203,7 @@ namespace FlaxEditor.Modules
             _toolStripScale.Checked = gizmoMode == TransformGizmoBase.Mode.Scale;
             //
             _toolStripBuildScenes.Enabled = (canEditScene && !isPlayMode) || Editor.StateMachine.BuildingScenesState.IsActive;
+            _toolStripCook.Enabled = Editor.Windows.GameCookerWin.CanBuild(Platform.PlatformType) && !GameCooker.IsRunning;
             //
             var play = _toolStripPlay;
             var pause = _toolStripPause;
@@ -418,6 +419,7 @@ namespace FlaxEditor.Modules
             Editor.Undo.UndoDone += OnUndoEvent;
             Editor.Undo.RedoDone += OnUndoEvent;
             Editor.Undo.ActionDone += OnUndoEvent;
+            GameCooker.Event += OnGameCookerEvent;
 
             UpdateToolstrip();
         }
@@ -433,6 +435,11 @@ namespace FlaxEditor.Modules
             UpdateStatusBar();
         }
 
+        private void OnGameCookerEvent(GameCooker.EventType type)
+        {
+            UpdateToolstrip();
+        }
+
         /// <inheritdoc />
         public override void OnExit()
         {
@@ -477,23 +484,18 @@ namespace FlaxEditor.Modules
 
         private void InitSharedMenus()
         {
-            for (int i = 1; i <= 4; i++) _numberOfClientsGroup.AddItem(i.ToString(), i);
+            for (int i = 1; i <= 4; i++)
+                _numberOfClientsGroup.AddItem(i.ToString(), i);
 
-            _numberOfClientsGroup.SetItemAsActive(Editor.Options.Options.Interface.NumberOfGameClientsToLaunch);
-            _numberOfClientsGroup.OnSelectionChanged = (value) =>
+            _numberOfClientsGroup.Selected = Editor.Options.Options.Interface.NumberOfGameClientsToLaunch;
+            _numberOfClientsGroup.SelectedChanged = value =>
             {
                 var options = Editor.Options.Options;
                 options.Interface.NumberOfGameClientsToLaunch = value;
                 Editor.Options.Apply(options);
             };
 
-            Editor.Options.OptionsChanged += (options) =>
-            {
-                if (options.Interface.NumberOfGameClientsToLaunch != _numberOfClientsGroup.activeItem.value)
-                {
-                    _numberOfClientsGroup.SetItemAsActive(options.Interface.NumberOfGameClientsToLaunch);
-                }
-            };
+            Editor.Options.OptionsChanged += options => { _numberOfClientsGroup.Selected = options.Interface.NumberOfGameClientsToLaunch; };
         }
 
         private void InitMainMenu(RootControl mainWindow)
@@ -665,43 +667,33 @@ namespace FlaxEditor.Modules
             _toolStripRotate = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Rotate32, () => Editor.MainTransformGizmo.ActiveMode = TransformGizmoBase.Mode.Rotate).LinkTooltip("Change Gizmo tool mode to Rotate (2)");
             _toolStripScale = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Scale32, () => Editor.MainTransformGizmo.ActiveMode = TransformGizmoBase.Mode.Scale).LinkTooltip("Change Gizmo tool mode to Scale (3)");
             ToolStrip.AddSeparator();
-            _toolStripBuildScenes = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Build64, Editor.BuildScenesOrCancel).LinkTooltip("Build scenes data - CSG, navmesh, static lighting, env probes - configurable via Build Actions in editor options (Ctrl+F10)");
-            ToolStrip.AddSeparator();
 
-            // build
-            _toolStripCook = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.BuildSettings128, CookAndRun).LinkTooltip("Cook and run");
+            // Cook scenes
+            _toolStripBuildScenes = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Build64, Editor.BuildScenesOrCancel).LinkTooltip("Build scenes data - CSG, navmesh, static lighting, env probes - configurable via Build Actions in editor options (Ctrl+F10)");
+
+            // Cook and run
+            _toolStripCook = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.ShipIt64, CookAndRun).LinkTooltip("Cook & Run - build game for the current platform and run it locally");
             _toolStripCook.ContextMenu = new ContextMenu();
             _toolStripCook.ContextMenu.AddButton("Run cooked game", RunCookedGame);
             _toolStripCook.ContextMenu.AddSeparator();
             var numberOfClientsMenu = _toolStripCook.ContextMenu.AddChildMenu("Number of game clients");
             _numberOfClientsGroup.AddItemsToContextMenu(numberOfClientsMenu.ContextMenu);
 
-            // play
+            ToolStrip.AddSeparator();
+
+            // Play
             _toolStripPlay = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Play64, OnPlayPressed).LinkTooltip("Play Game");
             _toolStripPlay.ContextMenu = new ContextMenu();
-            ContextMenuChildMenu playSubMenu;
-
-            // play - button action
-            playSubMenu = _toolStripPlay.ContextMenu.AddChildMenu("Play button action");
-            var playActionGroup = new ContextMenuSingleSelectGroup<PlayAction>();
-            playActionGroup.AddItem("Play Game", PlayAction.PlayGame);
-            playActionGroup.AddItem("Play Scenes", PlayAction.PlayScenes);
+            var playSubMenu = _toolStripPlay.ContextMenu.AddChildMenu("Play button action");
+            var playActionGroup = new ContextMenuSingleSelectGroup<InterfaceOptions.PlayAction>();
+            playActionGroup.AddItem("Play Game", InterfaceOptions.PlayAction.PlayGame, null, "Launches the game from the First Scene defined in the project settings.");
+            playActionGroup.AddItem("Play Scenes", InterfaceOptions.PlayAction.PlayScenes, null, "Launches the game using the scenes currently loaded in the editor.");
             playActionGroup.AddItemsToContextMenu(playSubMenu.ContextMenu);
-            playActionGroup.SetItemAsActive(Editor.Options.Options.Interface.PlayButtonAction);
-            // important to add the handler after setting the initial item as active above or the editor will crash
-            playActionGroup.OnSelectionChanged = SetPlayAction;
-            // TODO: there is a hole in the syncing of these values:
-            // - when changing in the editor, the options will be updated, but the options UI in-editor will not
+            playActionGroup.Selected = Editor.Options.Options.Interface.PlayButtonAction;
+            playActionGroup.SelectedChanged = SetPlayAction;
+            Editor.Options.OptionsChanged += options => { playActionGroup.Selected = options.Interface.PlayButtonAction; };
 
-            Editor.Options.OptionsChanged += (options) =>
-            {
-                if (options.Interface.PlayButtonAction != playActionGroup.activeItem.value)
-                {
-                    playActionGroup.SetItemAsActive(options.Interface.PlayButtonAction);
-                }
-            };
-
-            _toolStripPause = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Pause64, Editor.Simulation.RequestResumeOrPause).LinkTooltip($"Pause/Resume game({inputOptions.Pause.ToString()})");
+            _toolStripPause = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Pause64, Editor.Simulation.RequestResumeOrPause).LinkTooltip($"Pause/Resume game({inputOptions.Pause})");
             _toolStripStep = (ToolStripButton)ToolStrip.AddButton(Editor.Icons.Skip64, Editor.Simulation.RequestPlayOneFrame).LinkTooltip("Step one frame in game");
 
             UpdateToolstrip();
@@ -736,10 +728,7 @@ namespace FlaxEditor.Modules
             var defaultTextColor = StatusBar.TextColor;
             _outputLogButton.HoverBegin += () => StatusBar.TextColor = Style.Current.BackgroundSelected;
             _outputLogButton.HoverEnd += () => StatusBar.TextColor = defaultTextColor;
-            _outputLogButton.Clicked += () =>
-            {
-                Editor.Windows.OutputLogWin.FocusOrShow();
-            };
+            _outputLogButton.Clicked += () => { Editor.Windows.OutputLogWin.FocusOrShow(); };
 
             // Progress bar with label
             const float progressBarWidth = 120.0f;
@@ -1043,7 +1032,7 @@ namespace FlaxEditor.Modules
             projectInfo.Save();
         }
 
-        private void SetPlayAction(PlayAction newPlayAction)
+        private void SetPlayAction(InterfaceOptions.PlayAction newPlayAction)
         {
             var options = Editor.Options.Options;
             options.Interface.PlayButtonAction = newPlayAction;
@@ -1054,23 +1043,25 @@ namespace FlaxEditor.Modules
         {
             switch (Editor.Options.Options.Interface.PlayButtonAction)
             {
-                case PlayAction.PlayGame:
-                    if (Editor.IsPlayMode)
-                        Editor.Simulation.RequestStopPlay();
-                    else
-                        PlayGame();
-                    return;
-                case PlayAction.PlayScenes: PlayScenes(); return;
+            case InterfaceOptions.PlayAction.PlayGame:
+                if (Editor.IsPlayMode)
+                    Editor.Simulation.RequestStopPlay();
+                else
+                    PlayGame();
+                return;
+            case InterfaceOptions.PlayAction.PlayScenes:
+                PlayScenes();
+                return;
             }
         }
 
         private void PlayGame()
         {
             var firstScene = GameSettings.Load().FirstScene;
-
             if (firstScene == Guid.Empty)
             {
-                if (Level.IsAnySceneLoaded) Editor.Simulation.RequestStartPlay();
+                if (Level.IsAnySceneLoaded)
+                    Editor.Simulation.RequestStartPlay();
                 return;
             }
 
diff --git a/Source/Editor/Options/InterfaceOptions.cs b/Source/Editor/Options/InterfaceOptions.cs
index 7d97fecd6..5fd8c31c7 100644
--- a/Source/Editor/Options/InterfaceOptions.cs
+++ b/Source/Editor/Options/InterfaceOptions.cs
@@ -83,10 +83,11 @@ namespace FlaxEditor.Options
             /// Launches the game from the First Scene defined in the project settings.
             /// </summary>
             PlayGame,
+
             /// <summary>
             /// Launches the game using the scenes currently loaded in the editor.
             /// </summary>
-            PlayScenes
+            PlayScenes,
         }
 
         /// <summary>
@@ -97,14 +98,12 @@ namespace FlaxEditor.Options
         public float InterfaceScale { get; set; } = 1.0f;
 
 #if PLATFORM_WINDOWS
-
         /// <summary>
         /// Gets or sets a value indicating whether use native window title bar. Editor restart required.
         /// </summary>
         [DefaultValue(false)]
         [EditorDisplay("Interface"), EditorOrder(70), Tooltip("Determines whether use native window title bar. Editor restart required.")]
         public bool UseNativeWindowSystem { get; set; } = false;
-
 #endif
 
         /// <summary>
@@ -215,15 +214,14 @@ namespace FlaxEditor.Options
         /// Gets or sets a value indicating what action should be taken upon pressing the play button.
         /// </summary>
         [DefaultValue(PlayAction.PlayScenes)]
-        [EditorDisplay("Play In-Editor", "Play Button Action"), EditorOrder(410), Tooltip("Determines the action taken when the play button is pressed.")]
+        [EditorDisplay("Play In-Editor", "Play Button Action"), EditorOrder(410)]
         public PlayAction PlayButtonAction { get; set; } = PlayAction.PlayScenes;
 
         /// <summary>
         /// Gets or sets a value indicating the number of game clients to launch when building and/or running cooked game.
         /// </summary>
-        [DefaultValue(1)]
-        [EditorDisplay("Cook & Run", "Number Of GameClients To Launch"), EditorOrder(500), Tooltip("Determines the number of game clients to launch when building and/or running cooked game.")]
-        [Range(1, 4)]
+        [DefaultValue(1), Range(1, 4)]
+        [EditorDisplay("Cook & Run"), EditorOrder(500)]
         public int NumberOfGameClientsToLaunch = 1;
 
         private static FontAsset DefaultFont => FlaxEngine.Content.LoadAsyncInternal<FontAsset>(EditorAssets.PrimaryFont);
diff --git a/Source/Editor/Windows/GameCookerWindow.cs b/Source/Editor/Windows/GameCookerWindow.cs
index f88fa36f5..5ece067a0 100644
--- a/Source/Editor/Windows/GameCookerWindow.cs
+++ b/Source/Editor/Windows/GameCookerWindow.cs
@@ -110,14 +110,14 @@ namespace FlaxEditor.Windows
 #if PLATFORM_WINDOWS
                     switch (BuildPlatform)
                     {
-                        case BuildPlatform.MacOSx64:
-                        case BuildPlatform.MacOSARM64:
-                        case BuildPlatform.iOSARM64:
-                            IsSupported = false;
-                            break;
-                        default:
-                            IsSupported = true;
-                            break;
+                    case BuildPlatform.MacOSx64:
+                    case BuildPlatform.MacOSARM64:
+                    case BuildPlatform.iOSARM64:
+                        IsSupported = false;
+                        break;
+                    default:
+                        IsSupported = true;
+                        break;
                     }
 #elif PLATFORM_LINUX
                     switch (BuildPlatform)
@@ -160,17 +160,17 @@ namespace FlaxEditor.Windows
                     {
                         switch (BuildPlatform)
                         {
-                            case BuildPlatform.Windows32:
-                            case BuildPlatform.Windows64:
-                            case BuildPlatform.UWPx86:
-                            case BuildPlatform.UWPx64:
-                            case BuildPlatform.LinuxX64:
-                            case BuildPlatform.AndroidARM64:
-                                layout.Label("Use Flax Launcher and download the required package.", TextAlignment.Center);
-                                break;
-                            default:
-                                layout.Label("Engine source is required to target this platform.", TextAlignment.Center);
-                                break;
+                        case BuildPlatform.Windows32:
+                        case BuildPlatform.Windows64:
+                        case BuildPlatform.UWPx86:
+                        case BuildPlatform.UWPx64:
+                        case BuildPlatform.LinuxX64:
+                        case BuildPlatform.AndroidARM64:
+                            layout.Label("Use Flax Launcher and download the required package.", TextAlignment.Center);
+                            break;
+                        default:
+                            layout.Label("Engine source is required to target this platform.", TextAlignment.Center);
+                            break;
                         }
                     }
                     else
@@ -238,6 +238,7 @@ namespace FlaxEditor.Windows
                 {
                     [EditorDisplay(null, "arm64")]
                     ARM64,
+
                     [EditorDisplay(null, "x64")]
                     x64,
                 }
@@ -272,43 +273,43 @@ namespace FlaxEditor.Windows
                         string name;
                         switch (_platform)
                         {
-                            case PlatformType.Windows:
-                                name = "Windows";
-                                break;
-                            case PlatformType.XboxOne:
-                                name = "Xbox One";
-                                break;
-                            case PlatformType.UWP:
-                                name = "Windows Store";
-                                layout.Label("UWP (Windows Store) platform has been deprecated and is no longer supported", TextAlignment.Center).Label.TextColor = Color.Red;
-                                break;
-                            case PlatformType.Linux:
-                                name = "Linux";
-                                break;
-                            case PlatformType.PS4:
-                                name = "PlayStation 4";
-                                break;
-                            case PlatformType.XboxScarlett:
-                                name = "Xbox Scarlett";
-                                break;
-                            case PlatformType.Android:
-                                name = "Android";
-                                break;
-                            case PlatformType.Switch:
-                                name = "Switch";
-                                break;
-                            case PlatformType.PS5:
-                                name = "PlayStation 5";
-                                break;
-                            case PlatformType.Mac:
-                                name = "Mac";
-                                break;
-                            case PlatformType.iOS:
-                                name = "iOS";
-                                break;
-                            default:
-                                name = Utilities.Utils.GetPropertyNameUI(_platform.ToString());
-                                break;
+                        case PlatformType.Windows:
+                            name = "Windows";
+                            break;
+                        case PlatformType.XboxOne:
+                            name = "Xbox One";
+                            break;
+                        case PlatformType.UWP:
+                            name = "Windows Store";
+                            layout.Label("UWP (Windows Store) platform has been deprecated and is no longer supported", TextAlignment.Center).Label.TextColor = Color.Red;
+                            break;
+                        case PlatformType.Linux:
+                            name = "Linux";
+                            break;
+                        case PlatformType.PS4:
+                            name = "PlayStation 4";
+                            break;
+                        case PlatformType.XboxScarlett:
+                            name = "Xbox Scarlett";
+                            break;
+                        case PlatformType.Android:
+                            name = "Android";
+                            break;
+                        case PlatformType.Switch:
+                            name = "Switch";
+                            break;
+                        case PlatformType.PS5:
+                            name = "PlayStation 5";
+                            break;
+                        case PlatformType.Mac:
+                            name = "Mac";
+                            break;
+                        case PlatformType.iOS:
+                            name = "iOS";
+                            break;
+                        default:
+                            name = Utilities.Utils.GetPropertyNameUI(_platform.ToString());
+                            break;
                         }
                         var group = layout.Group(name);
 
@@ -614,6 +615,18 @@ namespace FlaxEditor.Windows
             _exitOnBuildEnd = true;
         }
 
+        /// <summary>
+        /// Returns true if can build for the given platform (both supported and available).
+        /// </summary>
+        /// <param name="platformType">The platform.</param>
+        /// <returns>True if can build, otherwise false.</returns>
+        public bool CanBuild(PlatformType platformType)
+        {
+            if (_buildTabProxy.PerPlatformOptions.TryGetValue(platformType, out var platform))
+                return platform.IsAvailable && platform.IsSupported;
+            return false;
+        }
+
         /// <summary>
         /// Builds all the targets from the given preset.
         /// </summary>
@@ -660,11 +673,11 @@ namespace FlaxEditor.Windows
             Editor.Log("Building and running");
             GameCooker.GetCurrentPlatform(out var platform, out var buildPlatform, out var buildConfiguration);
             var numberOfClients = Editor.Options.Options.Interface.NumberOfGameClientsToLaunch;
-
             for (int i = 0; i < numberOfClients; i++)
             {
                 var buildOptions = BuildOptions.AutoRun;
-                if (i > 0) buildOptions |= BuildOptions.NoCook;
+                if (i > 0)
+                    buildOptions |= BuildOptions.NoCook;
 
                 _buildingQueue.Enqueue(new QueueItem
                 {
@@ -687,7 +700,6 @@ namespace FlaxEditor.Windows
             Editor.Log("Running cooked build");
             GameCooker.GetCurrentPlatform(out var platform, out var buildPlatform, out var buildConfiguration);
             var numberOfClients = Editor.Options.Options.Interface.NumberOfGameClientsToLaunch;
-
             for (int i = 0; i < numberOfClients; i++)
             {
                 _buildingQueue.Enqueue(new QueueItem
diff --git a/Source/Editor/Windows/Profiler/ProfilerWindow.cs b/Source/Editor/Windows/Profiler/ProfilerWindow.cs
index b35641bf6..f5a5c6f86 100644
--- a/Source/Editor/Windows/Profiler/ProfilerWindow.cs
+++ b/Source/Editor/Windows/Profiler/ProfilerWindow.cs
@@ -93,7 +93,7 @@ namespace FlaxEditor.Windows.Profiler
             _liveRecordingButton = toolstrip.AddButton(editor.Icons.Play64);
             _liveRecordingButton.LinkTooltip("Live profiling events recording");
             _liveRecordingButton.AutoCheck = true;
-            _liveRecordingButton.PrimaryClicked += () => _liveRecordingButton.Icon = LiveRecording ? editor.Icons.Stop64 : editor.Icons.Play64;
+            _liveRecordingButton.Clicked += () => _liveRecordingButton.Icon = LiveRecording ? editor.Icons.Stop64 : editor.Icons.Play64;
             _clearButton = toolstrip.AddButton(editor.Icons.Rotate32, Clear);
             _clearButton.LinkTooltip("Clear data");
             toolstrip.AddSeparator();

From cfab58ccc69968202577ec74e7a82deb43dcb497 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 1 Aug 2023 09:57:38 +0200
Subject: [PATCH 20/22] Fix some actor assets into soft checks

---
 Source/Engine/Level/Actor.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/Source/Engine/Level/Actor.cpp b/Source/Engine/Level/Actor.cpp
index 08fb77223..8185f3b9d 100644
--- a/Source/Engine/Level/Actor.cpp
+++ b/Source/Engine/Level/Actor.cpp
@@ -788,7 +788,9 @@ void Actor::BreakPrefabLink()
 
 void Actor::Initialize()
 {
-    ASSERT(!IsDuringPlay());
+#if ENABLE_ASSERTION
+    CHECK(!IsDuringPlay());
+#endif
 
     // Cache
     if (_parent)
@@ -802,7 +804,9 @@ void Actor::Initialize()
 
 void Actor::BeginPlay(SceneBeginData* data)
 {
-    ASSERT(!IsDuringPlay());
+#if ENABLE_ASSERTION
+    CHECK(!IsDuringPlay());
+#endif
 
     // Set flag
     Flags |= ObjectFlags::IsDuringPlay;
@@ -832,7 +836,9 @@ void Actor::BeginPlay(SceneBeginData* data)
 
 void Actor::EndPlay()
 {
-    ASSERT(IsDuringPlay());
+#if ENABLE_ASSERTION
+    CHECK(IsDuringPlay());
+#endif
 
     // Fire event for scripting
     if (IsActiveInHierarchy() && GetScene())
@@ -1059,7 +1065,9 @@ void Actor::Deserialize(DeserializeStream& stream, ISerializeModifier* modifier)
 
 void Actor::OnEnable()
 {
-    ASSERT(!_isEnabled);
+#if ENABLE_ASSERTION
+    CHECK(!_isEnabled);
+#endif
     _isEnabled = true;
 
     for (int32 i = 0; i < Scripts.Count(); i++)
@@ -1079,7 +1087,9 @@ void Actor::OnEnable()
 
 void Actor::OnDisable()
 {
-    ASSERT(_isEnabled);
+#if ENABLE_ASSERTION
+    CHECK(_isEnabled);
+#endif
     _isEnabled = false;
 
     for (int32 i = Scripts.Count() - 1; i >= 0; i--)

From 911cdb3f2d8d245f836c4eeedf1b81c87d90e7a7 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 1 Aug 2023 10:01:00 +0200
Subject: [PATCH 21/22] Softlock fix

---
 Source/Engine/ShadowsOfMordor/Builder.Jobs.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Source/Engine/ShadowsOfMordor/Builder.Jobs.cpp b/Source/Engine/ShadowsOfMordor/Builder.Jobs.cpp
index afe384d6c..11d136d62 100644
--- a/Source/Engine/ShadowsOfMordor/Builder.Jobs.cpp
+++ b/Source/Engine/ShadowsOfMordor/Builder.Jobs.cpp
@@ -178,7 +178,7 @@ void ShadowsOfMordor::Builder::onJobRender(GPUContext* context)
 
                 DrawCall drawCall;
                 if (TerrainManager::GetChunkGeometry(drawCall, chunkSize, 0))
-                    return;
+                    break;
 
                 context->UpdateCB(cb, &shaderData);
                 context->BindCB(0, cb);

From f29cd1b7b855b49712b3aeeffdd5cb230c4918a9 Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 1 Aug 2023 10:03:47 +0200
Subject: [PATCH 22/22] Simplify code #1275

---
 Source/Editor/Gizmo/GridGizmo.cs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Source/Editor/Gizmo/GridGizmo.cs b/Source/Editor/Gizmo/GridGizmo.cs
index d9e080982..3174d23c1 100644
--- a/Source/Editor/Gizmo/GridGizmo.cs
+++ b/Source/Editor/Gizmo/GridGizmo.cs
@@ -46,20 +46,19 @@ namespace FlaxEditor.Gizmo
                 var plane = new Plane(Vector3.Zero, Vector3.UnitY);
                 var dst = CollisionsHelper.DistancePlanePoint(ref plane, ref viewPos);
 
-                float space, size;
+                float space = Editor.Instance.Options.Options.Viewport.ViewportGridScale, size;
                 if (dst <= 500.0f)
                 {
-                    space = Editor.Instance.Options.Options.Viewport.ViewportGridScale;
                     size = 8000;
                 }
                 else if (dst <= 2000.0f)
                 {
-                    space = Editor.Instance.Options.Options.Viewport.ViewportGridScale * 2;
+                    space *= 2;
                     size = 8000;
                 }
                 else
                 {
-                    space = Editor.Instance.Options.Options.Viewport.ViewportGridScale * 20;
+                    space *= 20;
                     size = 100000;
                 }