GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,006 Commits 14 Branches 0 Tags
mac_changes
Commit Graph

340 Commits

Author SHA1 Message Date
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
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
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
840835fad2 Merge branch 'ArrayEditorHideSize' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-ArrayEditorHideSize 2026-01-12 21:34:52 +01:00
Wojtek Figat
450b998a29 Merge branch 'master' into 1.12 2026-01-07 23:15:13 +01: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
036d4b2f4b Fix error when asset refs picker uses different types 2025-11-03 23:21:09 +01:00
Wojtek Figat
b5de4d78ad Fix editing InputEvent that is null 2025-10-30 11:57:47 +01: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
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
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
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
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
Wojtek Figat
a471861e92 Fix editing UI Brush in prefabs 
#3501
 2025-09-12 23:15:13 +02: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
Chandler Cox
824b49dd88 Better duplication of collection. 2025-08-26 20:25:02 -05:00
Wojtek Figat
826009c1b4 Merge remote-tracking branch 'origin/master' into 1.11 
# Conflicts:
#	Content/Editor/DebugMaterials/DDGIDebugProbes.flax
#	Source/Engine/Scripting/Scripting.cpp
 2025-08-25 23:48:08 +02:00
Wojtek Figat
26f4bcbc25 Fix UI Control Reference picker to support base/inherited types 2025-08-25 10:09:25 +02:00
Wojtek Figat
9aedb37ac2 Merge branch 'BrokenLink' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-BrokenLink 2025-08-24 21:10:26 +02:00
Chandler Cox
1fb6586dff Add collection item duplication. 2025-07-19 16:09:33 -05:00
Wojtek Figat
c6640be04a Merge branch 'tageditor-quickexpand' of https://github.com/Zode/FlaxEngine into Zode-tageditor-quickexpand 2025-07-01 16:47:04 +02:00
Wojtek Figat
5a05038a9b Add new UIBrush that uses UIBrushAsset json resource with a brush data 2025-06-24 13:08:25 +02:00
Zode
bed1f6e9cc Make tag editor expand all if holding shift while clicking the ... button 2025-06-11 19:06:23 +03:00
Wojtek Figat
7da69f18d4 Add button to quickly jump into Localized String Table that contains it 
#3301
 2025-06-02 22:01:06 +02:00
Wojtek Figat
fd8a8b5a4d Fix missing default value of localized string in editor 2025-06-02 18:02:34 +02:00
Wojtek Figat
8d7dfd5946 Merge branch 'CrammedGradingFixed' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-CrammedGradingFixed 2025-06-01 23:53:15 +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
xxSeys1
c24ecaaab1 fix crammed color grading editor value boxes 2025-05-15 19:27:48 +02:00
Wojtek Figat
45f202fdf7 Fix culture info editor picker to show under button 
#3387
 2025-04-16 09:39:24 +02:00
Wojtek Figat
eb86002fbd Add AutoAttachDebugPreviewActor option to editor for quick debugging anim graphs on dynamically spawned player 2025-04-08 22:44:31 +02:00
Wojtek Figat
aaa4e73e0c Merge branch 'fix-tag-menu' of https://github.com/Tryibion/FlaxEngine into Tryibion-fix-tag-menu 2025-04-07 21:49:30 +02:00
Wojtek Figat
9c3fd052cd Remove copyright year from source files and update to 2025 2025-04-07 19:22:21 +02:00
Chandler Cox
60b4660a2c Fix tag add menu. 2025-04-02 21:39:47 -05:00
Wojtek Figat
3b518cdf2c Merge remote-tracking branch 'origin/master' into 1.10 2025-03-31 16:58:25 +02:00
xxSeys1
f53c3d7ad5 increase width of "Size" box to fit max collection size 
Max size is 65535
 2025-03-30 23:26:59 +02:00
Wojtek Figat
f94543aac8 Merge remote-tracking branch 'origin/master' into 1.10 
# Conflicts:
#	Flax.flaxproj
 2025-03-26 19:48:47 +01:00
Wojtek Figat
7e145c56fd Merge remote-tracking branch 'origin/master' into 1.10 
# Conflicts:
#	Source/Editor/Windows/Profiler/Memory.cs
 2025-03-25 13:37:15 +01:00
xxSeys1
0938dd3f5d hide Remove option in collections editor if collection can not be resized 2025-03-25 00:34:28 +01:00
Wojtek Figat
abe5b14f72 Merge branch 'unload_alc_fix' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-unload_alc_fix 2025-03-18 14:20:20 +01:00
Wojtek Figat
a4082934b8 Update Editor UI to use empty Pivot after fa68a5f572 
#3031
 2025-03-16 23:06:08 +01:00
Wojtek Figat
5d3da8a8d0 Merge remote-tracking branch 'origin/master' into 1.10 
# Conflicts:
#	Source/Editor/SceneGraph/Actors/StaticModelNode.cs
#	Source/Engine/Graphics/Models/Mesh.cs
#	Source/Engine/Graphics/Models/ModelData.h
 2025-03-13 11:23:01 +01:00
Wojtek Figat
09b23e2376 Minor fixes 2025-03-09 23:02:06 +01:00
Chandler Cox
e9f2d94a2e Remove object editor drop down if disabled. 2025-03-08 11:07:07 -06:00
Wojtek Figat
5bdbbb6d38 Merge remote-tracking branch 'origin/master' into 1.10 2025-03-07 23:41:02 +01:00