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
|
9d0e4e9768
|
Fix potential stack overflow inside CustomEditor.RebuildLayout
#3720
|
2026-03-25 18:51:12 +01:00 |
|
Wojtek Figat
|
e10d784e83
|
Add custom HTML shell template to Web export
|
2026-03-16 22:09:21 +01:00 |
|
Wojtek Figat
|
f42a9a760a
|
Adjust new Z Axis color in Transform
|
2026-03-13 23:27:21 +01:00 |
|
Wojtek Figat
|
1fc5316d12
|
Adjust new Z Axis color in Transform
|
2026-03-13 23:21:30 +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
|
6736f2f77a
|
Merge branch 'NewActorAndUiTransformEditorSkin' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-NewActorAndUiTransformEditorSkin
|
2026-03-12 11:07:48 +01:00 |
|
Wojtek Figat
|
2000a95fa7
|
Merge branch 'SplineEditorImprovements' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-SplineEditorImprovements
|
2026-03-10 22:58:02 +01:00 |
|
Wojtek Figat
|
0ade65036e
|
Merge branch 'DoubleClickSplitterToReset' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-DoubleClickSplitterToReset
|
2026-03-10 22:29:07 +01:00 |
|
Wojtek Figat
|
8cdb6d77ab
|
Merge branch 'req-actor-inherited-type' of https://github.com/Tryibion/FlaxEngine into Tryibion-req-actor-inherited-type
|
2026-03-10 20:01:37 +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 |
|
Wojtek Figat
|
c376f220ca
|
Minor adjustments to #3846
|
2026-03-08 22:46:53 +01:00 |
|
Wojtek Figat
|
5ce0a1535f
|
Merge branch 'ObsoleteInScriptsEditor' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-ObsoleteInScriptsEditor
# Conflicts:
# Source/Editor/CustomEditors/Dedicated/ScriptsEditor.cs
|
2026-03-08 22:40:35 +01:00 |
|
Wojtek Figat
|
273b110db4
|
Code style formatting and minor tweaks
#2800
|
2026-02-11 17:15:15 +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 |
|
Wojtek Figat
|
f3111e855d
|
Fix showing C++ structures inlined in collection editor when they have a single property/field
|
2026-02-03 19:48:57 +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
|
e4eb064562
|
Add bake button to nav mesh bounds and minor improvements
|
2026-01-30 13:12:45 +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 |
|
Wojtek Figat
|
e3d1e8a5ea
|
Add View button to edit Environment Probe texture asset
|
2026-01-13 10:36:07 +01:00 |
|
Wojtek Figat
|
840835fad2
|
Merge branch 'ArrayEditorHideSize' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-ArrayEditorHideSize
|
2026-01-12 21:34:52 +01:00 |
|
Wojtek Figat
|
32cae3aacd
|
Merge branch 'UiClippingFixes' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-UiClippingFixes
|
2026-01-12 21:33:03 +01:00 |
|
Wojtek Figat
|
450b998a29
|
Merge branch 'master' into 1.12
|
2026-01-07 23:15:13 +01:00 |
|
|
|
67b33a575a
|
Merge branch 'master' into sdl_platform
# Conflicts:
# .github/workflows/build_linux.yml
# .github/workflows/tests.yml
# Source/Tools/Flax.Build/Projects/VisualStudio/VCProjectGenerator.cs
|
2026-01-06 02:57:52 +02:00 |
|
Chandler Cox
|
c68aa3b371
|
Remove not needed include that produces ambiguity for the Label class.
|
2025-12-19 08:13:24 -06:00 |
|
Saas
|
d8c90184b9
|
add script only on prefab instance header button
- add some padding to `AddHeaderButton()`
- Add visual indicator (Header button) if script is only in prefab instance and not part of the prefab
|
2025-12-18 17:19:41 +01:00 |
|
Saas
|
5b1ca13225
|
choose darker mouse over color
|
2025-12-18 12:22:24 +01:00 |
|
Saas
|
0d8ac5b7ac
|
implement review
- Remove trailing tooltip "."
- Add `AddSettingsButton` method
- Simplify loop into LINQ expression
|
2025-12-18 12:17:22 +01:00 |
|
Saas
|
4b62395d69
|
add script obsolete icon to script editor
|
2025-12-10 18:41:57 +01:00 |
|
|
|
0ac3ab2329
|
Merge remote-tracking branch 'origin/master' into sdl_platform
|
2025-11-19 18:30:08 +02:00 |
|
|
|
466f9a4797
|
Merge remote-tracking branch 'origin/master' into sdl_platform
|
2025-11-11 21:40:06 +02:00 |
|
Wojtek Figat
|
97ae13759e
|
Merge remote-tracking branch 'origin/master'
|
2025-11-09 23:22:37 +01:00 |
|
Wojtek Figat
|
6a8b76278a
|
Merge branch 'AttributeEditorPolish' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-AttributeEditorPolish
|
2025-11-07 21:37:46 +01:00 |
|
Wojtek Figat
|
547cf7f600
|
Merge branch 'fix-type-editor-in-collection' of https://github.com/Tryibion/FlaxEngine into Tryibion-fix-type-editor-in-collection
|
2025-11-07 21:33:22 +01:00 |
|
Wojtek Figat
|
76247323eb
|
Merge branch 'BakeButtonGroups' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-BakeButtonGroups
|
2025-11-07 21:32:32 +01:00 |
|
Wojtek Figat
|
036d4b2f4b
|
Fix error when asset refs picker uses different types
|
2025-11-03 23:21:09 +01:00 |
|
Saas
|
b6696564f5
|
tweak colors to be less bright
|
2025-10-31 18:22:30 +01:00 |
|
Saas
|
316e5b2845
|
also apply color to border if focused/ selected in ui editor
|
2025-10-31 18:10:00 +01:00 |
|
Saas
|
c1738bcb0a
|
make the ui editor look like the actor transform editor
|
2025-10-31 18:02:35 +01:00 |
|
Saas
|
7b3e41efae
|
change how to the actor transform editor looks
|
2025-10-31 18:02:22 +01:00 |
|
Saas
|
35d6e5fd21
|
fix still being able to open/ close script editor with no fields
Introduces "CanOpenClose" to DropPanel.
If false, will ignore the user clicking on the header (or the arrow) to open or collapse the panel
|
2025-10-30 20:02:15 +01:00 |
|
Wojtek Figat
|
b5de4d78ad
|
Fix editing InputEvent that is null
|
2025-10-30 11:57:47 +01:00 |
|
|
|
22ba7f2ee5
|
Merge remote-tracking branch 'origin/master' into sdl_platform
|
2025-10-24 18:31:50 +03:00 |
|
Chandler Cox
|
be5dbbb95f
|
Fix duplicate option for collections being grayed out if nothing is in clipboard.
|
2025-10-19 15:55:57 -05:00 |
|
Saas
|
d323b1c7e2
|
move skylight and environment probe bake buttons into dedicated groups
|
2025-10-16 20:28:34 +02:00 |
|
Saas
|
d6b1478bf1
|
make double clicking properties splitter bar auto resize split
|
2025-10-16 20:04:05 +02:00 |
|
Saas
|
79351f0c4d
|
Hide array editor "Size" text when array title overlaps it
|
2025-10-15 21:09:24 +02:00 |
|
Saas
|
e5bd90f58b
|
revert icon scaling
|
2025-10-15 19:51:24 +02:00 |
|
