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

# Conflicts:
#	Flax.flaxproj

Content/Editor/MaterialTemplates/Features/DeferredShading.hlsl

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 @0// Deferred Shading: Defines
 @1// Deferred Shading: Includes

Content/Editor/MaterialTemplates/Features/Distortion.hlsl

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 @0// Distortion: Defines
 @1// Distortion: Includes

Content/Editor/MaterialTemplates/Features/ForwardShading.hlsl

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 @0// Forward Shading: Defines
 #define MAX_LOCAL_LIGHTS 4

Content/Editor/MaterialTemplates/Features/GlobalIllumination.hlsl

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 @0// Global Illumination: Defines
 #define USE_GI 1

Content/Editor/MaterialTemplates/Features/Lightmap.hlsl

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 @0// Lightmap: Defines
 #define CAN_USE_LIGHTMAP 1

Content/Editor/MaterialTemplates/Features/MotionVectors.hlsl

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 @0// Motion Vectors: Defines
 @1// Motion Vectors: Includes

Content/Editor/MaterialTemplates/Features/Tessellation.hlsl

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 @0// Tessellation: Defines
 #define TessalationProjectOntoPlane(planeNormal, planePosition, pointToProject) pointToProject - dot(pointToProject - planePosition, planeNormal) * planeNormal

Development/Scripts/Linux/CallBuildTool.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 set -e
 

Development/Scripts/Mac/CallBuildTool.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved
+# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved
 
 set -e
 

Development/Scripts/Mac/XCodeBuild.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved
+# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved
 
 # Fix mono bin to be in a path
 #export PATH=/Library/Frameworks/Mono.framework/Versions/Current/Commands:$PATH

Development/Scripts/Windows/CallBuildTool.bat

@@ -1,6 +1,6 @@
 @echo off
 
-rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 if not exist "Development\Scripts\Windows\GetMSBuildPath.bat" goto Error_InvalidLocation
 

Development/Scripts/Windows/GetMSBuildPath.bat

@@ -1,6 +1,6 @@
 @echo off
 
-rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 set MSBUILD_PATH=
 

Flax.flaxproj

@@ -4,10 +4,10 @@
     "Major": 1,
     "Minor": 8,
     "Revision": 0,
-    "Build": 6504
+    "Build": 65045
   },
   "Company": "Flax",
-  "Copyright": "Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.",
+  "Copyright": "Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.",
   "GameTarget": "FlaxGame",
   "EditorTarget": "FlaxEditor",
   "Configuration": {

GenerateProjectFiles.bat

@@ -1,5 +1,5 @@
 @echo off
-:: Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+:: Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 setlocal
 pushd

GenerateProjectFiles.command

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 set -e
 

GenerateProjectFiles.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 set -e
 

PackageAll.bat

@@ -1,6 +1,6 @@
 @echo off
 
-rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 setlocal
 pushd

PackageEditor.bat

@@ -1,6 +1,6 @@
 @echo off
 
-rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 setlocal
 pushd

PackageEditor.command

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 set -e
 

PackageEditor.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 set -e
 

PackagePlatforms.bat

@@ -1,6 +1,6 @@
 @echo off
 
-rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 setlocal
 pushd

PackagePlatforms.command

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 set -e
 

PackagePlatforms.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+# Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 set -e
 

RegisterEngineLocation.bat

@@ -1,6 +1,6 @@
 @echo off
 
-rem Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+rem Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 setlocal
 pushd %~dp0

Source/Editor/Analytics/EditorAnalytics.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 #include "EditorAnalytics.h"
 #include "Editor/Editor.h"

Source/Editor/Analytics/EditorAnalytics.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 #pragma once
 

Source/Editor/Content/AssetItemConverter.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using Newtonsoft.Json;

Source/Editor/Content/Create/CreateFileEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 namespace FlaxEditor.Content.Create
 {

Source/Editor/Content/Create/CreateFilesDialog.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Create/ParticleEmitterCreateEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using System.IO;

Source/Editor/Content/Create/SettingsCreateEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Create/VisualScriptCreateEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEngine;

Source/Editor/Content/GUI/ContentNavigation.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using FlaxEditor.GUI;
 using FlaxEditor.GUI.ContextMenu;

Source/Editor/Content/GUI/ContentView.DragDrop.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using FlaxEditor.GUI.Drag;
 using FlaxEditor.SceneGraph;

Source/Editor/Content/GUI/ContentView.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/IFileEntryAction.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Import/AssetImportEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 namespace FlaxEditor.Content.Import
 {

Source/Editor/Content/Import/AudioImportSettings.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System.Collections.Generic;
 using FlaxEditor.CustomEditors.Editors;

Source/Editor/Content/Import/FolderImportEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System.IO;
 

Source/Editor/Content/Import/ImportFileEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System.Collections.Generic;
 using System.IO;

Source/Editor/Content/Import/ImportFilesDialog.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Import/ModelImportEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System.Collections.Generic;
 using FlaxEditor.CustomEditors.Editors;

Source/Editor/Content/Import/Request.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Import/TextureImportEntry.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System.Collections.Generic;
 using System.ComponentModel;

Source/Editor/Content/Items/AssetItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEngine;

Source/Editor/Content/Items/BinaryAssetItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Text;

Source/Editor/Content/Items/CSharpScriptItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Items/ContentFolder.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Items/ContentItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/Items/CppScriptItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Items/FileItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Items/JsonAssetItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEngine;

Source/Editor/Content/Items/NewItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System.Text;
 using FlaxEngine;

Source/Editor/Content/Items/PrefabItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEngine;

Source/Editor/Content/Items/SceneItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEngine;

Source/Editor/Content/Items/ScriptItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System.Text;
 

Source/Editor/Content/Items/ShaderSourceItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/Items/VisualScriptItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using System.Collections.Generic;

Source/Editor/Content/PreviewsCache.cpp

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 #include "PreviewsCache.h"
 #include "Engine/Core/Log.h"

Source/Editor/Content/PreviewsCache.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using FlaxEngine;
 

Source/Editor/Content/PreviewsCache.h

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 #pragma once
 

Source/Editor/Content/Proxy/AnimationGraphFunctionProxy.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEditor.Windows;

Source/Editor/Content/Proxy/AnimationGraphProxy.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEditor.Windows;

Source/Editor/Content/Proxy/AnimationProxy.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using System.IO;

Source/Editor/Content/Proxy/AssetProxy.cs

@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2023 Wojciech Figat. All rights reserved.
+// Copyright (c) 2012-2024 Wojciech Figat. All rights reserved.
 
 using System;
 using FlaxEditor.Content.Thumbnails;