Merge remote-tracking branch 'origin/master' into navigation-features

# Conflicts: # Source/Editor/Content/Settings/NavigationSettings.cs # Source/Engine/Engine/PhysicalMaterial.cs # Source/Tools/Flax.Build/Bindings/BindingsGenerator.Api.cs
2021-01-04 14:31:56 +01:00
parent b38ccb0fbd d715c0c0dd
commit cc8e78b505
2425 changed files with 4606 additions and 30937 deletions
--- a/Source/Engine/Serialization/FileReadStream.cpp
+++ b/Source/Engine/Serialization/FileReadStream.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "FileReadStream.h"
 #include "Engine/Core/Log.h"
--- a/Source/Engine/Serialization/FileReadStream.h
+++ b/Source/Engine/Serialization/FileReadStream.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Serialization/FileWriteStream.cpp
+++ b/Source/Engine/Serialization/FileWriteStream.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "FileWriteStream.h"
 #include "Engine/Core/Log.h"
--- a/Source/Engine/Serialization/FileWriteStream.h
+++ b/Source/Engine/Serialization/FileWriteStream.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Serialization/ISerializable.h
+++ b/Source/Engine/Serialization/ISerializable.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Serialization/ISerializeModifier.h
+++ b/Source/Engine/Serialization/ISerializeModifier.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Serialization/Json.h
+++ b/Source/Engine/Serialization/Json.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Serialization/JsonCustomSerializers/ExtendedDefaultContractResolver.cs
+++ b/Source/Engine/Serialization/JsonCustomSerializers/ExtendedDefaultContractResolver.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;
 using System.Collections.Generic;
--- a/Source/Engine/Serialization/JsonFwd.h
+++ b/Source/Engine/Serialization/JsonFwd.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Serialization/JsonSerializer.cs
+++ b/Source/Engine/Serialization/JsonSerializer.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;
 using System.Globalization;
--- a/Source/Engine/Serialization/JsonTools.cpp
+++ b/Source/Engine/Serialization/JsonTools.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "JsonTools.h"
 #include "ISerializable.h"
--- a/Source/Engine/Serialization/JsonTools.h
+++ b/Source/Engine/Serialization/JsonTools.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Serialization/JsonWriter.cpp
+++ b/Source/Engine/Serialization/JsonWriter.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "JsonWriter.h"
 #include "Engine/Core/Log.h"
--- a/Source/Engine/Serialization/JsonWriter.h
+++ b/Source/Engine/Serialization/JsonWriter.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Serialization/JsonWriters.h
+++ b/Source/Engine/Serialization/JsonWriters.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Serialization/MemoryReadStream.cpp
+++ b/Source/Engine/Serialization/MemoryReadStream.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "MemoryReadStream.h"

--- a/Source/Engine/Serialization/MemoryReadStream.h
+++ b/Source/Engine/Serialization/MemoryReadStream.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Serialization/MemoryWriteStream.cpp
+++ b/Source/Engine/Serialization/MemoryWriteStream.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "Engine/Platform/Platform.h"
 #include "Engine/Platform/File.h"
--- a/Source/Engine/Serialization/MemoryWriteStream.h
+++ b/Source/Engine/Serialization/MemoryWriteStream.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Serialization/ReadStream.h
+++ b/Source/Engine/Serialization/ReadStream.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Serialization/Serialization.Build.cs
+++ b/Source/Engine/Serialization/Serialization.Build.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using Flax.Build;
 using Flax.Build.NativeCpp;
--- a/Source/Engine/Serialization/Serialization.cpp
+++ b/Source/Engine/Serialization/Serialization.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "Serialization.h"
 #include "Engine/Core/Types/Version.h"
--- a/Source/Engine/Serialization/Serialization.h
+++ b/Source/Engine/Serialization/Serialization.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Serialization/Stream.cpp
+++ b/Source/Engine/Serialization/Stream.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #include "ReadStream.h"
 #include "WriteStream.h"
--- a/Source/Engine/Serialization/Stream.h
+++ b/Source/Engine/Serialization/Stream.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once

--- a/Source/Engine/Serialization/UnmanagedStringReader.cs
+++ b/Source/Engine/Serialization/UnmanagedStringReader.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 using System;
 using System.IO;
--- a/Source/Engine/Serialization/WriteStream.h
+++ b/Source/Engine/Serialization/WriteStream.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2020 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.

 #pragma once