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
095f7277e2
Minor fixes
2026-03-28 15:13:52 +01:00
mafiesto4
76378156f7
Fix crash when applying prefab changes
...
#3755
2026-03-28 00:31:46 +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
6736f2f77a
Merge branch 'NewActorAndUiTransformEditorSkin' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-NewActorAndUiTransformEditorSkin
2026-03-12 11:07:48 +01:00
mafiesto4
2000a95fa7
Merge branch 'SplineEditorImprovements' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-SplineEditorImprovements
2026-03-10 22:58:02 +01:00
mafiesto4
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
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
mafiesto4
c376f220ca
Minor adjustments to #3846
2026-03-08 22:46:53 +01:00
mafiesto4
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
mafiesto4
273b110db4
Code style formatting and minor tweaks
...
#2800
2026-02-11 17:15:15 +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
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
e4eb064562
Add bake button to nav mesh bounds and minor improvements
2026-01-30 13:12:45 +01:00
mafiesto4
610c76578b
Merge remote-tracking branch 'origin/master' into 1.12
...
# Conflicts:
# Flax.flaxproj
2026-01-13 14:29:44 +01:00
mafiesto4
e3d1e8a5ea
Add View button to edit Environment Probe texture asset
2026-01-13 10:36:07 +01:00
mafiesto4
32cae3aacd
Merge branch 'UiClippingFixes' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-UiClippingFixes
2026-01-12 21:33:03 +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
Tryibion
c68aa3b371
Remove not needed include that produces ambiguity for the Label class.
2025-12-19 08:13:24 -06:00
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
5b1ca13225
choose darker mouse over color
2025-12-18 12:22:24 +01:00
0d8ac5b7ac
implement review
...
- Remove trailing tooltip "."
- Add `AddSettingsButton` method
- Simplify loop into LINQ expression
2025-12-18 12:17:22 +01:00
4b62395d69
add script obsolete icon to script editor
2025-12-10 18:41:57 +01:00
466f9a4797
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-11-11 21:40:06 +02:00
mafiesto4
76247323eb
Merge branch 'BakeButtonGroups' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-BakeButtonGroups
2025-11-07 21:32:32 +01:00
316e5b2845
also apply color to border if focused/ selected in ui editor
2025-10-31 18:10:00 +01:00
c1738bcb0a
make the ui editor look like the actor transform editor
2025-10-31 18:02:35 +01:00
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
d323b1c7e2
move skylight and environment probe bake buttons into dedicated groups
2025-10-16 20:28:34 +02:00
e5bd90f58b
revert icon scaling
2025-10-15 19:51:24 +02:00
668a4dbb4d
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-10-14 01:09:26 +03:00
d1972a56e2
improve spline editor
...
- Move "Selected Point" section above keyframes so it is always accessible, even when keyframe array editor is expanded
- Improve icon scaling when editor becomes thin
2025-10-13 18:27:30 +02:00
48100cf9fc
fix group element text clipping
...
fixes group element header text clipping outside of the header and into the settings icon (if there is one).
Also some extra code to handle script editor, as that displays some extra icons in the header.
2025-10-13 11:16:07 +02:00
mafiesto4
028b5fedec
Use right-click only on GPUTextureEditor context menu
2025-09-30 23:37:15 +02:00
mafiesto4
284aeca51a
Merge branch 'audio-events' of https://github.com/Tryibion/FlaxEngine into Tryibion-audio-events
2025-09-23 17:07:18 +02:00
de2ee36529
fix naming lol
2025-09-16 22:07:42 +02:00
eea44ac897
remove search query highlights showing on create new script item
2025-09-16 22:06:49 +02:00
c124713e99
remove create new script items when searchbox is cleared
2025-09-16 22:05:28 +02:00
mafiesto4
afdd264e63
Fix compilation of Editor in Release mode
2025-09-16 16:34:58 +02:00
mafiesto4
56077a268a
SImplify and cleanup GPUTexture editor #3452 #3194
2025-09-16 00:15:48 +02:00
b443b74d18
Merge branch 'master' into sdl_platform
...
# Conflicts:
# Source/Editor/GUI/Docking/DockHintWindow.cs
# Source/Editor/Options/InterfaceOptions.cs
2025-09-07 19:02:09 +03:00
Tryibion
2901e3898c
Add IncludeInheritedTypes to RequireActor
2025-08-29 16:03:44 -05:00
mafiesto4
91cd1e8065
Fix regression from ef7c7f2d30 to ignore unmodified scripts in diff
2025-08-29 21:49:14 +02:00
mafiesto4
d47ac95681
Modernize the code to use unified scene access #3513
2025-08-28 23:48:25 +02:00
mafiesto4
703e0cb7ca
Merge branch 'show-prefab-add-delete' of https://github.com/Tryibion/FlaxEngine into Tryibion-show-prefab-add-delete
2025-08-28 22:56:22 +02:00
mafiesto4
ef7c7f2d30
Fix script fields prefab diff showing and reverting with undo
...
#3594
2025-08-28 22:52:46 +02:00
Tryibion
0dc1e04c89
Add slider to audio debug editor for selecting time.
2025-08-01 15:07:49 -05:00
6ff260d052
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-06-16 14:09:29 +03:00
b418ab5275
reduce flickering in highlights and boxes
2025-06-10 14:58:31 +02:00
mafiesto4
Ari Vuollet
Tryibion