536 Commits

Author SHA1 Message Date
Rolando Caloca
aa0d2303d6 Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) @ 6944469
#rb none
#rnx

[CL 6944849 by Rolando Caloca in Main branch]
2019-06-11 18:27:07 -04:00
alexander sanoja
297898bebb Fixed the strange color change in UI when selecting a variable in multiple editors.
#jira UE-75371
#rb jason.stasik
[FYI] matt.hoffman

#ROBOMERGE-OWNER: Alexander.Sanoja
#ROBOMERGE-AUTHOR: alexander.sanoja
#ROBOMERGE-SOURCE: CL 6840378 in //UE4/Dev-Editor/...
#ROBOMERGE-BOT: ENGINE (Dev-Editor -> Main) (v366-6836689)

[CL 6894969 by alexander sanoja in Main branch]
2019-06-07 15:32:20 -04:00
JeanMichel Dignard
0f9ad96858 Copying //UE4/Dev-Enterprise @ cl 6890376 to Dev-Main (//UE4/Dev-Main)
#lockdown nick.penwarden
#rb none

[CL 6890764 by JeanMichel Dignard in Main branch]
2019-06-07 11:22:52 -04:00
Lina Halper
b0bdc590d5 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim)
#lockdown: thomas.sarkanen
#fyi: Laurent.Delayen
#rb: none

[CL 6861656 by Lina Halper in Dev-Anim branch]
2019-06-06 12:33:54 -04:00
helge mathee
6014eee653 #jira UE-75162
ControlRig: Support for comment blocks
Comments were not part of the MVC layer - this change is adding them back in.

#rb none

Merging

//Tasks/Fortnite/Dev-UEA-ControlRig/...

to //Fortnite/Main/Dev-UEA-ControlRig/...

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 6685421 via CL 6752148 via CL 6752571
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6795234 by helge mathee in Dev-Anim branch]
2019-06-03 08:37:46 -04:00
helge mathee
c5bdf9c559 #jira UE-75098
ControlRig: Visually looping connections

#rb lina.halper

Merging

//Tasks/Fortnite/Dev-UEA-ControlRig/Engine/Source/Editor/GraphEditor/Private/SGraphPin.cpp

to //Tasks/Fortnite/Dev-UEA-ControlRig/Engine/Source/Editor/GraphEditor/Private/SGraphPin.cpp

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 6665480 via CL 6667941 via CL 6668063
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6784581 by helge mathee in Dev-Anim branch]
2019-06-03 05:53:35 -04:00
matt hoffman
6cdb644209 This is a significant overhaul to the Curve Editor used by Sequencer which adds a plugin-based architecture and extensibility. New tools and toolbar buttons can be added to all usages of the curve editor via user plugins, and the different views for data can be created modularly so new implementations of the editor can register their own way of drawing their data and the tools should just work. Additionally, you can now write your own filters to operate on curve editor data for custom implementations of smoothing, key generation, etc.
The curve editor supports three view types by default - an absolute view (default, matches old behavior), a stacked view and a normalized view. Stacked views draw each curve separately (so non-overlapping) and normalized against their own min/max values. The normalized view draws all curves overlapping with each one normalized against its own min/max values.

A tree view has been added to help effectively manage large numbers of curves. Selecting curves in the treeview controls which curves are visible in the view area. The treeview also supports pinning curves. These pinned curves will always be visible regardless of your selection in the tree view.

A transform tool and a retiming tool have been implemented (via a plugin) which is enabled by default. The transform tool allows you to do a marquee selection of keys and then translate and scale the positions of these keys. The retiming tool allows you to create a 1 dimensional lattice to adjust the timing of your keys with a linear falloff between each lattice point. These tools work across multiple views at the same time which is especially useful if you are representing one dimensional data (such as event keys) in a view, as it allows you to adjust this data at the same time as your animation curves. A smoothing filter has been implemented (via a plugin) to allow running highpass and lowpass filters on your keys.

Opening the curve editor in Sequencer/UMG now creates a separate dockable tab which can be resized and docked as desired. A time slider has been added to the Curve Editor which is synchronized to the playback time in Sequencer. This allows you to scrub time in the curve editor without having to find the Sequencer window and adjust time there while looking at your keys and previewing your animation in the viewport at the same time.

