Merge remote-tracking branch 'origin/master'

# Conflicts: # Source/Engine/Physics/Physics.Queries.cpp # Source/Engine/Physics/Utilities.h
2022-01-20 23:29:59 +01:00
parent a400568b51 f4f9d92c8e
commit 37e11a4b1f
2574 changed files with 5082 additions and 3221 deletions
--- a/Source/Engine/ContentImporters/AssetsImportingManager.cpp
+++ b/Source/Engine/ContentImporters/AssetsImportingManager.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.

 #if COMPILE_WITH_ASSETS_IMPORTER

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

 #pragma once

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

 using System.Collections.Generic;
 using Flax.Build;
--- a/Source/Engine/ContentImporters/CreateAnimationGraph.cpp
+++ b/Source/Engine/ContentImporters/CreateAnimationGraph.cpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2021 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2022 Wojciech Figat. All rights reserved.

 #include "CreateAnimationGraph.h"

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

 #pragma once

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

 #pragma once

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

 #include "CreateCollisionData.h"

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

 #pragma once

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

 #include "CreateJson.h"

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

 #pragma once

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

 #include "CreateMaterial.h"

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

 #pragma once

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

 #pragma once

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

 #pragma once

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

 #pragma once

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

 #pragma once

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

 #pragma once

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

 #pragma once

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

 #pragma once

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

 #pragma once

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

 #pragma once

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

 #include "ImportAudio.h"

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

 #pragma once

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

 #include "ImportFont.h"

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

 #pragma once

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

 #if COMPILE_WITH_ASSETS_IMPORTER

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

 #pragma once

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

 #pragma once

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

 #include "ImportModel.h"

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

 #pragma once

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

 #include "ImportShader.h"

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

 #pragma once

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

 #include "ImportTexture.h"

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

 #pragma once

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

 #pragma once