Merge branch '1.5' into dotnet7

Browse Source

# 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

...

This commit is contained in:

Wojciech Figat

2023-01-10 15:49:44 +01:00

parent 4e4f4e700b a7e428a21c

commit eebc4951de

2631 changed files with 2879 additions and 2756 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Content/Editor/Gizmo/FoliageBrushMaterial.flax

LFS

BIN

Binary file not shown.

Content/Shaders/AtmospherePreCompute.flax

LFS

BIN

Binary file not shown.

Content/Shaders/BakeLightmap.flax

LFS

BIN

Binary file not shown.

Content/Shaders/BitonicSort.flax

LFS

BIN

Binary file not shown.

Content/Shaders/ColorGrading.flax

LFS

BIN

Binary file not shown.

Content/Shaders/DebugDraw.flax

LFS

BIN

Binary file not shown.

Content/Shaders/DepthOfField.flax

LFS

BIN

Binary file not shown.

Content/Shaders/Editor/LightmapUVsDensity.flax

LFS

BIN

Binary file not shown.

Content/Shaders/Editor/MaterialComplexity.flax

LFS

BIN

Binary file not shown.

Content/Shaders/Editor/QuadOverdraw.flax

LFS

BIN

Binary file not shown.

Content/Shaders/Editor/VertexColors.flax

LFS

BIN

Binary file not shown.

Content/Shaders/EyeAdaptation.flax

LFS

BIN

Binary file not shown.

Content/Shaders/FXAA.flax

LFS

BIN

Binary file not shown.

Content/Shaders/Fog.flax

LFS

BIN

Binary file not shown.

Content/Shaders/Forward.flax

LFS

BIN

Binary file not shown.

Content/Shaders/GBuffer.flax

LFS

BIN

Binary file not shown.

Content/Shaders/GI/DDGI.flax

LFS

BIN

Binary file not shown.

Content/Shaders/GI/GlobalSurfaceAtlas.flax

LFS

BIN

Binary file not shown.

Content/Shaders/GPUParticlesSorting.flax

LFS

BIN

Binary file not shown.

Content/Shaders/GUI.flax

LFS

BIN

Binary file not shown.

Content/Shaders/GlobalSignDistanceField.flax

LFS

BIN

Binary file not shown.

Content/Shaders/Histogram.flax

LFS

BIN

Binary file not shown.

Content/Shaders/Lights.flax

LFS

BIN

Binary file not shown.

Content/Shaders/MotionBlur.flax

LFS

BIN

Binary file not shown.

Content/Shaders/MultiScaler.flax

LFS

BIN

Binary file not shown.

Content/Shaders/PostProcessing.flax

LFS

BIN

Binary file not shown.

Content/Shaders/ProbesFilter.flax

LFS

BIN

Binary file not shown.

Content/Shaders/Quad.flax

LFS

BIN

Binary file not shown.

Content/Shaders/Reflections.flax

LFS

BIN

Binary file not shown.

Content/Shaders/SMAA.flax

LFS

BIN

Binary file not shown.

Content/Shaders/SSAO.flax

LFS

BIN

Binary file not shown.

Content/Shaders/SSR.flax

LFS

BIN

Binary file not shown.

Content/Shaders/Shadows.flax

LFS

BIN

Binary file not shown.

Content/Shaders/Sky.flax

LFS

BIN

Binary file not shown.

Content/Shaders/TAA.flax

LFS

BIN

Binary file not shown.

Content/Shaders/VolumetricFog.flax

LFS

BIN

Binary file not shown.