Commit Graph

637 Commits

Author SHA1 Message Date
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
0e822fc1f7 Merge branch 'TerrainInfo' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-TerrainInfo 2025-03-26 16:03:02 +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
xxSeys1
e9e96b21d3 put terrain info into own Properties panel group 2025-03-23 14:48:02 +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
Wojtek Figat
a3822b6669 Fix spline node to support prefab editor
#3257
2025-03-03 23:38:41 +01:00
Wojtek Figat
dad8c0cd6b Merge remote-tracking branch 'origin/master' into 1.10
# Conflicts:
#	Source/Engine/Level/Prefabs/Prefab.Apply.cpp
2025-02-27 17:17:02 +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
691b9458ec Fix wrong prefab event unregistration 2025-02-26 20:29:19 +02:00
Wojtek Figat
2d956ebb36 Fix error when applying prefab changes with missing (deleted) nested prefabs
#3244
2025-02-26 17:46:22 +01: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
Wojtek Figat
9049093267 Fix scene object reference serialization in C# scripts
#3136
2025-02-17 11:57:31 +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
25067959eb Add nested prefabs editing buttons inside Prefab Window
#1595
2025-02-16 20:34:33 +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
Wojtek Figat
f11306af24 Add caching and restoring curve height in properties panel
#2455
2025-01-30 17:42:54 +01:00
Wojtek Figat
475818554d Fix error in editor when sliding value 2025-01-27 12:40:55 +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
Wojtek Figat
06a04167c7 Merge branch 'handle-multi-linked' of https://github.com/Tryibion/FlaxEngine into Tryibion-handle-multi-linked 2025-01-12 22:13:07 +01:00
Chandler Cox
e2df7a1e85 Handle linked values in Float3Editor 2025-01-12 15:07:43 -06:00
Wojtek Figat
b546e4a332 Merge branch 'import-ui-spacing' of https://github.com/Tryibion/FlaxEngine into Tryibion-import-ui-spacing 2025-01-12 21:59:28 +01:00
Wojtek Figat
8451439abb Merge branch 'EditPrefabNoContentPanelChange' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-EditPrefabNoContentPanelChange 2025-01-12 21:58:19 +01:00
Wojtek Figat
506efb7538 Merge model and skinned model windows code into shared base class 2025-01-12 01:04:56 +01:00
Chandler Cox
77c48c037e Add No parameters UI to particle effect and animated model 2025-01-09 19:19:30 -06:00
Chandler Cox
e87bb2325b Standardize spacing for import path ui in assets. add import path ui to model prefab. 2025-01-07 20:43:57 -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