Commit Graph

4 Commits

Author SHA1 Message Date
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
nick shin
209b3aa985 #jira UE-82163 HTML5 rules present in BasePakFileRules.ini without platform
#rnx
#rb none

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

[CL 9756764 by nick shin in Main branch]
2019-10-23 11:27:42 -04:00
justin marcus
d8541e9c2a Allow pak rules to only apply to chunked or non-chunked builds.
Fix issue in non-chunked builds that could cause rules to be misapplied - Each staged file should have its pak chunk list.
[REVIEW] [at]Daniel.Lamb


#ROBOMERGE-SOURCE: CL 7603624 via CL 7603625 via CL 7608778
#ROBOMERGE-BOT: (v372-7473910)

[CL 7608919 by justin marcus in Main branch]
2019-07-24 12:15:40 -04:00
Marc Audy
ab108c215e Copying to Dev-Main @ CL# 4688301
#rb
#rnx

[CL 4688816 by Marc Audy in Main branch]
2019-01-08 11:38:48 -05:00