aurel cordonnier
fc542f6cfd
Merge from Release-Engine-Staging @ 18081189 to Release-Engine-Test
...
This represents UE4/Main @18073326, Release-5.0 @18081140 and Dev-PerfTest @18045971
[CL 18081471 by aurel cordonnier in ue5-release-engine-test branch]
2021-11-07 23:43:01 -05:00
alejandro arango
79c6ef4606
nDisplay,TextureShare: Merge from RES.
...
#rb
#jira
#rnx
#ROBOMERGE-SOURCE: CL 17223255 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)
[CL 17223427 by alejandro arango in ue5-release-engine-test branch]
2021-08-18 17:54:13 -04:00
aurel cordonnier
e88b487b29
nDisplay: Fixed TextureSharing regression
...
#jira UE-120154
#author Peter.Tarasenko
#rb Vitalii Boiko
#ushell-cherrypick of 17053559 by vitalii.boiko
#ROBOMERGE-OWNER: aurel.cordonnier
#ROBOMERGE-AUTHOR: vitalii.boiko
#ROBOMERGE-SOURCE: CL 17053492 in //UE4/Release-4.27/... via CL 17053535 via CL 17056918
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v850-17047176)
#ROBOMERGE-CONFLICT from-shelf
[CL 17058314 by aurel cordonnier in ue5-release-engine-test branch]
2021-08-04 15:59:00 -04:00
Marc Audy
8f73cd7fa9
Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main
...
This represents UE4/Main @ 15601601
[CL 15631170 by Marc Audy in ue5-main branch]
2021-03-05 19:27:14 -04:00
Marc Audy
a7f9391231
Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main
...
This represents UE4/Main @ 14768117
For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer
[CL 14811440 by Marc Audy in ue5-main branch]
2020-11-24 18:42:39 -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
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
