Wojtek Figat 9daddccbed Merge remote-tracking branch 'origin/master' into 1.9 ...

# Conflicts:
#	Source/Editor/Modules/ContentDatabaseModule.cs
#	Source/Editor/Surface/SurfaceUtils.cs
#	Source/Editor/Windows/Assets/MaterialInstanceWindow.cs
#	Source/Engine/Foliage/Foliage.cpp
#	Source/Engine/Graphics/Models/MeshBase.h
#	Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Textures.cpp

2024-09-12 13:38:20 +02:00

..

Camera

Update after merge with master

2024-08-05 20:33:46 +02:00

DebugMaterials

Update after merge with master

2024-08-05 20:33:46 +02:00

Fonts

Cleanup stuff in #2019

2024-02-18 19:48:43 +01:00

Gizmo

Update after merge with master

2024-08-05 20:33:46 +02:00

Icons

Update after merge with master

2024-08-05 20:33:46 +02:00

MaterialTemplates

Fix regressions after rendering changes

2024-08-23 00:26:42 +02:00

Particles

Update after merge with master

2024-08-05 20:33:46 +02:00

Primitives

Rebake default Cube sdf with res scale 2

2024-06-02 23:02:43 +02:00

Scripting

Fix mixed tab/spaces in script templates

2024-09-09 07:34:45 +02:00

Terrain

Update after merge with master

2024-08-05 20:33:46 +02:00

CubeTexturePreviewMaterial.flax

Update after merge with master

2024-08-05 20:33:46 +02:00

DefaultFontMaterial.flax

Update after merge with master

2024-08-05 20:33:46 +02:00

EditorIcon.flax

You're breathtaking!

2020-12-07 23:40:54 +01:00

Highlight Material.flax

Update after merge with master

2024-08-05 20:33:46 +02:00

IconsAtlas.flax

Add new spline icons #1292

2023-09-12 22:18:26 +02:00

IesProfilePreviewMaterial.flax

Update after merge with master

2024-08-05 20:33:46 +02:00

LayoutDefault.xml

You're breathtaking!

2020-12-07 23:40:54 +01:00

SimplySky.flax

You're breathtaking!

2020-12-07 23:40:54 +01:00

SpriteMaterial.flax

Update after merge with master

2024-08-05 20:33:46 +02:00

TexturePreviewMaterial.flax

Update after merge with master

2024-08-05 20:33:46 +02:00

VisjectSurface.flax

You're breathtaking!

2020-12-07 23:40:54 +01:00

Wires Debug Material.flax

Update after merge with master

2024-08-05 20:33:46 +02:00