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

# Conflicts:
#	Source/Engine/Navigation/NavMesh.cpp
#	Source/Engine/Navigation/NavMeshBuilder.cpp
This commit is contained in:
Wojtek Figat
2021-01-22 11:31:22 +01:00
178 changed files with 1163 additions and 864 deletions

View File

@@ -222,7 +222,7 @@ namespace FlaxEditor.GUI
}
/// <summary>
/// Filters teh given value using the the <see cref="UseMode"/>.
/// Filters the given value using the <see cref="UseMode"/>.
/// </summary>
/// <param name="mode">The mode.</param>
/// <param name="value">The value to process.</param>

View File

@@ -186,7 +186,7 @@ namespace FlaxEditor.GUI.Dialogs
// Clean up
_window = null;
// Check if any thead is blocked during ShowDialog, then wait for it
// Check if any thread is blocked during ShowDialog, then wait for it
bool wait = true;
while (wait)
{

View File

@@ -64,7 +64,7 @@ namespace FlaxEditor.GUI.Docking
for (int i = 0; i < childPanels.Length; i++)
childPanels[i].Dispose();
// Delete reaming controls (except tabs proxy)
// Delete remaining controls (except tabs proxy)
if (TabsProxy != null)
TabsProxy.Parent = null;
DisposeChildren();

View File

@@ -168,6 +168,7 @@ namespace FlaxEditor.GUI.Input
{
if (button == MouseButton.Left)
{
Focus();
float mousePosition = location.X;
if (_thumbRect.Contains(ref location))
@@ -208,7 +209,6 @@ namespace FlaxEditor.GUI.Input
{
if (button == MouseButton.Left && _isSliding)
{
// End sliding
EndSliding();
return true;
}

View File

@@ -120,7 +120,7 @@ namespace FlaxEditor.GUI
/// <summary>
/// Draws the column.
/// </summary>
/// <param name="rect">The the header area rectangle.</param>
/// <param name="rect">The header area rectangle.</param>
/// <param name="columnIndex">The zero-based index of the column.</param>
protected virtual void DrawColumn(ref Rectangle rect, int columnIndex)
{

View File

@@ -402,7 +402,7 @@ namespace FlaxEditor.GUI
}
/// <summary>
/// Converts the input point from editor editor contents control space into the keyframes time/value coordinates.
/// Converts the input point from editor contents control space into the keyframes time/value coordinates.
/// </summary>
/// <param name="point">The point.</param>
/// <param name="keyframesContentAreaBounds">The keyframes contents area bounds.</param>

View File

@@ -179,7 +179,7 @@ namespace FlaxEditor.GUI.Timeline.Tracks
}
/// <summary>
/// Evaluates the member value value at the specified time.
/// Evaluates the member value at the specified time.
/// </summary>
/// <param name="time">The time to evaluate the member at.</param>
/// <returns>The member value at provided time.</returns>