Merge branch '1.5' into dotnet7

# Conflicts: # Source/Platforms/DotNet/NUnit/agents/net40/nunit-agent.exe # Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.api.dll # Source/Platforms/DotNet/NUnit/agents/net40/nunit.engine.core.dll # Source/Platforms/DotNet/NUnit/agents/net7.0/nunit.agent.addins # Source/Platforms/DotNet/NUnit/nunit.engine.api.dll # Source/Platforms/DotNet/NUnit/nunit.engine.core.dll # Source/Platforms/DotNet/NUnit/nunit.engine.dll # Source/Platforms/DotNet/NUnit/nunit3-console.exe # Source/Platforms/DotNet/NUnit/nunit3-console.exe.config # Source/Platforms/DotNet/NUnit/testcentric.engine.metadata.dll # Source/Tools/Flax.Build/Deps/Downloader.cs # Source/Tools/Flax.Stats/CodeFrame.cs # Source/Tools/Flax.Stats/CodeFrameNode.cs # Source/Tools/Flax.Stats/Flax.Stats.Build.cs # Source/Tools/Flax.Stats/Languages.cs # Source/Tools/Flax.Stats/Program.cs # Source/Tools/Flax.Stats/TaskType.cs # Source/Tools/Flax.Stats/Tools.cs # Source/Tools/FlaxEngine.Tests/TestEditorUtils.cs
2023-01-10 15:49:44 +01:00
parent 4e4f4e700b a7e428a21c
commit eebc4951de
2631 changed files with 2879 additions and 2756 deletions
--- a/Content/Editor/Gizmo/FoliageBrushMaterial.flax
+++ b/Content/Editor/Gizmo/FoliageBrushMaterial.flax
--- a/Content/Shaders/AtmospherePreCompute.flax
+++ b/Content/Shaders/AtmospherePreCompute.flax
--- a/Content/Shaders/BakeLightmap.flax
+++ b/Content/Shaders/BakeLightmap.flax
--- a/Content/Shaders/BitonicSort.flax
+++ b/Content/Shaders/BitonicSort.flax
--- a/Content/Shaders/ColorGrading.flax
+++ b/Content/Shaders/ColorGrading.flax
--- a/Content/Shaders/DebugDraw.flax
+++ b/Content/Shaders/DebugDraw.flax
--- a/Content/Shaders/DepthOfField.flax
+++ b/Content/Shaders/DepthOfField.flax
--- a/Content/Shaders/Editor/LightmapUVsDensity.flax
+++ b/Content/Shaders/Editor/LightmapUVsDensity.flax
--- a/Content/Shaders/Editor/MaterialComplexity.flax
+++ b/Content/Shaders/Editor/MaterialComplexity.flax
--- a/Content/Shaders/Editor/QuadOverdraw.flax
+++ b/Content/Shaders/Editor/QuadOverdraw.flax
--- a/Content/Shaders/Editor/VertexColors.flax
+++ b/Content/Shaders/Editor/VertexColors.flax
--- a/Content/Shaders/EyeAdaptation.flax
+++ b/Content/Shaders/EyeAdaptation.flax
--- a/Content/Shaders/FXAA.flax
+++ b/Content/Shaders/FXAA.flax
--- a/Content/Shaders/Fog.flax
+++ b/Content/Shaders/Fog.flax
--- a/Content/Shaders/Forward.flax
+++ b/Content/Shaders/Forward.flax
--- a/Content/Shaders/GBuffer.flax
+++ b/Content/Shaders/GBuffer.flax
--- a/Content/Shaders/GI/DDGI.flax
+++ b/Content/Shaders/GI/DDGI.flax
--- a/Content/Shaders/GI/GlobalSurfaceAtlas.flax
+++ b/Content/Shaders/GI/GlobalSurfaceAtlas.flax
--- a/Content/Shaders/GPUParticlesSorting.flax
+++ b/Content/Shaders/GPUParticlesSorting.flax
--- a/Content/Shaders/GUI.flax
+++ b/Content/Shaders/GUI.flax
--- a/Content/Shaders/GlobalSignDistanceField.flax
+++ b/Content/Shaders/GlobalSignDistanceField.flax
--- a/Content/Shaders/Histogram.flax
+++ b/Content/Shaders/Histogram.flax
--- a/Content/Shaders/Lights.flax
+++ b/Content/Shaders/Lights.flax
--- a/Content/Shaders/MotionBlur.flax
+++ b/Content/Shaders/MotionBlur.flax
--- a/Content/Shaders/MultiScaler.flax
+++ b/Content/Shaders/MultiScaler.flax
--- a/Content/Shaders/PostProcessing.flax
+++ b/Content/Shaders/PostProcessing.flax
--- a/Content/Shaders/ProbesFilter.flax
+++ b/Content/Shaders/ProbesFilter.flax
--- a/Content/Shaders/Quad.flax
+++ b/Content/Shaders/Quad.flax
--- a/Content/Shaders/Reflections.flax
+++ b/Content/Shaders/Reflections.flax
--- a/Content/Shaders/SMAA.flax
+++ b/Content/Shaders/SMAA.flax
--- a/Content/Shaders/SSAO.flax
+++ b/Content/Shaders/SSAO.flax
--- a/Content/Shaders/SSR.flax
+++ b/Content/Shaders/SSR.flax
--- a/Content/Shaders/Shadows.flax
+++ b/Content/Shaders/Shadows.flax
--- a/Content/Shaders/Sky.flax
+++ b/Content/Shaders/Sky.flax
--- a/Content/Shaders/TAA.flax
+++ b/Content/Shaders/TAA.flax
--- a/Content/Shaders/VolumetricFog.flax
+++ b/Content/Shaders/VolumetricFog.flax