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
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
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
Chandler Cox
c68aa3b371
Remove not needed include that produces ambiguity for the Label class.
2025-12-19 08:13:24 -06:00
466f9a4797
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-11-11 21:40:06 +02:00
Wojtek Figat
76247323eb
Merge branch 'BakeButtonGroups' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-BakeButtonGroups
2025-11-07 21:32:32 +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
Saas
d323b1c7e2
move skylight and environment probe bake buttons into dedicated groups
2025-10-16 20:28:34 +02: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
Wojtek Figat
028b5fedec
Use right-click only on GPUTextureEditor context menu
2025-09-30 23:37:15 +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
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
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
Wojtek Figat
91cd1e8065
Fix regression from ef7c7f2d30 to ignore unmodified scripts in diff
2025-08-29 21:49:14 +02:00
Wojtek Figat
d47ac95681
Modernize the code to use unified scene access #3513
2025-08-28 23:48:25 +02:00
Wojtek Figat
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
Wojtek Figat
ef7c7f2d30
Fix script fields prefab diff showing and reverting with undo
...
#3594
2025-08-28 22:52:46 +02:00
Chandler Cox
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
xxSeys1
b418ab5275
reduce flickering in highlights and boxes
2025-06-10 14:58:31 +02:00
Zode
6ee3b23261
Add highlighting to layers matrix editor to improve UX
2025-06-07 16:57:28 +03:00
Chandler Cox
71991ff8c7
Show added and removed actors in prefab diff view.
2025-06-03 15:25:45 -05:00
b1fd86e6b5
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-06-02 18:15:16 +03:00
Wojtek Figat
3bd6160c3b
Merge branch 'skip-setting-prefab-root-name' of https://github.com/Tryibion/FlaxEngine into Tryibion-skip-setting-prefab-root-name
2025-06-02 14:03:47 +02:00
Wojtek Figat
4d9407e4e9
Merge code on properties objects locking to use the same path for prefab and scene properties panels
2025-06-02 11:03:16 +02:00
Wojtek Figat
28c70f5078
Fix some editor UI
...
#3460 #3491
2025-06-02 11:00:33 +02:00
Wojtek Figat
f86d9c47b7
Merge branch 'better-prefab-dif-name' of https://github.com/Tryibion/FlaxEngine into Tryibion-better-prefab-dif-name
2025-06-02 09:30:46 +02:00
Wojtek Figat
14fcc593c7
Fix various margins and spacings between UI elements in Editor to be consistent
2025-05-30 15:28:56 +02:00
Chandler Cox
e606c35093
Add node tree to show changes to whole prefab.
2025-05-23 16:23:22 -05:00
Chandler Cox
4649298605
Dont allow setting prefab root name from scene instance.
2025-05-23 14:06:21 -05:00
Chandler Cox
ae9622d271
Re-add colors back in for nodes.
2025-05-23 13:29:05 -05:00
Chandler Cox
4366976015
Add better prefab diff viewing naming for actors
2025-05-23 13:27:01 -05:00
Wojtek Figat
c7bb7be20f
Merge branch 'improvedImportPath' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-improvedImportPath
2025-05-08 14:38:20 +02:00
xxSeys1
b0048d6540
add margin around info label
2025-05-01 22:32:28 +02:00
xxSeys1
b1b36ea1a3
move rigidbody info to dedicated info group in Properties Panel
2025-05-01 22:29:37 +02:00
xxSeys1
e568e6e17b
improve import path ui
2025-05-01 19:15:43 +02:00
592215dd30
Support compiling third party library C files as C code
2025-04-19 21:13:50 +03:00
ed8eb072c5
Fix error in LocalizationSettingsEditor after adding new locales
2025-04-12 02:11:06 +03:00
Wojtek Figat
9c3fd052cd
Remove copyright year from source files and update to 2025
2025-04-07 19:22:21 +02:00
