Commit Graph

108 Commits

Author SHA1 Message Date
Wojtek Figat
eab7794e3b Merge remote-tracking branch 'origin/master' into 1.12
# Conflicts:
#	Source/Engine/Content/Storage/FlaxStorage.cpp
#	global.json
2026-03-26 23:44:33 +01:00
Wojtek Figat
32af903a2d Fix crash when exporting terrain that has missing patch data 2026-03-25 22:31:53 +01:00
Wojtek Figat
c12553812c Update Terrain scripting API 2026-03-25 22:31:36 +01:00
Wojtek Figat
f045b5b6b6 Merge remote-tracking branch 'origin/master' into 1.12
# Conflicts:
#	Content/Editor/Camera/M_Camera.flax
#	Content/Editor/CubeTexturePreviewMaterial.flax
#	Content/Editor/DebugMaterials/DDGIDebugProbes.flax
#	Content/Editor/DebugMaterials/SingleColor/Decal.flax
#	Content/Editor/DebugMaterials/SingleColor/Particle.flax
#	Content/Editor/DebugMaterials/SingleColor/Surface.flax
#	Content/Editor/DebugMaterials/SingleColor/SurfaceAdditive.flax
#	Content/Editor/DebugMaterials/SingleColor/Terrain.flax
#	Content/Editor/DefaultFontMaterial.flax
#	Content/Editor/Gizmo/FoliageBrushMaterial.flax
#	Content/Editor/Gizmo/Material.flax
#	Content/Editor/Gizmo/MaterialWire.flax
#	Content/Editor/Gizmo/SelectionOutlineMaterial.flax
#	Content/Editor/Gizmo/VertexColorsPreviewMaterial.flax
#	Content/Editor/Highlight Material.flax
#	Content/Editor/Icons/IconsMaterial.flax
#	Content/Editor/IesProfilePreviewMaterial.flax
#	Content/Editor/MaterialTemplates/Features/ForwardShading.hlsl
#	Content/Editor/Particles/Particle Material Color.flax
#	Content/Editor/Particles/Smoke Material.flax
#	Content/Editor/SpriteMaterial.flax
#	Content/Editor/Terrain/Circle Brush Material.flax
#	Content/Editor/Terrain/Highlight Terrain Material.flax
#	Content/Editor/TexturePreviewMaterial.flax
#	Content/Editor/Wires Debug Material.flax
#	Content/Engine/DefaultDeformableMaterial.flax
#	Content/Engine/DefaultMaterial.flax
#	Content/Engine/DefaultRadialMenu.flax
#	Content/Engine/DefaultTerrainMaterial.flax
#	Content/Engine/SingleColorMaterial.flax
#	Content/Engine/SkyboxMaterial.flax
#	Flax.flaxproj
#	Source/Engine/Graphics/Materials/MaterialShader.h
#	Source/Engine/Graphics/Materials/MaterialShaderFeatures.cpp
#	Source/Engine/Renderer/RenderList.h
#	Source/Shaders/Reflections.shader
#	Source/Shaders/ReflectionsCommon.hlsl
#	Source/Tools/Flax.Build/Bindings/BindingsGenerator.Cpp.cs
2026-02-11 00:20:38 +01:00
Wojtek Figat
9fc9382e58 Refactor navmesh building to support updating all scenes automatically without specifying one
#3744
2026-01-30 13:11:56 +01:00
Wojtek Figat
14d1b7dd24 Fix name collision on new Focused event in control 2026-01-07 23:22:45 +01:00
Wojtek Figat
4805dfbdba Fix issues with model data storage when doing long actions in async (eg. SDF generation) 2025-11-10 15:02:33 +01:00
Wojtek Figat
9cc2c1da40 Fix terrain exporting to properly calculate size and sample positions
#3534
2025-09-30 22:58:08 +02:00
Wojtek Figat
9c3fd052cd Remove copyright year from source files and update to 2025 2025-04-07 19:22:21 +02:00
Wojtek Figat
7e145c56fd Merge remote-tracking branch 'origin/master' into 1.10
# Conflicts:
#	Source/Editor/Windows/Profiler/Memory.cs
2025-03-25 13:37:15 +01:00
Wojtek Figat
a4082934b8 Update Editor UI to use empty Pivot after fa68a5f572
#3031
2025-03-16 23:06:08 +01:00
Wojtek Figat
db4d7d2a05 **Refactor meshes format to support custom vertex layouts and new flexible api to access mesh data**
#3044 #2667
2025-01-06 22:47:19 +01:00
Wojtek Figat
29bfef677f Add PixelFormatSampler utility to quick read/write operations on various data formats
Moved from `TextureTool` to be used in runtime and with more generic use cases (including C# scripting).
2025-01-05 23:49:44 +01:00
Wojtek Figat
78cf1a4948 Use MeshDataCache in vertex painting tool 2025-01-05 16:45:30 +01:00
xxSeys1
c8146a8e99 remove unused TerrainLayerNames 2024-11-16 17:05:44 +01:00
xxSeys1
a0aee15267 add named terrain layers 2024-10-25 15:30:54 +02:00
Wojtek Figat
610cc2cd4f Merge branch 'terrain-mode-visible' of https://github.com/Tryibion/FlaxEngine into Tryibion-terrain-mode-visible 2024-08-15 14:23:07 +02:00
Wojtek Figat
74ce7e89d2 Merge branch 'terrain-gizmo-shift' of https://github.com/Tryibion/FlaxEngine into Tryibion-terrain-gizmo-shift 2024-08-15 14:15:33 +02:00
Chandler Cox
c871613616 Change terrain modes to not be visible if no terrain panel is showing 2024-08-10 10:30:26 -05:00
Chandler Cox
002aac08e8 Add resizing foliage paint gizmo with shift scroll. 2024-08-10 09:31:00 -05:00
Chandler Cox
9d7d66f235 Add check for not having right mouse button down for changing terrain gizmo sizes. 2024-08-10 09:19:34 -05:00
Wojtek Figat
ab5bb79754 Fix regression in collections editing after improving ReadOnly option 2024-05-16 10:34:57 +02:00
Wojtek Figat
525c3a0f29 Fix terrain heightmap to use higher range format when decompressed
#2375
2024-04-15 12:16:50 +02:00
Wojtek Figat
0728637ce1 Fix using confirm via enter key in Create Terrain dialog 2024-04-15 00:17:21 +02:00
Wojtek Figat
9c3c4fbf54 Use uniform scale on new terrain to prevent artifacts in normal vectors 2024-04-15 00:13:54 +02:00
Wojtek Figat
859c420d76 Update year in copyright note 2024-02-26 19:00:48 +01:00
Wojtek Figat
0ee5ef8cf5 Improve terrain paint blending of the existing layer values
#2258
2024-02-26 16:44:55 +01:00
Wojtek Figat
8bcf4fdaf0 Cleanup and improve #2045 2024-02-24 12:53:33 +01:00
Wojtek Figat
de4ee1372f Merge branch 'GizmoSnaping' of https://github.com/NoriteSC/FlaxEngineFork into NoriteSC-GizmoSnaping 2024-02-24 07:57:27 +01:00
Wojtek Figat
ee4fc7c201 Fix cloth editing undo in Prefab viewport
#2136
2024-02-23 19:39:41 +01:00
Wojtek Figat
f8d9817911 Fix terrain paint crash refression 2024-02-19 18:23:14 +01:00
Wojtek Figat
0cf39c9f8d Further improve terrain painting logic #1739r 2024-02-17 11:36:13 +01:00
Wojtek Figat
368dac5e4b Simplify splatmap data management #1739 2024-02-17 11:24:56 +01:00
Wojtek Figat
cc157b172d Merge branch 'terrain-painting' of https://github.com/MineBill/FlaxEngine into MineBill-terrain-painting 2024-02-17 11:13:50 +01:00
Wojtek Figat
9e269b8e58 Merge branch 'terrainscripting' of https://github.com/Withaust/FlaxEngine into Withaust-terrainscripting
# Conflicts:
#	Source/Engine/Terrain/Terrain.h
#	Source/Engine/Terrain/TerrainPatch.h
2024-02-16 23:49:33 +01:00
Wojtek Figat
42b4443e14 Add support for multiple physical materials in terrain - one for each painted layer
#1112 #2159
2024-02-16 17:11:40 +01:00
Wojtek Figat
3958a4740f Add option to enable Depth Test on cloth painting debug preview (enabled by default) 2024-02-14 12:36:04 +01:00
Wojtek Figat
6954a488ea Codestyle fixes 2024-02-06 16:38:44 +01:00
envision3d
045f49d2d6 Fixes terrain smoothing separation issue 2024-01-22 22:25:53 -06:00
NoriteSC
4fb2d3f7f3 sync 2023-12-07 23:55:10 +01:00
Chandler Cox
ab5534da7f Add limits to cloth brush values. 2023-11-13 20:38:04 -06:00
Wojtek Figat
fd4a5595c0 Merge branch 'editor-list-dragging' of https://github.com/MineBill/FlaxEngine into MineBill-editor-list-dragging 2023-11-07 10:21:57 +01:00
Wojtek Figat
c0a8d29453 Improve Cloth usage 2023-11-01 10:46:47 +01:00
MineBill
df5dc0c284 Extract validation/item handling of AssetPicker in a separate class. 2023-10-31 16:32:57 +02:00
MineBill
cf5f501ab7 Allow erasing layers/painting over layers from the other splatmap.
Since Layers are hardcoded to 8, this commit also assumes that there will always be 2 splatmaps.
2023-10-24 14:31:54 +03:00
MineBill
6fb411cee3 Fix terrain painting. 2023-10-19 01:05:34 +03:00
Ruan Lucas
e97ec74bf8 clean code 2023-10-11 18:37:04 -04:00
Ruan Lucas
7fcb0a1da7 change terrain brush size with scroll 2023-10-10 10:46:47 -04:00
Wojtek Figat
09f2be907e Merge remote-tracking branch 'origin/master' into 1.7
# Conflicts:
#	Flax.flaxproj
2023-10-09 12:40:47 +02:00
Wojtek Figat
552641c51a Fix potential crashes if uses calls terrain tools with invalid params 2023-10-08 17:02:26 +02:00