Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
14,697 Commits 16 Branches 23 Tags
master
Commit Graph
463 Commits
Author SHA1 Message Date
mafiesto4 6831a0ce5f Merge remote-tracking branch 'origin/master' into 1.13 
# Conflicts:
#	Content/Shaders/GUI.flax
 2026-10-06 20:16:29 +02:00
mafiesto4 944e99637d Add 'GPUBuffer' parameter type to materials and particles 2026-10-06 15:24:05 +02:00
mafiesto4 cced40a87d Add utility UI Control spawn menu inside scene/prefab context-menu 2026-10-06 13:43:10 +02:00
mafiesto4 d21227e5c1 Refactor actors spawning context menu to share code between scene and prefab editors 2026-10-06 13:22:39 +02:00
mafiesto4 0380997bcd Merge remote-tracking branch 'origin/master' into 1.13 
# Conflicts:
#	.github/actions/vulkan/action.yml
#	Source/Editor/GUI/PlatformSelector.cs
#	Source/Editor/Windows/GameCookerWindow.cs
 2026-10-01 23:17:07 +02:00
mafiesto4 07046a94c1 Revert "Merge branch 'GoaLitiuM-asset_window_reload_fix'" 
Caused regression on various windows being misplaces after hot-reload  (eg. BT editor).

This reverts commit 470a2220ee, reversing
changes made to 4d6fe760c1.

# Conflicts:
#	Source/Editor/GUI/Docking/FloatWindowDockPanel.cs
 2026-09-23 22:36:23 +02:00
mafiesto4 b1507cc366 Merge remote-tracking branch 'origin/master' into 1.13 
# Conflicts:
#	Source/Editor/GUI/CurveEditor.Contents.cs
 2026-09-20 23:58:32 +02:00
mafiesto4 6a4a1a223c Merge branch 'dev/AnimationTimelinesWindowImprovements' of https://github.com/ifromstone/FlaxEngine into ifromstone-dev/AnimationTimelinesWindowImprovements 2026-09-20 22:24:57 +02:00
mafiesto4 2a0589b4c1 Add context menu option to show asset in Content window quickly 2026-09-19 23:26:35 +02:00
mafiesto4 451985612b Various tweaks to #4218 2026-09-19 20:05:36 +02:00
mafiesto4 a05c803c51 Merge branch 'msdf-stage2' of https://github.com/fibref/FlaxEngine into fibref-msdf-stage2 2026-09-19 19:49:29 +02:00
mafiesto4 dae5b416ca Minor tweaks #4130 2026-09-18 13:08:16 +02:00
mafiesto4 40ec48c29e Merge branch 'dev/DiscardingUnsavedAssetChanges' of https://github.com/ifromstone/FlaxEngine into ifromstone-dev/DiscardingUnsavedAssetChanges 2026-09-18 13:00:57 +02:00
mafiesto4 d8a7382c8d Merge remote-tracking branch 'origin/master' into 1.13 
# Conflicts:
#	Source/Engine/GraphicsDevice/Vulkan/GPUSwapChainVulkan.cpp
#	Source/Engine/Renderer/Utils/GlobalSignDistanceFieldPass.cpp
#	Source/Engine/Scripting/Internal/InternalCalls.h
#	Source/Engine/Scripting/Internal/ManagedDictionary.cpp
#	Source/Engine/Scripting/Internal/ManagedDictionary.h
#	Source/Engine/Scripting/ScriptingObject.cpp
#	Source/Tools/Flax.Build/Bindings/BindingsGenerator.CSharp.cs
 2026-09-16 12:38:27 +02:00
mafiesto4 d04d48490a Rename EditorViewport.HasLoadedAssets to HasContentLoaded and fix it for prefab auto-fit 
Ref #4137
 2026-09-15 13:39:06 +02:00
mafiesto4 bd5edcc4d2 Fix minor Editor UI issues 2026-09-15 12:55:13 +02:00
mafiesto4 e669e9ca65 Fix old api usage for #4185 2026-09-14 08:30:51 +02:00
mafiesto4 efaff8338f Merge branch 'ShowWholeThing' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-ShowWholeThing 
# Conflicts:
#	Source/Editor/Surface/SurfaceUtils.cs
 2026-09-09 08:07:31 +02:00
mafiesto4 313f0e5478 Merge remote-tracking branch 'origin/master' into 1.13 
# Conflicts:
#	Content/Shaders/Editor/Grid.flax
#	Content/Shaders/GBuffer.flax
#	Content/Shaders/GlobalSignDistanceField.flax
#	Content/Shaders/ProbesFilter.flax
#	Content/Shaders/SSR.flax
#	Content/Shaders/VolumetricFog.flax
#	Development/Documentation/mono.md
#	Source/Editor/Modules/ContentDatabaseModule.cs
 2026-08-30 22:23:31 +02:00
Ari Vuollet 373ce6b212 Keep asset windows alive during scripts reload 
Recreated asset editor windows are now reattached to the native window
after scripts reload to keep the current state and Z-order of the
windows untouched on platforms where window state can't be changed
without user interaction (Wayland).
 2026-08-18 01:10:14 +03:00
