GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.10' into sdl_platform

Browse Source 
# Conflicts:
#	Source/Editor/GUI/ContextMenu/ContextMenuBase.cs
#	Source/Engine/Platform/Linux/LinuxPlatform.cpp
This commit is contained in:
Ari Vuollet
2025-03-09 13:16:25 +02:00
parent 83d6f9fcf3 bc4f3668fe
commit 45c388c92d
594 changed files with 19183 additions and 15772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Editor/Windows/GameWindow.cs
View File

@@ -324,6 +324,7 @@ namespace FlaxEditor.Windows
InputActions.Add(options => options.Play, Editor.Instance.Simulation.DelegatePlayOrStopPlayInEditor);
InputActions.Add(options => options.Pause, Editor.Instance.Simulation.RequestResumeOrPause);
InputActions.Add(options => options.StepFrame, Editor.Instance.Simulation.RequestPlayOneFrame);
#if USE_PROFILER
InputActions.Add(options => options.ProfilerStartStop, () =>
{
bool recording = !Editor.Instance.Windows.ProfilerWin.LiveRecording;
@@ -333,8 +334,9 @@ namespace FlaxEditor.Windows
InputActions.Add(options => options.ProfilerClear, () =>
{
Editor.Instance.Windows.ProfilerWin.Clear();
Editor.Instance.UI.AddStatusMessage($"Profiling results cleared.");
Editor.Instance.UI.AddStatusMessage("Profiling results cleared.");
});
#endif
InputActions.Add(options => options.Save, () =>
{
if (Editor.IsPlayMode)