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

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

Browse Source 
# Conflicts:
#	Source/Editor/Windows/Profiler/Memory.cs
This commit is contained in:
Wojtek Figat
2025-03-25 13:37:15 +01:00
parent 9cf7046a5b 9459eff58c
commit 7e145c56fd
94 changed files with 901 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Editor/Windows/Profiler/Assets.cs
View File

@@ -68,6 +68,7 @@ namespace FlaxEditor.Windows.Profiler
{
AnchorPreset = AnchorPresets.HorizontalStretchTop,
Offsets = Margin.Zero,
Pivot = Float2.Zero,
IsScrollable = true,
Parent = panel,
};

1
Source/Editor/Windows/Profiler/CPU.cs
View File

@@ -88,6 +88,7 @@ namespace FlaxEditor.Windows.Profiler
{
AnchorPreset = AnchorPresets.HorizontalStretchTop,
Offsets = Margin.Zero,
Pivot = Float2.Zero,
IsScrollable = true,
Parent = panel,
};

1
Source/Editor/Windows/Profiler/GPU.cs
View File

@@ -65,6 +65,7 @@ namespace FlaxEditor.Windows.Profiler
{
AnchorPreset = AnchorPresets.HorizontalStretchTop,
Offsets = Margin.Zero,
Pivot = Float2.Zero,
IsScrollable = true,
Parent = panel,
};

2
Source/Editor/Windows/Profiler/Memory.cs
View File

@@ -2,6 +2,7 @@
#if USE_PROFILER
using System;
using FlaxEngine;
using FlaxEngine.GUI;
namespace FlaxEditor.Windows.Profiler
@@ -29,6 +30,7 @@ namespace FlaxEditor.Windows.Profiler
{
AnchorPreset = AnchorPresets.HorizontalStretchTop,
Offsets = Margin.Zero,
Pivot = Float2.Zero,
IsScrollable = true,
Parent = panel,
};

1
Source/Editor/Windows/Profiler/MemoryGPU.cs
View File

@@ -69,6 +69,7 @@ namespace FlaxEditor.Windows.Profiler
{
AnchorPreset = AnchorPresets.HorizontalStretchTop,
Offsets = Margin.Zero,
Pivot = Float2.Zero,
IsScrollable = true,
Parent = panel,
};

1
Source/Editor/Windows/Profiler/Network.cs
View File

@@ -63,6 +63,7 @@ namespace FlaxEditor.Windows.Profiler
{
AnchorPreset = AnchorPresets.HorizontalStretchTop,
Offsets = Margin.Zero,
Pivot = Float2.Zero,
IsScrollable = true,
Parent = panel,
};

1
Source/Editor/Windows/Profiler/Overall.cs
View File

@@ -33,6 +33,7 @@ namespace FlaxEditor.Windows.Profiler
{
AnchorPreset = AnchorPresets.HorizontalStretchTop,
Offsets = Margin.Zero,
Pivot = Float2.Zero,
IsScrollable = true,
Parent = panel,
};

1
Source/Editor/Windows/Profiler/Physics.cs
View File

@@ -33,6 +33,7 @@ namespace FlaxEditor.Windows.Profiler
{
AnchorPreset = AnchorPresets.HorizontalStretchTop,
Offsets = Margin.Zero,
Pivot = Float2.Zero,
IsScrollable = true,
Parent = panel,
};