Commit Graph

529 Commits

Author SHA1 Message Date
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
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
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
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
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
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
lina halper
f913a82f65 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: ben.marsh
#ROBOMERGE-AUTHOR: lina.halper
#ROBOMERGE-SOURCE: CL 5685272 via CL 5686776 via CL 5686808
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5689054 by lina halper in Dev-Build branch]
2019-04-02 13:26:53 -04:00
jason stasik
f4e33a3bd9 Remove unnecessary null check causing static analysis warning in SGraphPinClass
#jira UE-71984
#rb steve.robb
#lockdown cristina.riveron

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jason.stasik
#ROBOMERGE-SOURCE: CL 5556000 in //UE4/Release-4.22/... via CL 5556009
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

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

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

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: lina.halper
#ROBOMERGE-SOURCE: CL 5533952 via CL 5534171 via CL 5536205
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5545049 by lina halper in Dev-Build branch]
2019-03-25 17:32:38 -04:00
jason stasik
88469d6dab Fix 'Assign Asset from Content Browser' for Create Widget node
#jira UE-71511
#rb lauren.ridge
#lockdown cristina.riveron

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jason.stasik
#ROBOMERGE-SOURCE: CL 5534874 in //UE4/Release-4.22/... via CL 5534877
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5538905 by jason stasik in Dev-Build branch]
2019-03-25 16:59:56 -04:00
Ben Marsh
dece8de2d2 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 5095547 by Ben Marsh in Dev-Build branch]
2019-02-20 15:06:37 -05:00
Ben Marsh
c34dc5a8cf Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4932473 by Ben Marsh in Dev-Build branch]
2019-02-07 10:01:58 -05:00
Ben Marsh
bbb8057a5e Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4820573 by Ben Marsh in Dev-Build branch]
2019-01-26 14:33:56 -05:00
Ben Marsh
a3e87004d6 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4783611 by Ben Marsh in Dev-Build branch]
2019-01-23 10:59:53 -05:00
Ben Marsh
3e14e12a73 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4737894 by Ben Marsh in Dev-Build branch]
2019-01-16 19:30:43 -05:00
Ben Marsh
129aac0526 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4706788 by Ben Marsh in Dev-Build branch]
2019-01-10 20:03:35 -05:00
Ben Marsh
c09b6d7f18 Merge from //UE4/Main.
#rb none
#rnx

[CL 4701155 by Ben Marsh in Dev-Build branch]
2019-01-10 11:10:29 -05:00
Ben Marsh
287fa130a3 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4677654 by Ben Marsh in Dev-Build branch]
2019-01-02 20:42:29 -05:00
Ben Marsh
530369c613 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4662695 by Ben Marsh in Dev-Build branch]
2018-12-14 14:49:12 -05:00
Ben Marsh
0f022f2f46 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none

[CL 4502641 by Ben Marsh in Dev-Build branch]
2018-10-24 13:03:31 -04:00
Marc Audy
af90b7bcd4 Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main) @ 4395008
#rb
#rnx
#lockdown Nick.Penwarden

[CL 4395058 by Marc Audy in Main branch]
2018-09-25 10:11:35 -04:00