Commit Graph

9 Commits

Author SHA1 Message Date
aurel cordonnier
50944fd712 Merge UE5/RES @ 16162155 to UE5/Main
This represents UE4/Main @ 16130047 and Dev-PerfTest @ 16126156

[CL 16163576 by aurel cordonnier in ue5-main branch]
2021-04-29 19:32:06 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
ryan durand
0f0464a30e Updating copyright for Engine Runtime.
#rnx
#rb none


#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869210 via CL 10869511 via CL 10869900
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870549 by ryan durand in Main branch]
2019-12-26 14:45:42 -05:00
Marc Audy
8df336162c Copying //UE4/Dev-Anim to Dev-Main (//UE4/Dev-Main) @ 8782600
#rb
#rnx

[CL 8783278 by Marc Audy in Main branch]
2019-09-17 19:12:19 -04:00
helge mathee
a6a2a333c0 Final copy-up for Control Rig Task Stream.
Merging using Fortnite_Main<->Fortnite_ControlRig

#rb none


#ROBOMERGE-OWNER: helge.mathee
#ROBOMERGE-AUTHOR: helge.mathee
#ROBOMERGE-SOURCE: CL 7321580 via CL 7323175
#ROBOMERGE-BOT: (v371-7306989)

[CL 7323351 by helge mathee in Main branch]
2019-07-16 11:49:59 -04:00
helge mathee
d8ccb3d794 Control Rig MVC Refactoring
Merging

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

to //Fortnite/Main/...

[FYI] lina.halper


#ROBOMERGE-SOURCE: CL 6597997 via CL 6601432
#ROBOMERGE-BOT: (v351-6581450)

[CL 6601520 by helge mathee in Main branch]
2019-05-21 19:25:23 -04:00
Ben Marsh
7598af0532 Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden

[CL 4662404 by Ben Marsh in Main branch]
2018-12-14 13:41:00 -05:00
Ben Marsh
561cd02aa3 Fix missing or incorrect copyright notices.
#rb none
#rnx
#lockdown Nick.Penwarden

[CL 4661905 by Ben Marsh in Main branch]
2018-12-14 11:21:22 -05:00
Lina Halper
44bf1c2d66 Merging using Dev-AnimPhys<->Dev-Anim
CCDIK node

#rb: Martin.Wilson
#jira: UE-47349

[CL 4072896 by Lina Halper in Dev-Anim branch]
2018-05-15 11:26:55 -04:00