Wojtek Figat
1ceb781903
Fix camera preview placement in editor preview when resizing window
2026-03-13 23:21:08 +01:00
Wojtek Figat
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
Wojtek Figat
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
Wojtek Figat
d784fddf95
Code style cleanup for #3944
2026-03-12 17:22:43 +01:00
Wojtek Figat
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
Wojtek Figat
e7016564b1
Add Git repository branch name and commit hash injection into generated code module metadata
2026-03-12 14:27:34 +01:00
Wojtek Figat
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
Wojtek Figat
befb74297a
Merge branch 'CreateAssetOptions' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-CreateAssetOptions
2026-03-08 22:19:07 +01:00
Wojtek Figat
28257296b9
Enable Web builds on Linux
2026-03-06 17:57:43 +01:00
Wojtek Figat
0fa3472f24
Refactor Texture Data function to be reusable
2026-03-06 11:40:43 +01:00
Wojtek Figat
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
Wojtek Figat
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
Wojtek Figat
f12ad5c874
Add **Web platform with Emscripten**
2026-02-14 00:07:21 +01:00
Wojtek Figat
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
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
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
Wojtek Figat
4a7f1a5fde
Fix various issues
2026-02-06 10:37:52 +01:00
Wojtek Figat
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
f870fc3ae2
Merge remote-tracking branch 'origin/master' into sdl_platform
...
# Conflicts:
# Source/Editor/Viewport/MainEditorGizmoViewport.cs
2026-02-03 17:39:43 +02:00
Wojtek Figat
21e2c830e5
Refactor Animation editor to use cloned asset for live preview of nested animations editing
...
#3773
2026-02-03 16:32:22 +01:00
Wojtek Figat
f725f4c0b9
Add saving viewport icons scale (global) within Editor window layout
...
#3820
2026-02-03 13:24:13 +01:00
Wojtek Figat
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
Wojtek Figat
a18ca9a4ad
Merge branch 'DirtyEditorSettingsStar' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-DirtyEditorSettingsStar
2026-01-12 21:30:00 +01:00
Wojtek Figat
14d1b7dd24
Fix name collision on new Focused event in control
2026-01-07 23:22:45 +01:00
Wojtek Figat
b2f2537338
Update version and year
2026-01-07 23:17:40 +01:00
Phantom
7f2f73afd8
Added Luminance property and updated authors
...
-Added public Luminance property in Color.cs to calculate colour brightness.
-Refactored Dropdown.cs to use Luminance instead of manual calculation.
-Updated author list in AboutDialog.cs by adding ‘Michael Salvini’.
2025-12-15 00:48:42 +01:00
0ac3ab2329
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-11-19 18:30:08 +02:00
Wojtek Figat
dfb1fb91a5
Fix ability to override material instance hidden parameters
...
#3802
2025-11-18 21:29:51 +01:00
Wojtek Figat
91ee9f5e05
Refactor Mesh SDF generation on GPU to use raytracing for more precise results
2025-11-13 22:05:23 +01:00
466f9a4797
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-11-11 21:40:06 +02:00
Wojtek Figat
c7997e0c2f
Fix potential error on missing reference object
2025-11-10 21:50:11 +01:00
Wojtek Figat
97ae13759e
Merge remote-tracking branch 'origin/master'
2025-11-09 23:22:37 +01:00
Wojtek Figat
35acc668c9
Merge branch 'ContentNavigationScrollbarColors' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-ContentNavigationScrollbarColors
2025-11-07 21:42:10 +01:00
Wojtek Figat
3a5bb81d39
Add a new splash screen quote
2025-11-06 21:00:29 +01:00
Saas
93f12b73d8
less code is more better
2025-10-31 23:16:37 +01:00
Saas
594c0fb8e7
add comment around asset from which asset reference graph originates
2025-10-31 19:23:42 +01:00
Wojtek Figat
1f592ba1a1
Fix game viewport scaling when using custom aspect or resolution to simulate actual logic
...
#3699
2025-10-30 23:36:51 +01:00
c61ecc0545
Merge branch 'master' into sdl_platform
2025-10-30 22:42:29 +02:00
Wojtek Figat
755702b65a
Improve #3747 to check for loaded levels in drag drop validation
2025-10-25 22:52:41 +02:00
Chandler Cox
e4bb8001b2
Fix not having undo for items dragged into scene tree into empty space.
2025-10-18 18:23:33 -05:00
f99a244b8e
Merge remote-tracking branch 'origin/master' into sdl_platform
...
# Conflicts:
# Source/Editor/Windows/GameWindow.cs
2025-10-18 02:19:30 +03:00
Saas
5ec2476aec
add "*" to editor settings window title when settings are dirty
2025-10-16 21:05:10 +02:00
Wojtek Figat
d93c32db9c
Merge remote-tracking branch 'origin/1.11'
...
# Conflicts:
# Source/Tools/Flax.Build/Deps/Downloader.cs
2025-10-16 14:07:49 +02:00