Rudimentary support has been added for saving and later restoring a set of curves in your current session. This allows you to do a rudimentary copy/paste of entire curves but can also be useful for saving a curve, making adjustments to it and then deciding you want to go back - simply reapply the saved curve! Each curve added supports an intention name (such as "Location.X" or "FieldOfView"), and these intention names will be used when trying to apply curves. This allows you to reliably take all of the curves of a transform on one object and apply them to another object (and ensure that Location.X gets applied to the new Location.X, etc.) this can be helpful if you have a mixed set of curves buffered (such as a location and a field of view). In the event that no curves match by intention you can store and apply a single curve at a time from any intention to any other intention.

The Curve Asset editors (float, vector and color curve assets) have been changed to use the new editor. They support the same treeviews, filtering and tools that the Sequencer editor does. In addition, the Color Curve asset editor adds an additional view which provides a 1 dimensional gradient editor as an easier way to visualize and edit colors instead of the channels individually.


#rb Max.Chen, Andrew.Rodham

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: matt.hoffman
#ROBOMERGE-SOURCE: CL 6631811 via CL 6633746 via CL 6633863
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim) (v365-6733468)

[CL 6751117 by matt hoffman in Dev-Anim branch]
2019-05-31 18:19:48 -04:00
Thomas Sarkanen
0446365f17 More fixes for anim montages
Object graph pins now support DisallowedClasses.
Exposed node property pin metadata correctly in anim nodes.
Fixed ensures in sequence player.

#jira UE-65838 - Supplying a montage to a sequence player can crash
#rb Jurre.deBaare

[CL 6534131 by Thomas Sarkanen in Dev-Anim branch]
2019-05-16 09:58:37 -04:00
jurre debaare
dbeec7eec3 Merging //Tasks/Fortnite/Dev-AlternativeSkinWeights/... to //Fortnite/Main/...
#rb Martin.Wilson

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 6396117 via CL 6396387 via CL 6396453
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6458022 by jurre debaare in Dev-Anim branch]
2019-05-15 03:35:08 -04:00
yatagarasu25
622561b712 PR #5627: Fixed Microsoft mouse scroll wheel issue in blueprint editor. (Contributed by yatagarasu25)
Reimplemented according to comment from author.


#rb sebastian.nordgren

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: sebastian.nordgren
#ROBOMERGE-SOURCE: CL 6134169 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 6135811 by sebastian nordgren in Dev-Anim branch]
2019-04-29 09:02:56 -04:00
helge mathee
82a3a4357f Merging //Tasks/Fortnite/Dev-UEA-ControlRig/... to //Fortnite/Main/...
#UEA-425 - Support for node colors within Control Rig
#UEA-387 - Mutable and Non-Mutable nodes (with or without execute pin)
#UEA-390 - Passing the hierarchy as part of the execute pin
#UEA-385 - Control Rig Execution Stack UI
#UEA-381 - Remove notion of base hierarchy for now - simplify hierarchy passing
#UEA-398 - Use execute pin icon for execute pins
#UEA-399 - New Get / Set bone transform units for Control Rig
#UEA-402 - Default to show rig graph when opening Control Rig Editor
#UEA-404 - Prettify labels in Execution Stack view
#UEA-405 - New Bone Name Searchable Combo box
#UEA-406 - Unify terminology from "joint" to "bone"
#UEA-407 - Removed Control Rig variable UI
#UEA-408 - Support for compiler warnings & errors on nodes
#UEA-409 - Unit tests for topological editing of graph
#UEA-411 - Support for keyword based search when looking for nodes
#UEA-413 - Refactored all math nodes & added unit tests per node
#UEA-415 - Set opacity on nodes based on execution state (non-executing nodes are faded)
#UEA-434 - Show compiler warnings / errors in execution stack view
#UEA-440 - Support for drag&drop from hierarchy view into graph view

#rb: Thomas.Sarkanen, Helge.Mathee
[FYI] Thomas.Sarkanen, Helge.Mathee
#jira: many

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: lina.halper
#ROBOMERGE-SOURCE: CL 5685272 via CL 5686776 via CL 5686808
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5690133 by helge mathee in Dev-Anim branch]
2019-04-02 14:41:34 -04:00
jason stasik
dafbe54986 Remove unnecessary null check causing static analysis warning in SGraphPinClass
#jira UE-71984
#rb steve.robb
#lockdown cristina.riveron

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: jason.stasik
#ROBOMERGE-SOURCE: CL 5556000 in //UE4/Release-4.22/... via CL 5556009
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5579830 by jason stasik in Dev-Anim branch]
2019-03-27 01:01:04 -04:00
lina halper
ea9669385d - Fixed memory corruption when adding
- Control Rig node watch support for quick debugging

