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 |
|
Wojtek Figat
|
93442ec8fa
|
Refactor ControlReference to use FlaxObjectRefPickerControl as a base class
#3123
|
2025-03-04 20:32:06 +01:00 |
|
Wojtek Figat
|
35fa63852c
|
Format code and simplify IControlReference a little bit
#3123
|
2025-03-04 16:06:48 +01:00 |
|
Wojtek Figat
|
fee54f0f39
|
Merge branch 'control-reference' of https://github.com/Tryibion/FlaxEngine into Tryibion-control-reference
|
2025-03-04 14:03:56 +01:00 |
|
|
|
5fd64ead62
|
Fix custom content and importers blocking scripting reload
|
2025-02-26 20:29:21 +02:00 |
|
|
|
9f8faf4f17
|
Clear references holding on to types in game assemblies
|
2025-02-26 20:29:19 +02:00 |
|
Wojtek Figat
|
2ab9adab24
|
Merge remote-tracking branch 'origin/master' into 1.10
|
2025-02-24 23:27:56 +01:00 |
|
Wojtek Figat
|
345cbdb8d4
|
Merge branch 'prefab-doubleclick-obj-ref' of https://github.com/Tryibion/FlaxEngine into Tryibion-prefab-doubleclick-obj-ref
|
2025-02-24 00:10:04 +01:00 |
|
Chandler Cox
|
65a219512c
|
Add double clicking an object reference in a prefab to select the actor within the prefab.
|
2025-02-21 15:52:43 -06:00 |
|
Wojtek Figat
|
b81b0b7616
|
Fix text clipping behind the button in Behavior Knowledge Selector editor
|
2025-02-21 19:34:35 +01:00 |
|
Wojtek Figat
|
a6fb651ff4
|
Merge remote-tracking branch 'origin/master' into 1.10
# Conflicts:
# Source/Engine/Graphics/Materials/MaterialShader.h
|
2025-02-18 09:19:59 +01:00 |
|
Chandler Cox
|
25b8939aff
|
Update to include presenter context.
|
2025-02-16 18:05:25 -06:00 |
|
Chandler Cox
|
e4d2e429a0
|
Merge branch 'master' into control-reference
|
2025-02-16 17:40:38 -06:00 |
|
Wojtek Figat
|
0525ce2cb3
|
Merge branch 'add-context-to-obj-ref-editor' of https://github.com/Tryibion/FlaxEngine into Tryibion-add-context-to-obj-ref-editor
|
2025-02-16 20:42:23 +01:00 |
|
Wojtek Figat
|
abd0c7dece
|
Add support for displaying Multiple Values info to object reference pickers
#2984
|
2025-02-12 22:31:53 +01:00 |
|
Chandler Cox
|
030befdcaa
|
Rename dropped method.
|
2025-01-22 21:47:28 -06:00 |
|
Chandler Cox
|
3a591577ad
|
Add drag drop to FilePathEditor
|
2025-01-22 21:46:21 -06:00 |
|
Wojtek Figat
|
addc6d5216
|
Merge remote-tracking branch 'origin/master' into 1.10
# Conflicts:
# Content/Editor/Gizmo/Material.flax
# Content/Engine/DefaultTerrainMaterial.flax
# Source/Editor/Windows/Assets/ModelWindow.cs
# Source/Editor/Windows/Assets/SkinnedModelWindow.cs
# Source/Engine/Core/Types/Variant.cpp
|
2025-01-13 18:07:54 +01:00 |
|
Chandler Cox
|
e2df7a1e85
|
Handle linked values in Float3Editor
|
2025-01-12 15:07:43 -06:00 |
|
Chandler Cox
|
04fc118ddf
|
Small fixes.
|
2025-01-04 11:45:08 -06:00 |
|
Chandler Cox
|
c79cd82fd4
|
Fix code warnings.
|
2024-12-30 18:59:45 -06:00 |
|
Chandler Cox
|
9219b34dc3
|
Shorten picker control name.
|
2024-12-30 16:43:06 -06:00 |
|
Chandler Cox
|
e6450bfc7a
|
Add ControlReference for easier UI referencing.
|
2024-12-30 16:36:10 -06:00 |
|
Wojtek Figat
|
222a614a2b
|
Simplify and cleanup code
#3096
|
2024-12-16 23:14:50 +01:00 |
|
Wojtek Figat
|
bd4a042619
|
Merge branch 'ActorRefClickHighlight' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-ActorRefClickHighlight
|
2024-12-16 23:09:09 +01:00 |
|
Chandler Cox
|
99e836b1fb
|
Fix valid drop not resetting, add debounce timer to highlighting for showing on double click prevention
|
2024-12-11 20:43:52 -06:00 |
|
xxSeys1
|
1e61abdfef
|
add highlight when actor reference is single clicked
|
2024-12-11 17:11:00 +01:00 |
|
Wojtek Figat
|
139a431614
|
Fix crash due to alive reference to old asset validator
#3081
|
2024-12-10 17:01:41 +01:00 |
|
Wojtek Figat
|
35e9e048f2
|
Merge remote-tracking branch 'origin/master' into 1.10
|
2024-12-10 11:07:31 +01:00 |
|
Wojtek Figat
|
667661dd90
|
Merge branch 'multi-select-values' of https://github.com/Tryibion/FlaxEngine into Tryibion-multi-select-values
|
2024-12-09 18:34:39 +01:00 |
|
Wojtek Figat
|
0e13173119
|
Fix actor reference select in prefab editor
|
2024-11-25 22:13:46 +01:00 |
|
xxSeys1
|
a0aee15267
|
add named terrain layers
|
2024-10-25 15:30:54 +02:00 |
|
Chandler Cox
|
ecb80e0f34
|
Add context to drag drop for object ref editor.
|
2024-09-27 18:26:37 -05:00 |
|
Chandler Cox
|
aded4bfdeb
|
Add context to object referece control to narrow finding actors and scripts
|
2024-09-27 17:49:44 -05:00 |
|
Wojtek Figat
|
18dc475f40
|
Merge remote-tracking branch 'origin/master' into 1.9
# Conflicts:
# Source/Engine/UI/GUI/Common/Button.cs
|
2024-09-23 14:11:05 +02:00 |
|
Wojtek Figat
|
596b61b23f
|
Fix crashes in vector editors in rare cases
|
2024-09-18 23:36:27 +02:00 |
|
Wojtek Figat
|
9daddccbed
|
Merge remote-tracking branch 'origin/master' into 1.9
# Conflicts:
# Source/Editor/Modules/ContentDatabaseModule.cs
# Source/Editor/Surface/SurfaceUtils.cs
# Source/Editor/Windows/Assets/MaterialInstanceWindow.cs
# Source/Engine/Foliage/Foliage.cpp
# Source/Engine/Graphics/Models/MeshBase.h
# Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Textures.cpp
|
2024-09-12 13:38:20 +02:00 |
|
Wojtek Figat
|
bbb0d36494
|
Fixed issues found by PVS-Studio
|
2024-09-09 18:21:59 +02:00 |
|
Wojtek Figat
|
ce7b11adfc
|
Merge branch 'save-collection-groups' of https://github.com/Tryibion/FlaxEngine into Tryibion-save-collection-groups
# Conflicts:
# Source/Editor/CustomEditors/Editors/CollectionEditor.cs
|
2024-08-30 13:17:46 +02:00 |
|
Wojtek Figat
|
68eb8b9f21
|
Fix properties editor labels positioning
#2530 #2609
|
2024-08-30 12:58:12 +02:00 |
|
Wojtek Figat
|
758f3c39ee
|
Merge branch 'shrink-listen' of https://github.com/Tryibion/FlaxEngine into Tryibion-shrink-listen
|
2024-08-28 16:37:30 +02:00 |
|
Wojtek Figat
|
838cb9f2ce
|
Fix object reference empty text clipping
|
2024-08-27 23:37:28 +02:00 |
|
