Commit Graph

822 Commits

Author SHA1 Message Date
Wojtek Figat
2fc95bdf57 Merge remote-tracking branch 'origin/master' into 1.12
# Conflicts:
#	Content/Editor/MaterialTemplates/Deformable.shader
#	Flax.flaxproj
#	Source/Engine/Content/Content.h
#	Source/Engine/Serialization/JsonTools.cpp
2026-04-01 17:14:21 +02:00
Wojtek Figat
2d0da37907 Remove ComparisonNode from #3540 that is impl in #3866 2026-04-01 16:26:47 +02:00
Wojtek Figat
42ec33bd9a Fix auto-sizing nodes with hidden default value fields (eg, comparison node)
#3540
2026-04-01 16:25:33 +02:00
Wojtek Figat
806027408a Merge branch 'visject-larger-inputs' of https://github.com/Zode/FlaxEngine into Zode-visject-larger-inputs 2026-04-01 16:02:10 +02:00
Wojtek Figat
7737dbc77f Various minor fixes
#3866
2026-04-01 15:58:31 +02:00
Wojtek Figat
9d9d582598 Add undo to preserve connections when changing parameter in param node 2026-04-01 09:50:02 +02:00
Wojtek Figat
f1796dc8c8 Fix and improve layout of various Visject nodes and elements
#3866
2026-04-01 09:49:29 +02:00
Wojtek Figat
ebb4ff1dc2 Move UseFixedSize property from node archetype to flags and optimize unnecessary layouts during node loading
#3866
2026-03-31 22:47:10 +02:00
Wojtek Figat
ea5e7f1416 Add hover highlight to Visject surface boxes
#3866
2026-03-31 21:46:21 +02:00
Wojtek Figat
917e62621d Restore textures background back to Visject surface
#3866
2026-03-31 21:45:29 +02:00
Wojtek Figat
a88e3265cd Merge branch 'VISjectIsNowMoreVISuallyAppealingAndLegible' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-VISjectIsNowMoreVISuallyAppealingAndLegible 2026-03-31 15:16:55 +02:00
Saas
bda0dee371 fix curve node 2026-03-28 22:32:55 +01:00
Saas
ec756fe626 fix custom code node size 2026-03-28 22:16:31 +01:00
Saas
b78ff57f6a fix custom code nodes 2026-03-28 22:04:41 +01:00
Saas
9fa9e75e08 fix decorator size when surface is loaded 2026-03-28 21:28:09 +01:00
Saas
f26dbf530c fix skeleton blend mask node to resize when asset reference is (dis-) connected 2026-03-28 13:47:14 +01:00
Wojtek Figat
eab7794e3b Merge remote-tracking branch 'origin/master' into 1.12
# Conflicts:
#	Source/Engine/Content/Storage/FlaxStorage.cpp
#	global.json
2026-03-26 23:44:33 +01:00
Wojtek Figat
a04995174f Merge branch 'RipAppartAndConnectConnectionsVisject' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-RipAppartAndConnectConnectionsVisject
# Conflicts:
#	Source/Editor/Surface/VisjectSurface.Input.cs
2026-03-25 15:49:46 +01:00
Wojtek Figat
707d19284d Merge branch 'FocusSelectedVJControls' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-FocusSelectedVJControls 2026-03-25 14:56:27 +01:00
Wojtek Figat
935645d553 Merge branch 'PackUnpackAlternativeNodeTitles' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-PackUnpackAlternativeNodeTitles 2026-03-25 14:44:32 +01:00
Wojtek Figat
0770f4a216 Merge branch 'VisjectFixes' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-VisjectFixes 2026-03-25 14:43:27 +01:00
Wojtek Figat
f3c957481c Merge remote-tracking branch 'origin/master' into 1.12
# Conflicts:
#	Source/Editor/GUI/Dialogs/ColorPickerDialog.cs
#	Source/Editor/GUI/Dialogs/ColorSelector.cs
2026-03-24 23:41:58 +01:00
Wojtek Figat
fa17d83501 Fix showing internal surface parameters (eg. Base Model in Anim Graph)
#3936
2026-03-24 18:25:40 +01:00
Saas
a346e258d3 make "Flow" group archetype color more legible 2026-03-21 12:53:10 +01:00
Saas
c673e9f52d minor fixes 2026-03-20 20:18:12 +01:00
Saas
1bd86ca28b temporary fix for "Copy Node" node size 2026-03-20 20:17:10 +01:00
Saas
4594a84753 disable vertex snapping for Blend Points of Animation Blend 1D and 2D 2026-03-20 19:07:11 +01:00
Saas
a1af870874 fix surface elements resizing the node 2026-03-20 19:01:52 +01:00
Saas
d5d10aa329 fix handling controls during resizing 2026-03-15 19:53:09 +01:00
Saas
5b2b1930d2 fix Particle Emitter node to not auto resize 2026-03-15 17:03:01 +01:00
Saas
5655cc8f42 account for surface node elements when auto resizing 2026-03-15 16:59:09 +01:00
Saas
8bad080d59 Merge remote-tracking branch 'upstream/master' into VISjectIsNowMoreVISuallyAppealingAndLegible 2026-03-15 14:43:11 +01:00
Saas
0237235dcb draw close button using Render2D to make it look good even when zoomed in a lot 2026-03-15 14:41:50 +01:00
Saas
5ec018b904 fix particle module changing size after certain user actions 2026-03-14 19:05:35 +01:00
Saas
f2a13b64d4 fix reroute node output box moving on connection change 2026-03-14 19:00:12 +01:00
Saas
44ecac7ffc make debug text more legible 2026-03-14 16:52:56 +01:00
Saas
60076d48c7 fix box alignment for nodes with fixed size and adjust some node sizes 2026-03-14 16:38:56 +01:00
Saas
2fbeac6077 disable decorator node shadows 2026-03-14 16:29:43 +01:00
Saas
0cec65f35f disable vertex snapping while drawing box to fix snapping artefacts when zooming surface 2026-03-14 14:46:10 +01:00
Saas
fcdd05dede fix straight connection sprite rotation offset at some angles 2026-03-14 14:20:30 +01:00
Saas
e008c7e2b4 fix behavior tree nodes 2026-03-14 14:20:00 +01:00
Saas
d3891688f0 fix boxes positioning and remove unused constants 2026-03-13 21:59:53 +01:00
Wojtek Figat
3cfa110a48 Merge remote-tracking branch 'origin/master' into 1.12
# Conflicts:
#	Source/Editor/Options/InterfaceOptions.cs
#	Source/Engine/Audio/OpenAL/AudioBackendOAL.cpp
#	Source/Engine/Graphics/Graphics.cpp
#	Source/Engine/GraphicsDevice/Vulkan/CmdBufferVulkan.cpp
#	Source/Engine/GraphicsDevice/Vulkan/CmdBufferVulkan.h
#	Source/Engine/GraphicsDevice/Vulkan/Config.h
#	Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.cpp
#	Source/Engine/GraphicsDevice/Vulkan/GPUDeviceVulkan.h
#	Source/Engine/GraphicsDevice/Vulkan/QueueVulkan.cpp
2026-03-10 15:08:43 +01:00
Wojtek Figat
57489abc3a Minor adjustment to #3934 2026-03-08 22:37:17 +01:00
Wojtek Figat
200aca93d3 Merge branch 'CopyParameterNames' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-CopyParameterNames 2026-03-08 22:33:19 +01:00
Wojtek Figat
3a651bc660 Merge branch 'ClearerParticleAgeNodes' of https://github.com/xxSeys1/FlaxEngine into xxSeys1-ClearerParticleAgeNodes 2026-03-08 22:25:20 +01:00
Wojtek Figat
e710a6e2d1 Adjust naming 2026-03-08 22:13:31 +01:00
Saas
64c2d64d84 increase distante for slot into connection feature 2026-03-05 20:14:48 +01:00
Saas
a9c510c296 tweak some group archetype colors 2026-03-05 19:49:29 +01:00
Saas
1ef35c3f94 clear up naming of "Pre-skinning Local Vertex Pos" 2026-03-04 23:57:21 +01:00