#rb: Thomas.Sarkanen
#code review: helge.mathee
#jira: none

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: lina.halper
#ROBOMERGE-SOURCE: CL 5533952 via CL 5534171 via CL 5536205
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5545103 by lina halper in Dev-Anim branch]
2019-03-25 17:33:10 -04:00
jason stasik
13ce741c26 Fix 'Assign Asset from Content Browser' for Create Widget node
#jira UE-71511
#rb lauren.ridge
#lockdown cristina.riveron

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: jason.stasik
#ROBOMERGE-SOURCE: CL 5534874 in //UE4/Release-4.22/... via CL 5534877
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5538863 by jason stasik in Dev-Anim branch]
2019-03-25 16:59:46 -04:00
lina halper
8b50421947 UE4.22 - Deprecate ENQUEUE_UNIQUE_RENDER_COMMAND and variants
#rb none
#jira

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 5073805 in //UE4/Release-4.22/... via CL 5073858
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)
#FYI: rolando.caloca

[CL 5144020 by lina halper in Dev-Anim branch]
2019-02-22 11:00:25 -05:00
rolando caloca
438549228a UE4.22 - Remove almost all of ENQUEUE_UNIQUE_RENDER_COMMAND_TWOPARAMETER
#rb none
#jira
#rnx

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 5054105 in //UE4/Release-4.22/... via CL 5054376
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5131575 by rolando caloca in Dev-Anim branch]
2019-02-22 02:28:01 -05:00
dan oconnor
0a1d6d5f2f Fixed crash in SGraphNode related to tooltips. SGraphNodeK2Base had tooltip related code that kept the widget alive. Added some safety mechanisms to detect this state
#jira UE-49458
#rb Michael.Noland

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: dan.oconnor
#ROBOMERGE-SOURCE: CL 4923219 in //UE4/Release-4.22/... via CL 4923222
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5018428 by dan oconnor in Dev-Anim branch]
2019-02-16 01:38:32 -05:00
Marcus Wassmer
68f340a63c Merging //UE4/Dev-Main@4825910 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
KNOWN BROKEN DO NOT SYNC
#lockdown rolando.caloca

[CL 4827063 by Marcus Wassmer in Dev-Rendering branch]
2019-01-28 21:04:21 -05:00
Thomas Sarkanen
cc942a3341 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4768627
#rb none
#jira none

[CL 4769629 by Thomas Sarkanen in Dev-Anim branch]
2019-01-22 06:48:04 -05:00
Marcus Wassmer
e83575daa4 Merging //UE4/Dev-Main@4754280 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
Major update is from Niagara stream.

[CL 4757171 by Marcus Wassmer in Dev-Rendering branch]
2019-01-18 18:16:57 -05:00
Thomas Sarkanen
f290af65ae Fixed incorrect spawn location for dragged assets in anim blueprints
#jira UE-64849 - Dragging Anim Sequence onto Input for Node in AnimGraph spawns node far off screen
#rb Jurre.deBaare

[CL 4751632 by Thomas Sarkanen in Dev-Anim branch]
2019-01-18 11:19:48 -05:00
Thomas Sarkanen
a4e6318ff3 Fix assets being dragged over pins displaying incorrect message
Pins were only setting tooltip on 'enter', while nodes and graphs set it on 'hover'. Switched pins to hover as well.

#jira UE-61770 - Dragging an animation asset onto a node in an Animation Blueprint shows incorrect mouse decorator and says that the node cannot play it
#rb Jurre.deBaare

[CL 4751617 by Thomas Sarkanen in Dev-Anim branch]
2019-01-18 11:19:09 -05:00
Marcus Wassmer
fee98d3ca5 Merging //UE4/Dev-Main@4729937 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none

[CL 4730169 by Marcus Wassmer in Dev-Rendering branch]
2019-01-15 18:30:06 -05:00
Marcus Wassmer
a8d6cc952b Merging //UE4/Dev-Main@4700769 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none

[CL 4729861 by Marcus Wassmer in Dev-Rendering branch]
2019-01-15 18:04:38 -05:00
Thomas Sarkanen
b709a10f4c Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4708558
#rb none
#jira none
#lockdown Laurent.Delayen

[CL 4708630 by Thomas Sarkanen in Dev-Anim branch]
2019-01-11 07:37:39 -05:00