Commit Graph

15 Commits

Author SHA1 Message Date
andrey yamashev
9388f2bbe3 nDisplay: fixed p-node deadlock on ESC exit
#jira UE-141391
#rnx
#rb Alejandro.Arango
#preflight 6205d2cc69224cb0d88e411a
#lockdown Alejandro.Arango

#ROBOMERGE-AUTHOR: andrey.yamashev
#ROBOMERGE-SOURCE: CL 18949019 in //UE5/Release-5.0/... via CL 18949110 via CL 18949135
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v917-18934589)

[CL 18949140 by andrey yamashev in ue5-main branch]
2022-02-10 23:17:21 -05:00
Marc Audy
0c3be2b6ad Merge Release-Engine-Staging to Test @ CL# 18240298
[CL 18241953 by Marc Audy in ue5-release-engine-test branch]
2021-11-18 14:37:34 -05:00
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
andrey yamashev
d30036daa2 nDisplay: fixed UE4 mentions in the source code
#jira UE-111382, UE-111378, UE-111509, UE-111450, UE-111377, UE-111386, UE-111528, UE-111402, UE-111481, UE-111311, UE-111375, UE-104766, UE-111403, UE-111383, UE-111380, UE-111339, UE-111343
#rb none

#ROBOMERGE-SOURCE: CL 15905160 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15907231 by andrey yamashev in ue5-main branch]
2021-04-02 20:19:26 -04:00
Marc Audy
68150e0be7 Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
This represents UE4/Main @ 14594913

[CL 14612291 by Marc Audy in ue5-main branch]
2020-10-29 13:38:15 -04:00
Marc Audy
50a3d7d368 Merge Release-Engine-Staging to Main @ CL# 14467590
This represents UE4/Main @ 14432125 + some cherrypick fixes

[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -04:00
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
Ryan Schmidt
d15b6ccdaf copy Dev-Editor CL 11092476 to Tools-Staging to resolve CIS error
#rb none
#rnx

[CL 11112928 by Ryan Schmidt in Dev-Tools-Staging branch]
2020-01-25 10:52:08 -05:00
Marc Audy
360d078ca3 Second batch of remaining Engine copyright updates.
#rnx
#rb none

[CL 10871248 by Marc Audy in Main branch]
2019-12-27 09:26:59 -05:00
patrick boutot
783046a470 Get rid of DisplayCluster GameMode and Pawns
#jira UEENT-2978
#rb simon.tourangeau
#author andrey.yamashev

#ROBOMERGE-SOURCE: CL 9761530 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v545-9751379)

[CL 9761552 by patrick boutot in Main branch]
2019-10-23 15:19:37 -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
JeanMichel Dignard
fb979d921b Copying //UE4/Dev-Enterprise @ cl 4784880 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

[CL 4784913 by JeanMichel Dignard in Main branch]
2019-01-23 14:28:06 -05: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
patrick boutot
6971b5309a Fixed crash in DC components when the DC is not initialized
#jira UE-61646
#rb Patrick.Boutot
#lockdown nick.penwarden

#ROBOMERGE-SOURCE: CL 4202953 in //UE4/Release-4.20/...
#ROBOMERGE-BOT: RELEASE (Release-4.20 -> Release-Staging-4.20)
#ROBOMERGE-AUTHOR: patrick.boutot

[CL 4203999 by patrick boutot in Staging-4.20 branch]
2018-07-11 14:51:47 -04:00
jerome delattre
9dcdc6c566 #ROBOMERGE-AUTHOR: jerome.delattre
Copying //Tasks/UE4/Release-4.20-EnterpriseLateFeatures to Release-4.20 (//UE4/Release-4.20)
#rb simon.tourangeau
#jira UE-59798, UE-58919, UE-59480

#ROBOMERGE-SOURCE: CL 4119095 in //UE4/Release-4.20/...
#ROBOMERGE-BOT: RELEASE (Release-4.20 -> Release-Staging-4.20)

[CL 4119100 by jerome delattre in Staging-4.20 branch]
2018-06-07 18:49:50 -04:00