Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
13,656 Commits 15 Branches 23 Tags
9bb7733b33fa45613edd76249379cb682e13adb2
Commit Graph

1202 Commits

Author SHA1 Message Date
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
mafiesto4 94789712e8 Add basis_universal support for textures on Web 
Add implementation for loading interchange texture formats with multiple runtime formats support
 2026-03-06 11:09:29 +01:00
Tryibion 24a11ac2a8 Add tree view mode for content window. 2026-02-28 12:38:07 -06:00
mafiesto4 6e7a7c9350 Fix Screen.CursorLock in Editor to skip when viewport is unfocused 2026-02-17 11:46:20 +01:00
fibref c9fbafe014 Merge branch 'FlaxEngine:master' into flax-msdf-font 2026-02-16 22:48:19 +08:00
fibref 75a1b14beb initial support for MSDF font 2026-02-14 22:12:26 +08:00
mafiesto4 f12ad5c874 Add **Web platform with Emscripten** 2026-02-14 00:07:21 +01:00
mafiesto4 ee22b9dc25 Merge branch 'sdl_platform' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-sdl_platform 
# Conflicts:
#	Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
#	Source/Editor/Modules/UIModule.cs
 2026-02-11 14:08:57 +01:00
mafiesto4 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
Ari Vuollet 0084bc051c Merge branch 'master' into sdl_platform 2026-02-10 23:05:19 +02:00
Phantom 07b6d3558a Merge branch 'master' into Improve-HighlightedPopUpColor 2026-02-10 17:09:22 +01:00
Saas eac9f67bc1 Merge remote-tracking branch 'upstream/master' into FocusSelectedVJControls 2026-02-09 15:52:27 +01:00
mafiesto4 4a7f1a5fde Fix various issues 2026-02-06 10:37:52 +01:00
mafiesto4 5d0fdc8313 Add info about skinned model skeleton size 2026-02-06 09:28:06 +01:00
Phantom 83c15c05bb Merge branch 'master' into Improve-HighlightedPopUpColor 2026-02-03 23:06:53 +01:00
Ari Vuollet f870fc3ae2 Merge remote-tracking branch 'origin/master' into sdl_platform 
# Conflicts:
#	Source/Editor/Viewport/MainEditorGizmoViewport.cs
 2026-02-03 17:39:43 +02:00
mafiesto4 21e2c830e5 Refactor Animation editor to use cloned asset for live preview of nested animations editing 
#3773
 2026-02-03 16:32:22 +01:00
mafiesto4 f725f4c0b9 Add saving viewport icons scale (global) within Editor window layout 
#3820
 2026-02-03 13:24:13 +01:00
mafiesto4 610c76578b Merge remote-tracking branch 'origin/master' into 1.12 
# Conflicts:
#	Flax.flaxproj
 2026-01-13 14:29:44 +01:00
Phantom ec0877004c Merge branch 'master' into Improve-HighlightedPopUpColor 2026-01-12 22:56:49 +01:00
mafiesto4 a18ca9a4ad Merge branch 'DirtyEditorSettingsStar' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-DirtyEditorSettingsStar 2026-01-12 21:30:00 +01:00
mafiesto4 14d1b7dd24 Fix name collision on new Focused event in control 2026-01-07 23:22:45 +01:00
mafiesto4 b2f2537338 Update version and year 2026-01-07 23:17:40 +01:00