Wojtek Figat addc6d5216 Merge remote-tracking branch 'origin/master' into 1.10 ...

# Conflicts:
#	Content/Editor/Gizmo/Material.flax
#	Content/Engine/DefaultTerrainMaterial.flax
#	Source/Editor/Windows/Assets/ModelWindow.cs
#	Source/Editor/Windows/Assets/SkinnedModelWindow.cs
#	Source/Engine/Core/Types/Variant.cpp

2025-01-13 18:07:54 +01:00

..

Camera

Update engine assets

2025-01-12 01:33:18 +01:00

DebugMaterials

Update engine assets

2025-01-12 01:33:18 +01:00

Fonts

Cleanup stuff in #2019

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

Gizmo

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

2025-01-13 18:07:54 +01:00

Icons

Update engine assets

2025-01-12 01:33:18 +01:00

MaterialTemplates

Add support for up to 4 texture channels when importing meshes

2025-01-11 22:40:20 +01:00

Particles

Update engine assets

2025-01-12 01:33:18 +01:00

Primitives

Reseve engine materials and models

2025-01-06 22:47:44 +01:00

Scripting

Add game plugin template.

2024-12-20 09:29:36 -06:00

Terrain

Reseve engine materials and models

2025-01-06 22:47:44 +01:00

CubeTexturePreviewMaterial.flax

Reseve engine materials and models

2025-01-06 22:47:44 +01:00

DefaultFontMaterial.flax

Update engine assets

2025-01-12 01:33:18 +01:00

EditorIcon.flax

You're breathtaking!

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

Highlight Material.flax

Update engine assets

2025-01-12 01:33:18 +01:00

IconsAtlas.flax

Add new spline icons #1292

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

IesProfilePreviewMaterial.flax

Reseve engine materials and models

2025-01-06 22:47:44 +01: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

Reseve engine materials and models

2025-01-06 22:47:44 +01:00

TexturePreviewMaterial.flax

Reseve engine materials and models

2025-01-06 22:47:44 +01:00

VisjectSurface.flax

You're breathtaking!

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

Wires Debug Material.flax

Update assets

2025-01-12 20:31:00 +01:00