fibref c41c5ad561 add MSDFSize slider limit 2026-08-15 18:15:44 +08:00
fibref cf05034d7a fix Font and FontAsset cache not completely refreshed when options change 2026-08-14 21:02:03 +08:00
fibref 74327aa8cd add MSDFsize to FontAsset 2026-08-08 16:12:37 +08:00
mafiesto4 3aed901834 Simplify code around assets editing and selecting in Editor 2026-07-22 11:53:22 +02:00
mafiesto4 d0ab5c961e Merge remote-tracking branch 'origin/master' into 1.13 
# Conflicts:
#	Flax.flaxproj
 2026-07-21 17:18:33 +02:00
mafiesto4 f9990f2712 Merge branch 'auto-rename-new-param' of https://github.com/TyGrze/FlaxEngine into TyGrze-auto-rename-new-param 2026-07-13 17:58:47 +02:00
Tryibion 9f5811a90b Add search to json assets and edito options 2026-07-03 20:51:53 -05:00
Tryibion 6ba406953b Add initial properties search to properties wndow and prefab properties panel. 2026-07-03 15:54:03 -05:00
mafiesto4 1915aa3c06 Merge remote-tracking branch 'origin/master' into 1.13 
# Conflicts:
#	Content/Shaders/DepthOfField.flax
#	Source/Engine/Content/Asset.cpp
 2026-06-30 10:06:55 +02:00
Tyler Gregorcyk efd71e9bce Add auto-rename newly added Visject parameters 
Closes #4127

Signed-off-by: Tyler Gregorcyk <tyler@gregorcyk.com>
 2026-06-25 23:25:45 -05:00
Andrei Gagua 752dc644e5 Improve Animation Scene curve keyframe editing 
Improves Animation Scene timeline curve editing, including vector keyframe selection/editing, tangent interaction, draggable edit popup, and several related editor UI fixes.
 2026-06-12 16:26:35 +03:00
mafiesto4 057e5684e9 Add Texture and Cube Texture support to Gameplay Globals 2026-06-09 13:49:00 +02:00
mafiesto4 c18178e045 Add improvements to Gameplay Globals editing 
#3972
 2026-06-09 10:42:10 +02:00
mafiesto4 e450658834 Remove deprecated mono runtime backend 
Old `mono` backend was not maintained for since 1.7 (July 2023)
`dotnet` backend still can run `mono` on AOT platforms but with the latest .NET features.
 2026-06-03 16:35:06 +02:00
Andrei Gagua 3ba1f5192f Fix discarding unsaved asset editor changes 
- clear cached JsonAsset managed instances on discard,
- restore MaterialInstance parameter values and override flags,
- reload model assets from disk when model edits are discarded.
 2026-05-30 23:54:52 +03:00
mafiesto4 b1c76ec7f9 Merge remote-tracking branch 'origin/1.12' into 1.13 2026-04-25 10:31:41 +02:00
mafiesto4 e6c0836b09 Revert "Fix Blend Mode on Terrain materials to be unenviable due to not implemented" 
This reverts commit 641f70d4ac.

Transparent material on terrain is used by terrain brushes and terrain highlight tools in editor.
 2026-04-25 10:31:21 +02:00
mafiesto4 db2130f340 Add No parameters text to material instance panel with base material that doesn't have parameters 2026-04-24 23:49:40 +02:00
mafiesto4 c130928e7a Fix skinned model retarget source asset filter to work after AssetPicker refactor with new validator 2026-04-22 10:19:28 +02:00
mafiesto4 641f70d4ac Fix Blend Mode on Terrain materials to be unenviable due to not implemented 
#4056
 2026-04-18 23:44:21 +02:00
mafiesto4 cf65c442de Add AutoAttachDebugPreviewActor for Behavior Tree editor 2026-04-17 18:51:50 +02:00
mafiesto4 c1de97b77b Add drawing particle debug in system editor window 2026-04-17 12:00:18 +02:00
mafiesto4 0754ea85a9 Fix material slot comboboxes update when editing model material slots 2026-04-17 08:55:41 +02:00
mafiesto4 1d3d20e6c5 Add option to disable shadows on transparent material 2026-04-09 14:47:39 +02:00
mafiesto4 b3ceda5a6e Revert 10c8454e8f to use more common paste logic in scene tree 
(duplicate can paste at the same tree level, paste puts new object into the selection by default)
 2026-04-08 22:19:21 +02:00
mafiesto4 2fc95bdf57 Merge remote-tracking branch 'origin/master' into 1.12 
# Conflicts:
#	Content/Editor/MaterialTemplates/Deformable.shader
#	Flax.flaxproj
#	Source/Engine/Content/Content.h
#	Source/Engine/Serialization/JsonTools.cpp
 2026-04-01 17:14:21 +02:00
mafiesto4 243173df3c Fix pasted ghost prefab objects when paste target is not defined 
#3945
 2026-03-30 10:14:50 +02:00
mafiesto4 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
mafiesto4 3f2e6d82c9 Fix regression from 21e2c830e5 when reimport Animation 
#3937
 2026-03-25 18:44:56 +01:00
mafiesto4 707d19284d Merge branch 'FocusSelectedVJControls' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-FocusSelectedVJControls 2026-03-25 14:56:27 +01:00