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

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

Browse Source 
# 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
parent cbbfb16628 8680aba897
commit 6cbeac6537
178 changed files with 1163 additions and 864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Engine/Scripting/Attributes/Editor/EditorOrderAttribute.cs
View File

@@ -27,7 +27,7 @@ namespace FlaxEngine
/// <remarks>
/// Current order is resolved runtime, and can change if custom editor class has changed.
/// </remarks>
/// <param name="order">The order order.</param>
/// <param name="order">The order.</param>
public EditorOrderAttribute(int order)
{
Order = order;

2
Source/Engine/Scripting/Attributes/SerializeAttribute.cs
View File

@@ -5,7 +5,7 @@ using System;
namespace FlaxEngine
{
/// <summary>
/// Indicates that a field or a property of a serializable class should be be serialized. This class cannot be inherited.
/// Indicates that a field or a property of a serializable class should be serialized. This class cannot be inherited.
/// </summary>
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
public sealed class SerializeAttribute : Attribute

2
Source/Engine/Scripting/ManagedCLR/MAssembly.Mono.cpp
View File

@@ -302,7 +302,7 @@ bool MAssembly::LoadWithImage(const String& assemblyPath)
const auto assembly = mono_assembly_load_from_full(assemblyImage, name.Substring(0, name.Length() - 3).Get(), &status, false);
if (status != MONO_IMAGE_OK || assembly == nullptr)
{
// Close image if error occured
// Close image if error occurred
mono_image_close(assemblyImage);
Log::CLRInnerException(TEXT("Mono assembly image is corrupted at ") + assemblyPath);

2
Source/Engine/Scripting/ManagedCLR/MAssembly.h
View File

@@ -234,7 +234,7 @@ public:
#endif
/// <summary>
/// Gets the classes lookup cache. Performs ful initialization if not cached. The result cache contains all classes from the assembly.
/// Gets the classes lookup cache. Performs full initialization if not cached. The result cache contains all classes from the assembly.
/// </summary>
/// <returns>The cache.</returns>
const ClassesDictionary& GetClasses() const;

2
Source/Engine/Scripting/ManagedCLR/MClass.h
View File

@@ -193,7 +193,7 @@ public:
/// <summary>
/// Returns an object referencing a method with the specified name and number of parameters.
/// </summary>
/// <remarks>If the the type contains more than one method of the given name and parameters count the returned value can be non-deterministic (one of the matching methods).</remarks>
/// <remarks>If the type contains more than one method of the given name and parameters count the returned value can be non-deterministic (one of the matching methods).</remarks>
/// <param name="name">The method name.</param>
/// <param name="numParams">The method parameters count.</param>
/// <returns>The method or null if failed to get it.</returns>

4
Source/Engine/Scripting/ScriptingType.h
View File

@@ -206,7 +206,7 @@ struct FLAXENGINE_API ScriptingType
SetupScriptObjectVTableHandler SetupScriptObjectVTable;
/// <summary>
/// The default instance of the scripting type. Used by serialization system for comparision to save only modified properties of the object.
/// The default instance of the scripting type. Used by serialization system for comparison to save only modified properties of the object.
/// </summary>
mutable ScriptingObject* DefaultInstance;
} Script;
@@ -282,7 +282,7 @@ struct FLAXENGINE_API ScriptingType
}
/// <summary>
/// Gets the default instance of the scripting type. Used by serialization system for comparision to save only modified properties of the object.
/// Gets the default instance of the scripting type. Used by serialization system for comparison to save only modified properties of the object.
/// </summary>
ScriptingObject* GetDefaultInstance() const;