Commit Graph

11 Commits

Author SHA1 Message Date
nuno leiria
1743c2cfb6 MemPro integration for a newer platorm
#rb ben.woodhouse

[CL 17148483 by nuno leiria in ue5-main branch]
2021-08-12 05:36:04 -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
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
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
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 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
david harvey
1375c60217 [MemPro] fix static analysis warnings.
Note: no [at]EPIC tags on the modified code because the fixes are going to be rolled back into the canonical version of MemPro

#rb anthony.bills


#ROBOMERGE-SOURCE: CL 6093979 via CL 6093983 via CL 6094876

[CL 6094886 by david harvey in Main branch]
2019-04-25 11:54:14 -04:00
david harvey
79f0963a1d [MemPro] don't try to pause MemPro on shutdown because MemPro::SetPause will create mempro automatically
#rb anthony.bills


#ROBOMERGE-SOURCE: CL 6077073 via CL 6077074 via CL 6077943

[CL 6078100 by david harvey in Main branch]
2019-04-24 11:04:47 -04:00
david harvey
d7b997de33 [LLM] checking in MemPro source.
#rb anthony.bills


#ROBOMERGE-SOURCE: CL 5914884 via CL 5915020 via CL 5915087

[CL 5915111 by david harvey in Main branch]
2019-04-16 06:16:28 -04:00
david harvey
43612eb09c [LLM] mempro shutdown fixes
#rb anthony.bills


#ROBOMERGE-SOURCE: CL 5587487 via CL 5587488 via CL 5587489 via CL 5587490 via CL 5587827

[CL 5587862 by david harvey in Main branch]
2019-03-27 09:38:09 -04:00
david harvey
bca487d8af [LLM] support for the new version of MemPro.
#rb anthony.bills


#ROBOMERGE-SOURCE: CL 5555233 via CL 5555235 via CL 5557268

[CL 5557322 by david harvey in Main branch]
2019-03-26 12:57:03 -04:00