Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
14,006 Commits 15 Branches 23 Tags
b84ccc2cbc18e3f1f6030f73218c8a2192f837e2
Commit Graph

1224 Commits

Author SHA1 Message Date
mafiesto4 775e978fed Merge remote-tracking branch 'origin/master' into 1.13 
# Conflicts:
#	Flax.flaxproj
#	Source/Engine/Level/Actors/StaticModel.cpp
#	Source/Engine/Level/Prefabs/Prefab.cpp
#	Source/Engine/Tools/ModelTool/ModelTool.cpp
 2026-06-03 17:15:38 +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
mafiesto4 fd8ae9bc2b Rename SceneRenderTask::RenderingPercentage to RenderScale 2026-06-03 13:01:11 +02:00
mafiesto4 2531a4b918 Fix asset 'Reload' option to be available when asset failed to load for manual load 2026-06-02 15:51:46 +02:00
mafiesto4 16effd8328 Merge branch 'show-debug-draw-default' of https://github.com/Duroxxigar/FlaxEngine into Duroxxigar-show-debug-draw-default 2026-05-28 09:58:57 +02:00
mafiesto4 d9c787a661 Merge remote-tracking branch 'origin/master' into 1.13 
# Conflicts:
#	Source/Editor/SceneGraph/GUI/ActorTreeNode.cs
#	Source/Engine/Graphics/Graphics.h
#	Source/Engine/Renderer/ShadowsPass.cpp
 2026-05-13 16:03:53 +02:00
mafiesto4 c10cfc8e45 Fix output log history popup management to smoother usage 2026-05-13 10:42:56 +02:00
Jake Young 811bf0d630 Change the default for showing debug draw to be on by default. 2026-05-07 01:56:09 -04:00
mafiesto4 1079791bed Add rendering stats for Data Upload 2026-05-07 00:02:33 +02:00
mafiesto4 864f3a3d42 Fix scene search performance regression 2026-05-04 23:06:02 +02:00
mafiesto4 4c5035e433 Fix scene search performance regression 2026-05-04 23:05:25 +02: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 3c6b448ba9 Merge branch 'add-tree-view-shortcuts' of https://github.com/Tryibion/FlaxEngine into Tryibion-add-tree-view-shortcuts 2026-04-18 23:44:58 +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
Tryibion 6c8c1aed45 Fix context menu. 2026-04-17 16:31:49 -05:00
Tryibion 22964255e4 Add tree view only shortcuts. 2026-04-17 16:13:36 -05: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 095f7277e2 Minor fixes 2026-03-28 15:13:52 +01:00
Tryibion 6c4fc44163 Fix arrow rect issue. 2026-03-27 10:59:06 -05:00
Tryibion a41f2e9260 Merge branch 'master' into add-content-tree-view 2026-03-27 10:48:08 -05: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 5ccc33719e Add basis universal and Web build support for macOS 2026-03-26 10:47:52 +01:00
mafiesto4 3f2e6d82c9 Fix regression from 21e2c830e5 when reimport Animation 
#3937
 2026-03-25 18:44:56 +01:00
mafiesto4 912f5fb4f3 Merge branch 'NoClearSearchboxesWhenStuffHappens' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-NoClearSearchboxesWhenStuffHappens 2026-03-25 15:46:26 +01:00
mafiesto4 707d19284d Merge branch 'FocusSelectedVJControls' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-FocusSelectedVJControls 2026-03-25 14:56:27 +01:00
mafiesto4 f3c957481c Merge remote-tracking branch 'origin/master' into 1.12 
# Conflicts:
#	Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
#	Source/Editor/GUI/Dialogs/ColorSelector.cs
 2026-03-24 23:41:58 +01:00
mafiesto4 90a0cc0e03 Add warning about Web platform being not finished yet 2026-03-23 18:19:53 +01:00
Saas e5d526c9af show whole timeline when animation loads 2026-03-18 16:55:45 +01:00
mafiesto4 80767d65ae Fix camera preview placement in editor preview when resizing window 2026-03-13 23:27:03 +01:00
mafiesto4 1ceb781903 Fix camera preview placement in editor preview when resizing window 2026-03-13 23:21:08 +01:00
mafiesto4 45a8d82a83 Merge remote-tracking branch 'origin/master' into 1.12 
# Conflicts:
#	Content/Shaders/GI/DDGI.flax
#	Content/Shaders/GUI.flax
#	Flax.flaxproj
#	Source/Editor/Windows/AboutDialog.cs
#	Source/Engine/Serialization/Stream.cpp
#	Source/Shaders/GUICommon.hlsl
 2026-03-13 08:09:16 +01:00
mafiesto4 241d37130a Merge branch 'Improve-HighlightedPopUpColor' of https://github.com/ThePhantomMask/FlaxEngine into ThePhantomMask-Improve-HighlightedPopUpColor 2026-03-12 22:54:34 +01:00
Phantom 895758d27d Merge branch 'master' into Improve-HighlightedPopUpColor 2026-03-12 17:34:46 +01:00
mafiesto4 d784fddf95 Code style cleanup for #3944 2026-03-12 17:22:43 +01:00
mafiesto4 fc7abbf541 Merge branch 'flax-msdf-font' of https://github.com/fibref/FlaxEngine into fibref-flax-msdf-font 2026-03-12 16:25:55 +01:00
mafiesto4 e7016564b1 Add Git repository branch name and commit hash injection into generated code module metadata 2026-03-12 14:27:34 +01:00
mafiesto4 3cfa110a48 Merge remote-tracking branch 'origin/master' into 1.12 
# Conflicts:
#	Source/Editor/Options/InterfaceOptions.cs
#	Source/Engine/Audio/OpenAL/AudioBackendOAL.cpp
#	Source/Engine/Graphics/Graphics.cpp
#	Source/Engine/GraphicsDevice/Vulkan/CmdBufferVulkan.cpp
#	Source/Engine/GraphicsDevice/Vulkan/CmdBufferVulkan.h
#	Source/Engine/GraphicsDevice/Vulkan/Config.h
#	Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.cpp
#	Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.h
#	Source/Engine/GraphicsDevice/Vulkan/QueueVulkan.cpp
 2026-03-10 15:08:43 +01:00
Phantom f4c1e81f64 Merge branch 'master' into Improve-HighlightedPopUpColor 2026-03-09 18:56:30 +01:00
mafiesto4 befb74297a Merge branch 'CreateAssetOptions' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-CreateAssetOptions 2026-03-08 22:19:07 +01:00
mafiesto4 28257296b9 Enable Web builds on Linux 2026-03-06 17:57:43 +01:00
mafiesto4 0fa3472f24 Refactor Texture Data function to be reusable 2026-03-06 11:40:43 +01:00