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
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
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
79351f0c4d
Hide array editor "Size" text when array title overlaps it
2025-10-15 21:09:24 +02:00
Chandler Cox
7377bad721
Fix check method for type editor not working in a collection.
2025-10-14 21:20:22 -05:00
668a4dbb4d
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-10-14 01:09:26 +03:00
Saas
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
Saas
7544500be1
polish attribute editor
...
- Add hint about what to do when there are no attributes
- Swap "Ok" "Cancel" buttons order to match other dialog boxes
- Move buttons to the bottom
- Increase size of menu
- Add some missing "." to add/ remove button tooltips in array editor
2025-10-12 16:07:20 +02:00
Wojtek Figat
823ed247d2
Merge remote-tracking branch 'origin/master' into 1.11
...
# Conflicts:
# Source/Engine/Level/Actors/Sky.cpp
2025-10-03 22:37:32 +02:00
Wojtek Figat
028b5fedec
Use right-click only on GPUTextureEditor context menu
2025-09-30 23:37:15 +02:00
Wojtek Figat
87e2c4c4d5
Merge remote-tracking branch 'origin/master' into 1.11
...
# Conflicts:
# Content/Editor/DebugMaterials/DDGIDebugProbes.flax
# Source/Editor/Windows/OutputLogWindow.cs
# Source/Engine/Level/Actor.cpp
2025-09-24 18:18:27 +02:00
Wojtek Figat
7060cb5696
Fix UI Brush editing in prefab regression from a471861e92
...
#3694
2025-09-23 17:20:18 +02:00
Wojtek Figat
284aeca51a
Merge branch 'audio-events' of https://github.com/Tryibion/FlaxEngine into Tryibion-audio-events
2025-09-23 17:07:18 +02:00
Wojtek Figat
62fd8ac967
Merge branch 'fix-dup&remove' of https://github.com/Tryibion/FlaxEngine into Tryibion-fix-dup&remove
2025-09-21 21:02:17 +02:00
Chandler Cox
01d1d634c2
Fix other missing duplicate.
2025-09-16 17:43:55 -05:00
Chandler Cox
c7e403661d
Dont allow remove and duplicate options for non-resizing collections.
2025-09-16 17:42:24 -05:00
Saas
de2ee36529
fix naming lol
2025-09-16 22:07:42 +02:00
Saas
eea44ac897
remove search query highlights showing on create new script item
2025-09-16 22:06:49 +02:00
Saas
c124713e99
remove create new script items when searchbox is cleared
2025-09-16 22:05:28 +02:00
Wojtek Figat
afdd264e63
Fix compilation of Editor in Release mode
2025-09-16 16:34:58 +02:00
Wojtek Figat
521518bde4
Add hack to use GPUTextureEditor on ref pickers
2025-09-16 00:15:58 +02:00
Wojtek Figat
56077a268a
SImplify and cleanup GPUTexture editor #3452 #3194
2025-09-16 00:15:48 +02:00
Wojtek Figat
a471861e92
Fix editing UI Brush in prefabs
...
#3501
2025-09-12 23:15:13 +02:00
1d8f221f1b
Merge remote-tracking branch 'origin/1.11' into sdl_platform_1.11
...
# Conflicts:
# Source/Engine/Platform/Windows/WindowsPlatform.cpp
# Source/Tools/Flax.Build/Build/ProjectTarget.cs
# Source/Tools/Flax.Build/Configuration.cs
2025-09-07 19:31:16 +03: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
Wojtek Figat
c57e128ff1
Merge remote-tracking branch 'origin/master' into 1.11
...
# Conflicts:
# Source/Engine/Level/Scene/SceneRendering.cpp
# Source/Engine/Physics/Colliders/Collider.cpp
# Source/Engine/Physics/Colliders/Collider.h
2025-09-02 22:23:45 +02:00
Wojtek Figat
33a0e6ac7d
Merge branch 'collection-duplicate' of https://github.com/Tryibion/FlaxEngine into Tryibion-collection-duplicate
2025-08-29 22:24:09 +02:00
