Merge branch 'master' into 1.5

Browse Source

# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GI/GlobalSurfaceAtlas.flax
#	Content/Shaders/TAA.flax
#	Content/Shaders/VolumetricFog.flax
#	Source/Editor/CustomEditors/Editors/ActorTagEditor.cs
#	Source/Engine/Core/Config/GraphicsSettings.cpp
#	Source/Engine/Engine/PostProcessEffect.cs
#	Source/Engine/Graphics/GPUResourcesCollection.cpp
#	Source/Engine/Graphics/GPUResourcesCollection.h
#	Source/Engine/Graphics/PostProcessBase.h
#	Source/FlaxEngine.Gen.cs

...

This commit is contained in:

Wojciech Figat

2023-01-10 15:37:55 +01:00

parent e7f40a4c0e 9626e9bbb6

commit a7e428a21c

2624 changed files with 2659 additions and 2659 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

BIN

Content/Shaders/AtmospherePreCompute.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/BakeLightmap.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/BitonicSort.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/ColorGrading.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/DebugDraw.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/DepthOfField.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/Editor/LightmapUVsDensity.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/Editor/MaterialComplexity.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/Editor/QuadOverdraw.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/Editor/VertexColors.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/EyeAdaptation.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/FXAA.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/Fog.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/Forward.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/GBuffer.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/GPUParticlesSorting.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/GUI.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/GlobalSignDistanceField.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/Histogram.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/Lights.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/MotionBlur.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/MultiScaler.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/PostProcessing.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/ProbesFilter.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/Quad.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/Reflections.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/SMAA.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/SSAO.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/SSR.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/Shadows.flax (Stored with Git LFS)

Binary file not shown.

BIN

Content/Shaders/Sky.flax (Stored with Git LFS)

Binary file not shown.