Commit Graph

481 Commits

Author SHA1 Message Date
c8e893d2ec Fix assigning null values into value types in Custom Editor
Resets back to previous value instead of setting the editor value to
empty.
2024-05-01 18:44:58 +03:00
3a665199e7 Avoid deserializing clipboard content in Custom Editor paste checks 2024-05-01 18:44:58 +03:00
761c8415dc Merge branch 'master' into signalgame
# Conflicts:
#	Flax.flaxproj
2024-05-01 18:42:14 +03:00
Chandler Cox
d8bb831dd9 Add watermark attribute to add watermark to string fields in editor. Have watermark show even when textbox is focused . 2024-04-27 11:07:20 -05:00
Wojtek Figat
3641e156ee Merge branch 'treenode_optimize' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-treenode_optimize 2024-04-25 17:18:54 +02:00
3e7ac04a88 Fix freeze when selecting ModelPrefab referencing a removed asset 2024-04-23 20:55:20 +03:00
Wojtek Figat
cdeb9a3b15 Merge remote-tracking branch 'origin/master' into 1.9
# 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/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/DefaultTerrainMaterial.flax
#	Content/Engine/SingleColorMaterial.flax
#	Content/Engine/SkyboxMaterial.flax
#	Source/Engine/Graphics/Materials/MaterialShader.h
2024-04-23 10:30:01 +02:00
Wojtek Figat
6eb431d12c Fix rare error on drag&drop in Editor 2024-04-22 23:17:56 +02:00
4dcdd8b5f7 Add Actor.HasScene and Script.HasScene
Useful in managed code to check the existence of the scene in hot paths
by avoiding expensive marshalling of the Scene object.
2024-04-20 20:58:55 +03:00
Wojtek Figat
60e8d73079 Merge remote-tracking branch 'origin/master' into 1.9
# Conflicts:
#	Source/Engine/Renderer/RenderList.cpp
#	Source/Engine/Renderer/RenderList.h
2024-04-17 09:58:59 +02:00
Wojtek Figat
171fc276fb Fix bug in ValueContainer.HasDifferentTypes causing incorrect editor setup
#2436
2024-04-16 22:32:10 +02:00
Wojtek Figat
36ad821734 Fix 634b05fc16 2024-04-14 22:39:54 +02:00
Wojtek Figat
5cdf1c5764 Merge branch 'lock-selection' of https://github.com/Tryibion/FlaxEngine into Tryibion-lock-selection 2024-04-14 14:34:10 +02:00
Wojtek Figat
634b05fc16 Fix code style 2024-04-14 13:31:32 +02:00
Chandler Cox
81d4501868 Add locking selection in prefab window 2024-04-12 07:41:43 -05:00
Chandler Cox
1bc7455e09 Add locking scene selection in properties window. 2024-04-12 07:33:09 -05:00
Wojtek Figat
734f1ee4aa Improve doc comment 2024-04-12 13:09:24 +02:00
Menotdan
c914e33462 Hide TAA settings if TAA isn't enabled. 2024-04-12 02:29:45 -04:00
Wojtek Figat
340ef194d3 Add grey out to obsolete/deprecated members in properties panel 2024-04-10 13:36:59 +02:00
Wojtek Figat
a83b589e12 Fix error when applying prefab changes with Spline
#2384
2024-04-05 16:43:18 +02:00
Wojtek Figat
7578e1dbe3 Fix errors on using spline editor in Prefab window
#2383
2024-04-05 16:37:11 +02:00
Wojtek Figat
08e88587e6 Add safe check for LinkedLabel to prevent errors 2024-03-29 17:27:00 +01:00
Wojtek Figat
c08ca33a9a Fix Revert to Default option when property is marked as ReadOnly 2024-03-24 20:57:19 +01:00
Wojtek Figat
6b35c0a161 Merge remote-tracking branch 'origin/master' into 1.8
# Conflicts:
#	Flax.flaxproj
2024-03-19 20:23:34 +01:00
Wojtek Figat
9e54827cb3 Cleanup code #2213 2024-03-19 20:13:41 +01:00
Wojtek Figat
bfbabbc395 Refactor value editors to simplify code after many new features added 2024-03-19 20:04:00 +01:00
Wojtek Figat
35d1d97840 Rename NumberCategoryAttribute to ValueCategoryAttribute
#2213
2024-03-19 18:30:02 +01:00
Wojtek Figat
911251cb20 Merge branch 'unit-formatting' of https://github.com/nothingTVatYT/FlaxEngine into nothingTVatYT-unit-formatting
# Conflicts:
#	Source/Editor/CustomEditors/Editors/ActorTransformEditor.cs
#	Source/Editor/Options/InterfaceOptions.cs
#	Source/Engine/Core/Math/Transform.h
2024-03-19 18:04:01 +01:00
Wojtek Figat
d719c381ea Merge remote-tracking branch 'origin/master' into 1.8 2024-03-11 23:49:33 +01:00
Wojtek Figat
d390938fb6 Minor improvements to usability 2024-03-08 14:39:18 +01:00
Wojtek Figat
8de2249ed8 Refactor Editor UI style for selection and drag drop interactions
#1741
2024-03-07 16:45:09 +01:00
Wojtek Figat
28da656ed1 Fix preserving actors hierarchy order when performing undo of actor removal
#1751
2024-03-05 16:30:50 +01:00
Wojtek Figat
bbe08be462 Fix duplicating array values in Editor
#1959
2024-03-04 18:25:57 +01:00
Wojtek Figat
7428ecfe63 Add skipping showing and applying changes to prefab root actor transform via Level
#2125
2024-02-26 22:29:43 +01:00
Wojtek Figat
2d5d001a44 Fix Missing Script replacing in prefab
#1995
2024-02-26 20:34:59 +01:00
Wojtek Figat
14902dc29e Merge remote-tracking branch 'origin/master' into 1.8
# Conflicts:
#	Flax.flaxproj
2024-02-26 19:49:39 +01:00
Wojtek Figat
859c420d76 Update year in copyright note 2024-02-26 19:00:48 +01:00
Wojtek Figat
10180de9c6 Merge remote-tracking branch 'origin/master' into 1.8
# Conflicts:
#	Source/Editor/Utilities/EditorUtilities.cpp
#	Source/Editor/Utilities/EditorUtilities.h
2024-02-19 22:26:16 +01:00
Wojtek Figat
a061afd840 Cleanup for #1827 2024-02-19 10:54:29 +01:00
Wojtek Figat
71627f1bbd Merge branch 'new-script' of https://github.com/MineBill/FlaxEngine into MineBill-new-script 2024-02-18 20:32:27 +01:00
Wojtek Figat
d97772383e Merge branch 'require-script' of https://github.com/Tryibion/FlaxEngine into Tryibion-require-script 2024-02-18 16:00:29 +01:00
Wojtek Figat
c305bed829 Add sub-groups expanded state restoring in Properties window
#1049
2024-02-17 23:42:57 +01:00
Wojtek Figat
5fc7c6e190 Add MinCount and MaxCount to Collection attribute 2024-02-15 18:26:12 +01:00
Wojtek Figat
fe7cc62728 Add JsonAssetReference type for scripting 2024-02-15 11:22:01 +01:00
Wojtek Figat
31437e6dde Fix copy/paste for UI brushes 2024-02-14 12:17:02 +01:00
Wojtek Figat
6cd9895427 Merge remote-tracking branch 'origin/master' into 1.8 2024-02-07 09:40:45 +01:00
Wojtek Figat
7c9218840d Format code #2149 2024-02-06 17:27:27 +01:00
Wojtek Figat
876cb4f0c3 Merge branch 'button-custom-editors' of https://github.com/MineBill/FlaxEngine into MineBill-button-custom-editors 2024-02-06 17:13:12 +01:00
Wojtek Figat
9da9a122b8 Fix error in Editor 2024-02-06 16:59:17 +01:00
Wojtek Figat
6954a488ea Codestyle fixes 2024-02-06 16:38:44 +01:00