Commit Graph

101 Commits

Author SHA1 Message Date
aurel cordonnier
d17d20ca36 Merge from Release-Engine-Test @ 16758890 to UE5/Main
This represents UE4/Main @ 16738161 and Dev-PerfTest @ 16737719 (and Release-17.00 @ 16658211)

[CL 16763350 by aurel cordonnier in ue5-main branch]
2021-06-23 17:51:32 -04:00
aurel cordonnier
e0ad4e25df Merge from Release-Engine-Test @ 16624776 to UE5/Main
This represents UE4/Main @ 16579691 and Dev-PerfTest @ 16579576

[CL 16625248 by aurel cordonnier in ue5-main branch]
2021-06-10 13:13:24 -04:00
aurel cordonnier
43fa62fcd8 Merge from Release-Engine-Test @ 16487383 to UE5/Main
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16488106 by aurel cordonnier in ue5-main branch]
2021-05-27 13:40:37 -04:00
aurel cordonnier
8eebe8841f Merge UE5/RET @ 16305968 to UE5/Main
This represents UE4/Main @ 16261013 and Dev-PerfTest @ 16259937

[CL 16306996 by aurel cordonnier in ue5-main branch]
2021-05-12 18:10:03 -04: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
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -04:00
nuno leiria
0cfc5dac45 Remove DLLEXPORT from header enums.
They are not necessary and clang generates errors.

#rb luke.thatcher

[CL 15956158 by nuno leiria in ue5-main branch]
2021-04-08 11:32:15 -04:00
mark lintott
3c0649b06f #jira UE-111765
#rb trivial
Removed UE4 reference from comments

#ROBOMERGE-SOURCE: CL 15796663 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v783-15756269)

[CL 15797091 by mark lintott in ue5-main branch]
2021-03-24 08:14:06 -04:00
Marc Audy
9753392e2b Merge UE5/RES CL# 15462083 to UE5/Main
This represents UE4/Main @ 15414221

[CL 15463811 by Marc Audy in ue5-main branch]
2021-02-18 18:13:28 -04:00
Marc Audy
cac1fe0019 Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main
This represents UE4/Main @ CL# 15277572

[CL 15299962 by Marc Audy in ue5-main branch]
2021-02-03 14:57:28 -04:00
Marc Audy
bc88b73a29 Merge Release-Engine-Staging to Main @ CL# 15151250
Represents UE4/Main @ 15133763

[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -04:00
Marc Audy
bf80889353 UE5/Release-Engine-Staging to UE5/Main
This represents UE4/Main up to CL# 14958402

[CL 15028197 by Marc Audy in ue5-main branch]
2021-01-08 19:56:07 -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
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
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -04:00
Marc Audy
7379fa99c5 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157
[CL 14233282 by Marc Audy in ue5-main branch]
2020-09-01 14:07:48 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -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
Matt Kuhlenschmidt
603a4119c5 Fix HAL/PlatformFileManager.h non-portable casing CIS issues
#rb none

[CL 13214257 by Matt Kuhlenschmidt in ue5-main branch]
2020-05-06 17:58:18 -04:00
justin marcus
e6c5fd6ae1 Fix my last CL
[at]Daniel.Lamb [at]Eric.Knapik



#ROBOMERGE-SOURCE: CL 13055695 via CL 13057825 via CL 13057859 via CL 13057890 via CL 13057938
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13058003 by justin marcus in Main branch]
2020-04-28 13:11:06 -04:00
justin marcus
7b99c33183 Configure editor builds to always use null install bundle manager implementation, regardless of platform.
Remove content patch check hack.

[at]Daniel.Lamb [at]Eric.Knapik


#ROBOMERGE-SOURCE: CL 13055621 via CL 13057817 via CL 13057849 via CL 13057886 via CL 13057929
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13057984 by justin marcus in Main branch]
2020-04-28 13:11:00 -04:00
justin marcus
62c63af0d9 Initial install bundle cache work - checking in disabled.
Stub out install bundle removal API for install bundle sources.
Make install bundle sources gracefully handle bundles that are unkown to them.


[at]Hongyi.Yu [at]Daniel.Lamb
[FYI] [at]Eric.Knapik


#ROBOMERGE-SOURCE: CL 13055207 via CL 13057267 via CL 13057354 via CL 13057430 via CL 13057576
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13057630 by justin marcus in Main branch]
2020-04-28 13:05:49 -04:00
justin marcus
8336860198 Add an install bundle request flag to skip mounting.
Add an additional callback for when a bundle is done being installed/patched.

[at]Daniel.Lamb [at]Hongyi.Yu

#ROBOMERGE-SOURCE: CL 12928635 via CL 12928637 via CL 12928647 via CL 12928679
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12928695 by justin marcus in Main branch]
2020-04-20 14:13:16 -04:00
justin marcus
ca02c002c9 Provide a way for bundle sources to add/update bundle info after init.
[at]Hongyi.Yu [at]Daniel.Lamb
[FYI] [at]Eric.Knapik


#ROBOMERGE-SOURCE: CL 12676182 via CL 12677210 via CL 12677229 via CL 12677249
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12677268 by justin marcus in Main branch]
2020-04-08 15:32:38 -04:00
justin marcus
e2aefaf3d4 Install Bundle Sources now provide bunld edependencies to bundle manager.
[at]Hongyi.Yu [at]Daniel.Lamb
[FYI] [at]Eric.Knapik


#ROBOMERGE-SOURCE: CL 12633678 via CL 12634014 via CL 12634048 via CL 12634083
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12634102 by justin marcus in Main branch]
2020-04-06 16:49:07 -04:00