Commit Graph

397 Commits

Author SHA1 Message Date
Wojtek Figat
fd4a5595c0 Merge branch 'editor-list-dragging' of https://github.com/MineBill/FlaxEngine into MineBill-editor-list-dragging 2023-11-07 10:21:57 +01:00
Wojtek Figat
1e9ded55b0 Fix missing xml doc 2023-11-06 14:09:39 +01:00
Wojtek Figat
e68330f5b5 Merge branch 'Visject-CommentOrder' of https://github.com/Chikinsupu/FlaxEngine into Chikinsupu-Visject-CommentOrder 2023-11-06 13:09:21 +01:00
Wojtek Figat
d79dd4aaf7 Add undo for Convert to Parameter connections change in #1671 2023-11-06 08:41:36 +01:00
Wojtek Figat
2c5a5acf33 Add maintaining new param id in undo #1671 2023-11-05 23:30:39 +01:00
Wojtek Figat
342360f537 Refactor #1671 2023-11-05 23:21:14 +01:00
Wojtek Figat
3ba8875121 Merge branch 'Visject-ConvertConstantToParameter' of https://github.com/Chikinsupu/FlaxEngine into Chikinsupu-Visject-ConvertConstantToParameter
# Conflicts:
#	Source/Editor/Surface/Archetypes/Constants.cs
2023-11-05 21:43:16 +01:00
Wojtek Figat
f9a9912895 Merge branch 'editor_binding_fixes' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-editor_binding_fixes 2023-11-05 21:39:24 +01:00
MineBill
df5dc0c284 Extract validation/item handling of AssetPicker in a separate class. 2023-10-31 16:32:57 +02:00
Nils Hausfeld
1f8da14780 - Alternative titles for comparisons 2023-10-25 11:53:43 +02:00
081648ef06 Fix common tooltips with hardcoded keybindings 2023-10-24 21:47:18 +03:00
Nils Hausfeld
ea00a448ef - Minor cleanup 2023-10-22 12:54:14 +02:00
Nils Hausfeld
7b2058d1b2 - Added alternative titles to some nodes 2023-10-22 12:37:51 +02:00
Nils Hausfeld
ec7840f36b - New comments now get spawned on top of other comments
- Commenting other comments now puts the spawned comment below the child comments
- Added Order Value to comments to serialize order
- Added backwards compatiblity to older editor versions
- Cleanup
- XML Comments
2023-10-21 16:06:28 +02:00
Nils Hausfeld
fa8b92a456 Adding the ability to order comments in visject 2023-10-21 14:18:30 +02:00
Nils Hausfeld
571f8febf4 - Moved convertible node file out of archetypes folder into surface folder to be more in line of the project structure (other special nodes like surfacecomment are also just in the surface folder)
- Cleanup
2023-10-21 13:11:42 +02:00
Nils Hausfeld
7cb4d27979 - Minor cleanup and comments 2023-10-19 17:23:34 +02:00
Nils Hausfeld
4efbed91a4 - Fixed a bug where the wrong boxes got connected
- Cleanup
2023-10-19 14:34:10 +02:00
Nils Hausfeld
ad6affc863 - More cleanup 2023-10-19 14:17:28 +02:00
Nils Hausfeld
aafdc64b68 - Cleanup
- Typo
2023-10-19 14:14:51 +02:00
Nils Hausfeld
41a7aff6d7 - Converting to parameter now also works in Particle and Visual Scripting editor 2023-10-19 14:10:10 +02:00
Nils Hausfeld
3afb6cc88e - Renamed ConstantNode to ConvertableNode
- Moved ConvertableNode into it's own class
- Added support for custom conversion code (currently only used by rotation)
- Added support for Texture, Normal Map, Cube Texture, Uint, Double, String, Quaternion/Rotation
2023-10-19 14:02:46 +02:00
Wojtek Figat
8b096a9286 Fixes 2023-10-18 10:52:36 +02:00
Wojtek Figat
8d9f4d72f5 Various stability improvements for Editor 2023-10-17 22:42:47 +02:00
Nils Hausfeld
447030f53a - Spawned get parameter node now reconnects to all boxes from the converted node 2023-10-16 20:19:18 +02:00
Nils Hausfeld
a96445d8bb Merge branch 'master' into Visject-ConvertConstantToParameter 2023-10-16 19:34:22 +02:00
Wojtek Figat
2f3929efe0 Fix Height Layer Blend material node codegen when alpha is constant
#1705
2023-10-14 18:03:51 +02:00
Chandler Cox
28d6fe84ef Small change 2023-10-11 16:17:59 -05:00
Chandler Cox
8eb9df9a18 Change new anim port to TryGetBox. 2023-10-11 15:57:02 -05:00
Nils Hausfeld
dcec847d50 - Basic constants can now be converted to parameters 2023-10-11 20:01:56 +02:00
Wojtek Figat
3ac7c4e0ee Codestyle fix 2023-10-09 23:21:02 +02:00
Wojtek Figat
dafc8a61c1 Merge branch 'AnimationSampleNode-AnimationAssetReferencePort' of https://github.com/Chikinsupu/FlaxEngine into Chikinsupu-AnimationSampleNode-AnimationAssetReferencePort 2023-10-09 22:24:57 +02:00
Wojtek Figat
09f2be907e Merge remote-tracking branch 'origin/master' into 1.7
# Conflicts:
#	Flax.flaxproj
2023-10-09 12:40:47 +02:00
Wojtek Figat
dc59a38b64 Merge branch 'Visject-BendingPreviewConnectionFix' of https://github.com/Chikinsupu/FlaxEngine into Chikinsupu-Visject-BendingPreviewConnectionFix 2023-10-08 11:16:38 +02:00
Wojtek Figat
a9231d5e08 Merge branch 'Visject-ContextSensitiveParameterSupport' of https://github.com/Chikinsupu/FlaxEngine into Chikinsupu-Visject-ContextSensitiveParameterSupport 2023-10-08 11:15:26 +02:00
Nils Hausfeld
d41ec15606 - Implemented support for surface parameters 2023-10-07 13:57:05 +02:00
Nils Hausfeld
e4bd84bd6a - Fixed items in Surface Paramter Group getting duplicated over and over again 2023-10-06 23:02:00 +02:00
Nils Hausfeld
78c0e1dd92 - Visual fix to preview connection when pulling out of an input box or a reroute node 2023-10-06 18:16:04 +02:00
Nils Hausfeld
c4136dcaa9 Merge branch 'master' into AnimationSampleNode-AnimationAssetReferencePort 2023-10-06 17:50:36 +02:00
Nils Hausfeld
63d57151d0 - Minor cleanup 2023-10-06 17:50:19 +02:00
Wojtek Figat
bc291f592e Merge branch 'improved-scrolling' of https://github.com/ontrigger/FlaxEngine into ontrigger-improved-scrolling 2023-10-06 16:58:36 +02:00
Nils Hausfeld
ea355dd560 - Title of Animation sample node gets updated when connection of animation reference box changes 2023-10-06 15:30:52 +02:00
Wojtek Figat
ae308ab27a Minor code cleanup #1619 2023-10-06 15:25:25 +02:00
Nils Hausfeld
e07ae33040 - Added input box to animation sample node to receive animation assets
- AssetSelect not gets shown or hidden depending on if the box has a connection
- Animation asset reference box now overrides asset picker
2023-10-06 15:23:43 +02:00
Nils Hausfeld
dc6a2d4d25 - Cleanup and comments 2023-10-05 18:11:08 +02:00
Nils Hausfeld
d7ade326a9 - Implemented automatic casting to visject 2023-10-05 18:04:55 +02:00
Wojtek Figat
e6c45fccb3 Merge remote-tracking branch 'origin/master' into 1.7
# Conflicts:
#	Source/Engine/Level/Actors/AnimatedModel.cpp
2023-10-05 10:44:03 +02:00
Wojtek Figat
1838c7bba7 Minor cleanup 2023-10-04 23:21:40 +02:00
Wojtek Figat
92f677f238 Codestyle formatting #1522 2023-10-04 22:25:27 +02:00
Wojtek Figat
2e6fa8fc25 Merge branch 'Visject-ContextSensitiveNodes' of https://github.com/Chikinsupu/FlaxEngine into Chikinsupu-Visject-ContextSensitiveNodes 2023-10-04 22:15:31 +02:00