Commit Graph

503 Commits

Author SHA1 Message Date
Wojtek Figat
12cf7f0f92 Merge remote-tracking branch 'origin/master' into 1.9
# Conflicts:
#	Flax.flaxproj
2024-05-22 16:15:14 +02:00
Wojtek Figat
7f8700288f Merge branch 'sel-prefab-clear-search' of https://github.com/Tryibion/FlaxEngine into Tryibion-sel-prefab-clear-search 2024-05-17 15:30:59 +02:00
Chandler Cox
47b3141f18 Clear item search on select prefab 2024-05-16 23:00:32 -05:00
Wojtek Figat
2529312152 Refactor Color.FromRGBA and add matching old logic Color.FromARGB
2592
2024-05-16 13:45:29 +02:00
Wojtek Figat
ab5bb79754 Fix regression in collections editing after improving ReadOnly option 2024-05-16 10:34:57 +02:00
Wojtek Figat
97be8ee8cc Merge remote-tracking branch 'origin/master' into 1.9
# Conflicts:
#	Source/Engine/Content/Storage/FlaxStorage.cpp
#	Source/Engine/Renderer/GBufferPass.cpp
2024-05-15 23:49:05 +02:00
Wojtek Figat
b4a4a8a591 Minor code cleanup 2024-05-15 12:40:08 +02:00
Wojtek Figat
13f94dcf11 Merge branch 'control-trans-dup' of https://github.com/Tryibion/FlaxEngine into Tryibion-control-trans-dup 2024-05-15 12:25:28 +02:00
Wojtek Figat
af08dc1c69 Fix ReadOnly attribute handling in collection editors 2024-05-13 16:08:50 +02:00
Chandler Cox
07628d2ec7 Clean up code 2024-05-11 21:31:00 -05:00
Chandler Cox
aac3dbfe09 Fix control transform duplicating when changing anchor. 2024-05-11 21:29:45 -05:00
Wojtek Figat
e7508538e0 Merge remote-tracking branch 'origin/master' into 1.9
# Conflicts:
#	Flax.flaxproj
2024-05-08 19:27:56 +02:00
Wojtek Figat
5d32fc6c5e Merge branch 'Move-control-transform' of https://github.com/Tryibion/FlaxEngine into Tryibion-Move-control-transform 2024-05-08 17:31:47 +02:00
Wojtek Figat
fedd990c13 Merge branch 'skip-empty-layers' of https://github.com/Tryibion/FlaxEngine into Tryibion-skip-empty-layers 2024-05-05 22:56:41 +02:00
Chandler Cox
bf4e4aeaf6 Fix bottom offset for last property label and property 2024-05-04 22:32:00 -05:00
Chandler Cox
2107b069db Fix odd offset between 1st property and property label. 2024-05-04 19:25:56 -05:00
Chandler Cox
ea2005dacb Add layer number to LayerMask UI 2024-05-04 18:08:53 -05:00
Chandler Cox
d5cded8aaa Skip empty layers for LayerMask Editor 2024-05-04 17:51:27 -05:00
Wojtek Figat
754ed56119 Add FilePathEditor custom editor for path-based editing asset/url refs with a file picker 2024-05-03 12:26:03 +02:00
Wojtek Figat
9d830eb1e2 Fix crash when using scripting object as interface implementation in object property displayed in Editor
#2493
2024-05-02 18:31:30 +02:00
Wojtek Figat
0d8c9f6626 Add Video module 2024-05-01 01:25:16 +02:00
Chandler Cox
d1db06a9bb Change text alignment to far on some control transform properties 2024-04-29 19:44:49 -05:00
Chandler Cox
1c1d2fd96f Fix still showing some control transform properties in wrong spot. 2024-04-29 19:38:36 -05:00
Chandler Cox
2e5ad8c48a Always set control transform under general tab 2024-04-29 18:28:04 -05:00
Chandler Cox
9a6f866956 Move control transform to be under general group in layout. 2024-04-29 18:24:01 -05: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