Commit Graph

109 Commits

Author SHA1 Message Date
Wojtek Figat
c32add161b Add option to copy/paste value from Visject box via context menu 2021-05-15 16:33:32 +02:00
W2.Wizard
887b52c18a Merge branch '1.2' into IconOverhaul 2021-05-13 15:21:36 +02:00
W2Wizard
d54efc73f1 Adapt to new spritehandle names
Lots of files! However only change was renaming the icons overall.
2021-05-13 15:16:45 +02:00
Wojtek Figat
28969a7de4 Fix EnumComboBox to support negative items as a cost of lack of uint64 support 2021-05-02 12:04:14 +02:00
Wojtek Figat
e2789214ae Refactor Editor Utils into separate VariantUtils 2021-05-02 11:24:51 +02:00
Jean-Baptiste Perrier
cd707eb5a4 Fix "This" node output type. 2021-04-11 12:16:03 +02:00
Wojtek Figat
a2825eac87 Add support uint64 values in EnumComboBox 2021-03-31 12:15:57 +02:00
Wojtek Figat
40c537d114 Merge branch 'master' into 1.2
# Conflicts:
#	Source/Engine/Platform/Network.h
2021-03-22 11:26:36 +01:00
Wojtek Figat
78f8066d4d Fix code style 2021-03-22 10:24:22 +01:00
Wojtek Figat
b3e16a6b66 Fix material not updating on connection removal
#372
2021-03-22 10:24:15 +01:00
Wojtek Figat
691df4cb80 Fix Dpi issues when RootWindow is null
Fix #344
2021-03-17 00:04:16 +01:00
Wojtek Figat
c7c339957b Merge remote-tracking branch 'origin/1.1' into 1.2
# Conflicts:
#	Source/Editor/Editor.Build.cs
2021-03-15 09:38:58 +01:00
Wojtek Figat
cc201e198d Add Switch platform 2021-03-09 14:26:30 +01:00
Wojtek Figat
81f3a65a5f Merge branch 'fix-per-window-dpi' of git://github.com/stefnotch/FlaxEngine into stefnotch-fix-per-window-dpi
# Conflicts:
#	Source/Editor/Utilities/Utils.cs
#	Source/Editor/Windows/Assets/MaterialWindow.cs
#	Source/Editor/Windows/Assets/ParticleEmitterWindow.cs
#	Source/Engine/Platform/Linux/LinuxWindow.cpp
#	Source/Engine/Platform/Windows/WindowsWindow.cpp
2021-03-08 20:50:31 +01:00
Wojtek Figat
7cb0ac3603 Fix marking asset as edited when using Multi Blend node positions in Anim Graph
Closes #251
2021-03-07 10:31:31 +01:00
Wojtek Figat
dd1dd2ef8a Add Particle Radius to in-built particle attributes 2021-03-05 14:33:31 +01:00
Wojtek Figat
1dee615d6e Add Volumetric Fog support for particles to modify local fog 2021-03-05 13:58:15 +01:00
Wojtek Figat
fbecd01435 Merge branch 'visject-improvements-6' of git://github.com/stefnotch/FlaxEngine into stefnotch-visject-improvements-6 2021-02-27 20:44:29 +01:00
stefnotch
f3c608f2f3 Improve arrow key navigation 2021-02-26 19:09:59 +01:00
stefnotch
09f8ad948a Prevent multiple connections on reroute node 2021-02-26 19:08:25 +01:00
stefnotch
ebfa3822ef Fixes for the reroute node 2021-02-26 13:19:53 +01:00
stefnotch
0334329c50 Handle lost connections in reroute nodes
An alternative solution to that problem
2021-02-26 12:55:32 +01:00
stefnotch
70b0aa25b6 Undo-able reroute node adding 2021-02-26 11:14:22 +01:00
stefnotch
69162ad8d9 Fix visject connections redo
Previously, it would create double connections
2021-02-26 10:43:31 +01:00
stefnotch
9265f23681 Basic reroute nodes 2021-02-25 20:22:54 +01:00
stefnotch
bcc036f808 Hover over connections 2021-02-25 09:55:17 +01:00
stefnotch
1dbbbeced1 Specialized Visject Connection Broadphase Intersection 2021-02-24 21:05:10 +01:00
Wojtek Figat
5a9ca6f130 Merge remote-tracking branch 'origin/1.1' into linux-editor
# Conflicts:
#	Source/Engine/Core/Math/BoundingSphere.cs
#	Source/Engine/Debug/DebugDraw.cpp
#	Source/Engine/Platform/Win32/Win32Platform.cpp
#	Source/Engine/Platform/Win32/Win32Platform.h
2021-02-23 22:32:17 +01:00
Wojtek Figat
cf3ac7a26e Merge remote-tracking branch 'origin/master' into linux-editor
# Conflicts:
#	Source/Engine/Core/Math/Color.cs
#	Source/Engine/Navigation/Navigation.cpp
#	Source/Engine/Platform/Win32/Win32Platform.cpp
2021-02-23 22:29:07 +01:00
Wojtek Figat
24d31d024d Add Mask ZW node to all Visject surfaces 2021-02-23 13:57:34 +01:00
stefnotch
81fa876940 Drop unused boxes in Visject serialization 2021-02-23 11:33:51 +01:00
Wojtek Figat
09651fa0fd Merge branch 'CodeCleanUp' of git://github.com/W2Wizard/FlaxEngine into W2Wizard-CodeCleanUp 2021-02-21 20:19:07 +01:00
W2.Wizard
89734760fa Revert previous checks, revert switch intend 2021-02-21 19:48:23 +01:00
stefnotch
2498d1d4f2 Tweak items matching priority 2021-02-21 19:44:47 +01:00
W2.Wizard
35b687bf3d Additional cleanup
Cleaned up some additional stuff that I found
2021-02-21 18:17:35 +01:00
W2.Wizard
8b3fc9842d Apply review changes
Applied review changes and one additional skip of an unused variable
2021-02-21 17:03:58 +01:00
W2.Wizard
694b20148d Cleanup 5 2021-02-21 11:50:30 +01:00
W2.Wizard
20ba37e223 Cleanup 3 2021-02-21 11:09:04 +01:00
W2.Wizard
92fafe877c Cleanup 2 2021-02-21 10:23:01 +01:00
W2.Wizard
c475e83aa3 Added RGBToHSV 2021-02-20 15:44:06 +01:00
W2.Wizard
da24a474ea Add HSVToRGB 2021-02-19 18:23:23 +01:00
Wojtek Figat
32c5a84576 Revert "Fix right-click context menu for Visject Nodes"
This reverts commit a4763f630e.

