0ac3ab2329
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-11-19 18:30:08 +02:00
466f9a4797
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-11-11 21:40:06 +02: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
76247323eb
Merge branch 'BakeButtonGroups' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-BakeButtonGroups
2025-11-07 21:32:32 +01:00
Wojtek Figat
036d4b2f4b
Fix error when asset refs picker uses different types
2025-11-03 23:21:09 +01:00
Saas
35d6e5fd21
fix still being able to open/ close script editor with no fields
...
Introduces "CanOpenClose" to DropPanel.
If false, will ignore the user clicking on the header (or the arrow) to open or collapse the panel
2025-10-30 20:02:15 +01:00
22ba7f2ee5
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-10-24 18:31:50 +03: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
d323b1c7e2
move skylight and environment probe bake buttons into dedicated groups
2025-10-16 20:28:34 +02:00
Chandler Cox
7377bad721
Fix check method for type editor not working in a collection.
2025-10-14 21:20:22 -05:00
668a4dbb4d
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-10-14 01:09:26 +03: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
823ed247d2
Merge remote-tracking branch 'origin/master' into 1.11
...
# Conflicts:
# Source/Engine/Level/Actors/Sky.cpp
2025-10-03 22:37:32 +02:00
Wojtek Figat
028b5fedec
Use right-click only on GPUTextureEditor context menu
2025-09-30 23:37:15 +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
Wojtek Figat
284aeca51a
Merge branch 'audio-events' of https://github.com/Tryibion/FlaxEngine into Tryibion-audio-events
2025-09-23 17:07:18 +02:00
Wojtek Figat
62fd8ac967
Merge branch 'fix-dup&remove' of https://github.com/Tryibion/FlaxEngine into Tryibion-fix-dup&remove
2025-09-21 21:02:17 +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
Saas
de2ee36529
fix naming lol
2025-09-16 22:07:42 +02:00
Saas
eea44ac897
remove search query highlights showing on create new script item
2025-09-16 22:06:49 +02:00
Saas
c124713e99
remove create new script items when searchbox is cleared
2025-09-16 22:05:28 +02:00
Wojtek Figat
afdd264e63
Fix compilation of Editor in Release mode
2025-09-16 16:34:58 +02:00
Wojtek Figat
521518bde4
Add hack to use GPUTextureEditor on ref pickers
2025-09-16 00:15:58 +02:00
Wojtek Figat
56077a268a
SImplify and cleanup GPUTexture editor #3452 #3194
2025-09-16 00:15:48 +02:00
Wojtek Figat
a471861e92
Fix editing UI Brush in prefabs
...
#3501
2025-09-12 23:15:13 +02:00
1d8f221f1b
Merge remote-tracking branch 'origin/1.11' into sdl_platform_1.11
...
# Conflicts:
# Source/Engine/Platform/Windows/WindowsPlatform.cpp
# Source/Tools/Flax.Build/Build/ProjectTarget.cs
# Source/Tools/Flax.Build/Configuration.cs
2025-09-07 19:31:16 +03:00
b443b74d18
Merge branch 'master' into sdl_platform
...
# Conflicts:
# Source/Editor/GUI/Docking/DockHintWindow.cs
# Source/Editor/Options/InterfaceOptions.cs
2025-09-07 19:02:09 +03: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
Wojtek Figat
848cc38bf1
Fix reverting prefab object reference in nested prefabs
...
#3255
2025-08-29 22:04:03 +02:00
Wojtek Figat
91cd1e8065
Fix regression from ef7c7f2d30 to ignore unmodified scripts in diff
2025-08-29 21:49:14 +02:00
Wojtek Figat
d47ac95681
Modernize the code to use unified scene access #3513
2025-08-28 23:48:25 +02:00
Wojtek Figat
703e0cb7ca
Merge branch 'show-prefab-add-delete' of https://github.com/Tryibion/FlaxEngine into Tryibion-show-prefab-add-delete
2025-08-28 22:56:22 +02:00
Wojtek Figat
ef7c7f2d30
Fix script fields prefab diff showing and reverting with undo
...
#3594
2025-08-28 22:52:46 +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
Wojtek Figat
633b5857c9
Merge branch 'AutoSizePropertiesSplitter' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-AutoSizePropertiesSplitter
2025-08-24 13:59:16 +02:00
Chandler Cox
0dc1e04c89
Add slider to audio debug editor for selecting time.
2025-08-01 15:07:49 -05:00
Chandler Cox
1fb6586dff
Add collection item duplication.
2025-07-19 16:09:33 -05:00
Wojtek Figat
2dd34b288c
Merge remote-tracking branch 'origin/master' into 1.11
2025-07-04 12:05:19 +02:00
90b2fded48
Merge remote-tracking branch 'origin/master' into sdl_platform
...
Build Android / Game (Android, Release ARM64) (push) Has been cancelled
Build iOS / Game (iOS, Release ARM64) (push) Has been cancelled
Build Linux / Editor (Linux, Development x64) (push) Has been cancelled
Build Linux / Game (Linux, Release x64) (push) Has been cancelled
Build macOS / Editor (Mac, Development ARM64) (push) Has been cancelled
Build macOS / Game (Mac, Release ARM64) (push) Has been cancelled
Build Windows / Editor (Windows, Development x64) (push) Has been cancelled
Build Windows / Game (Windows, Release x64) (push) Has been cancelled
Cooker / Cook (Mac) (push) Has been cancelled
Tests / Tests (Linux) (push) Has been cancelled
Tests / Tests (Windows) (push) Has been cancelled
# Conflicts:
# Source/Editor/Windows/SceneTreeWindow.cs
2025-07-03 22:05:29 +03: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
1586bb0702
Merge remote-tracking branch 'origin/master' into sdl_platform
2025-06-26 15:31:59 +03:00
Wojtek Figat
d1c43ec1fe
Merge remote-tracking branch 'origin/master' into 1.11
2025-06-25 10:48:11 +02:00
