Flax/FlaxEngine
3
0
Fork 0
Code Issues Pull Requests Releases Activity
10,980 Commits 15 Branches 23 Tags
7ccae0140b97fbbfe170e8c2cae5ddb88fd66dca
Commit Graph

608 Commits

Author SHA1 Message Date
mafiesto4 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
mafiesto4 2d956ebb36 Fix error when applying prefab changes with missing (deleted) nested prefabs 
#3244
 2025-02-26 17:46:22 +01:00
mafiesto4 2ab9adab24 Merge remote-tracking branch 'origin/master' into 1.10 2025-02-24 23:27:56 +01:00
mafiesto4 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
Tryibion 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
mafiesto4 b81b0b7616 Fix text clipping behind the button in Behavior Knowledge Selector editor 2025-02-21 19:34:35 +01:00
mafiesto4 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
mafiesto4 9049093267 Fix scene object reference serialization in C# scripts 
#3136
 2025-02-17 11:57:31 +01:00
mafiesto4 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
mafiesto4 25067959eb Add nested prefabs editing buttons inside Prefab Window 
#1595
 2025-02-16 20:34:33 +01:00
mafiesto4 abd0c7dece Add support for displaying Multiple Values info to object reference pickers 
#2984
 2025-02-12 22:31:53 +01:00
mafiesto4 f11306af24 Add caching and restoring curve height in properties panel 
#2455
 2025-01-30 17:42:54 +01:00
mafiesto4 475818554d Fix error in editor when sliding value 2025-01-27 12:40:55 +01:00
Tryibion 030befdcaa Rename dropped method. 2025-01-22 21:47:28 -06:00
Tryibion 3a591577ad Add drag drop to FilePathEditor 2025-01-22 21:46:21 -06:00
mafiesto4 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
mafiesto4 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
Tryibion e2df7a1e85 Handle linked values in Float3Editor 2025-01-12 15:07:43 -06:00
mafiesto4 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
mafiesto4 8451439abb Merge branch 'EditPrefabNoContentPanelChange' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-EditPrefabNoContentPanelChange 2025-01-12 21:58:19 +01:00
mafiesto4 506efb7538 Merge model and skinned model windows code into shared base class 2025-01-12 01:04:56 +01:00
Tryibion 77c48c037e Add No parameters UI to particle effect and animated model 2025-01-09 19:19:30 -06:00
Tryibion e87bb2325b Standardize spacing for import path ui in assets. add import path ui to model prefab. 2025-01-07 20:43:57 -06:00
mafiesto4 b81435505d Merge branch 'scroll-script-add' of https://github.com/Tryibion/FlaxEngine into Tryibion-scroll-script-add 2024-12-16 23:16:04 +01:00
mafiesto4 222a614a2b Simplify and cleanup code 
#3096
 2024-12-16 23:14:50 +01:00
mafiesto4 bd4a042619 Merge branch 'ActorRefClickHighlight' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-ActorRefClickHighlight 2024-12-16 23:09:09 +01:00
mafiesto4 bbed25653a Merge branch 'fix-collection-value' of https://github.com/Tryibion/FlaxEngine into Tryibion-fix-collection-value 2024-12-16 22:58:02 +01:00
Tryibion f57f57423c Fix Collection value containers to use correct value assignment. 2024-12-13 14:31:44 -06:00
Tryibion a0216746b9 Add value null check in UiControlEditor to fix exception 2024-12-12 11:04:28 -06:00
Tryibion 76b84cca4e Scroll to script on add. 2024-12-12 10:40:08 -06:00
Tryibion 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
mafiesto4 139a431614 Fix crash due to alive reference to old asset validator 
#3081
 2024-12-10 17:01:41 +01:00
mafiesto4 35e9e048f2 Merge remote-tracking branch 'origin/master' into 1.10 2024-12-10 11:07:31 +01:00
mafiesto4 eb5dfcd6bf Add support for multi-control editing 
#1897
 2024-12-09 18:47:32 +01:00
mafiesto4 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
mafiesto4 b6d2a3683c Add ButtonAttribute to display methods in editor properties panel 
#1917
 2024-12-06 16:10:50 +01:00
mafiesto4 f0f631a48b Add splitter bar for resizing curve editor inside properties panel 2024-11-30 23:44:23 +01:00
mafiesto4 0509fe10be Add displaying whole curve in properties panel upon show 2024-11-28 18:27:45 +01:00
mafiesto4 6146ea89b3 Merge branch 'TerrainLayerNames' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-TerrainLayerNames 2024-11-26 15:59:01 +01:00
mafiesto4 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
Tryibion 1d631e91ce Disable add script item if it is not being added to a required actor. 2024-10-22 14:56:22 -05:00
xxSeys1 1fca41b31a code style fix 2024-10-09 18:29:48 +02:00
xxSeys1 8b3f1ca019 make "Edit Prefab" not change content panel file path 
If someone still wants to change the Content panel to the file path of the prefab, they can use the "Select Prefab" button
 2024-10-09 18:25:04 +02:00
Tryibion ecb80e0f34 Add context to drag drop for object ref editor. 2024-09-27 18:26:37 -05:00
Tryibion aded4bfdeb Add context to object referece control to narrow finding actors and scripts 2024-09-27 17:49:44 -05:00
mafiesto4 81d62756fb Merge remote-tracking branch 'origin/1.9' 2024-09-23 14:11:41 +02:00
mafiesto4 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
mafiesto4 e22f4a28bd Fix editor log spam by rebuilding layout when Custom Editor throws exception on update 
#2935
 2024-09-23 13:58:56 +02:00