It has been superseded by
ef2dbb7818
2021-02-18 11:32:11 +01:00
stefnotch
0b54691f07 Basic Visject box arrow key navigation 2021-02-17 22:36:11 +01:00
Wojtek Figat
312e4ad010 Merge branch 'master' into 1.1
# Conflicts:
#	Source/Engine/Content/JsonAsset.h
#	Source/Engine/Core/Config/Settings.h
2021-02-15 10:40:59 +01:00
Wojtek Figat
da784e98e5 Add Deformable material domain 2021-02-08 15:44:38 +01:00
stefnotch
8f8f0266ce Add DpiScale to RootWindow 2021-02-08 09:48:57 +01:00
stefnotch
f5b48e03e9 Per window DPI 2021-02-07 17:26:41 +01:00
Wojtek Figat
21b311df17 Merge branch 'ShaderNodes' of git://github.com/W2Wizard/FlaxEngine into W2Wizard-ShaderNodes 2021-02-03 23:13:55 +01:00
Wojtek Figat
23652d1bc5 Merge remote-tracking branch 'origin/master' into 1.1
# Conflicts:
#	Source/Engine/Input/Input.cpp
2021-02-02 10:29:52 +01:00
W2.Wizard
e75ca148c0 Added blackbody 2021-01-30 23:21:41 +01:00