Commit Graph

565 Commits

Author SHA1 Message Date
nick darnell
3907399c1d SlateGI - Disabling culling when we're on the fast path, adding some TODOs for clearing content in the futre instead.
[FYI] Matt.Kuhlenschmidt

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: nick.darnell
#ROBOMERGE-SOURCE: CL 7621559 via CL 7621561 via CL 7621562 via CL 7626302 via CL 7626474
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v385-7708028)

[CL 7730990 by nick darnell in Dev-Build branch]
2019-08-05 07:00:50 -04:00
nick darnell
dc728c76dd SlateGI - Disabling culling when we're on the fast path, adding some TODOs for clearing content in the futre instead.
[FYI] Matt.Kuhlenschmidt


#ROBOMERGE-SOURCE: CL 7621559 via CL 7621561 via CL 7621562 via CL 7626302
#ROBOMERGE-BOT: (v372-7473910)

[CL 7626474 by nick darnell in Main branch]
2019-07-25 10:51:20 -04:00
zzz77
97e4a99783 PR #6033: Fixes for IntelliSense (Contributed by zzz77)
#rb none
#rnx

[CL 7308593 by Ben Marsh in Dev-Build branch]
2019-07-15 10:09:44 -04:00
bob tellez
054191ac53 Partial merge. Will redo SClassViewer.cpp implementation since the structure is different in UE4/Main. All other changes came over cleanly
#UE4 Added AssetReferenceFilter. An editor feature to allow projects to specify a filter to disallow editor systems to form references between certain assets. Add a listener for UUnrealEdEngine::OnMakeAssetReferenceFilter which returns a subclass of IAssetReferenceFilter that was constructed with the supplied context. PassesFilter will be called on this filter object to determine if the reference is allowed. Currently respected by asset picker, class picker, details panels, and edgraph drag/drop operations.

#jira UE-75912

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 7046716 via CL 7046768
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v367-6836689)

[CL 7119872 by bob tellez in Dev-Build branch]
2019-06-21 01:14:14 -04:00
ben marsh
11f022162f Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) [at] 6944469
#rb none
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 6944849 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v367-6836689)

[CL 7089689 by ben marsh in Dev-Build branch]
2019-06-19 08:52:32 -04:00
bob tellez
396eacbdc1 Partial merge. Will redo SClassViewer.cpp implementation since the structure is different in UE4/Main. All other changes came over cleanly
#UE4 Added AssetReferenceFilter. An editor feature to allow projects to specify a filter to disallow editor systems to form references between certain assets. Add a listener for UUnrealEdEngine::OnMakeAssetReferenceFilter which returns a subclass of IAssetReferenceFilter that was constructed with the supplied context. PassesFilter will be called on this filter object to determine if the reference is allowed. Currently respected by asset picker, class picker, details panels, and edgraph drag/drop operations.

#jira UE-75912


#ROBOMERGE-SOURCE: CL 7046716
#ROBOMERGE-BOT: (v367-6836689)

[CL 7046768 by bob tellez in Main branch]
2019-06-17 13:36:16 -04:00
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
Ben Marsh
cfe09c649f Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 6922670 by Ben Marsh in Dev-Build branch]
2019-06-10 19:47:29 -04:00
lina halper
bab821de19 Copying //UE4/Dev-Anim to Dev-Main (//UE4/Dev-Main) [at] 6861656
#rb
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: lina.halper
#ROBOMERGE-SOURCE: CL 6863572 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v366-6836689)

[CL 6917136 by lina halper in Dev-Build branch]
2019-06-10 16:16:11 -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
chris gagnon
72ba51c5bd Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
#rb none


#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 6838042 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v366-6836689)

[CL 6874679 by chris gagnon in Dev-Build branch]
2019-06-07 05:27:42 -04:00
marc audy
3fc04f1c88 Copying //UE4/Dev-Framework to Dev-Main (//UE4/Dev-Main) [at] 6835245
#rb
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 6835252 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v366-6836689)

[CL 6873661 by marc audy in Dev-Build branch]
2019-06-07 05:00:15 -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
helge mathee
82b96435f1 #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: ben.marsh
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 6685421 via CL 6752148 via CL 6752571
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v365-6733468)

[CL 6762288 by helge mathee in Dev-Build branch]
2019-06-01 11:02:39 -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
helge mathee
127a071b6d #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: ben.marsh
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 6665480 via CL 6667941 via CL 6668063
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v363-6677109)

[CL 6709736 by helge mathee in Dev-Build branch]
2019-05-31 13:55:19 -04:00
Ben Marsh
4f8918bbe8 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 6646181 by Ben Marsh in Dev-Build branch]
2019-05-26 14:43:21 -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
jurre debaare
cd3d21c4ca Merging //Tasks/Fortnite/Dev-AlternativeSkinWeights/... to //Fortnite/Main/...
#rb Martin.Wilson

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jurre.debaare
#ROBOMERGE-SOURCE: CL 6396117 via CL 6396387 via CL 6396453
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 6457665 by jurre debaare in Dev-Build branch]
2019-05-15 03:31:00 -04:00
yatagarasu25
16f31c0df2 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: ben.marsh
#ROBOMERGE-AUTHOR: sebastian.nordgren
#ROBOMERGE-SOURCE: CL 6134169 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 6135818 by sebastian nordgren in Dev-Build branch]
2019-04-29 09:03:12 -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