Commit Graph

22 Commits

Author SHA1 Message Date
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
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
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
a38c78e016 Additional non-editor non-unity fix
#rb
#rnx

[CL 13845010 by Marc Audy in ue5-main branch]
2020-07-12 18:18:11 -04:00
Marc Audy
50a110370f Fix non-unity
#rb
#rnx

[CL 13843942 by Marc Audy in ue5-main branch]
2020-07-10 19:34:10 -04:00
Michal Valient
eb45e7c33a - non unity build fix
- copyright warning fixes
#rb none

[CL 13836227 by Michal Valient in ue5-main branch]
2020-07-07 14:29:30 -04: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
justin marcus
11c0ed24e1 Missed this with my previous change
[at]Thomas.Ross [at]Daniel.Lamb


#ROBOMERGE-SOURCE: CL 9491386 via CL 9491401 via CL 9491408
#ROBOMERGE-BOT: (v519-9489664)

[CL 9491418 by justin marcus in Main branch]
2019-10-09 14:24:49 -04:00
justin marcus
131c1eb348 Clean up Preload Screen init so that we only pass an analytics factory to fortnite early preload screens.
[at]Thomas.Ross [at]Daniel.Lamb


#ROBOMERGE-SOURCE: CL 9491053 via CL 9491055 via CL 9491057
#ROBOMERGE-BOT: (v519-9489664)

[CL 9491060 by justin marcus in Main branch]
2019-10-09 13:46:27 -04:00
bob tellez
ca0bb8de14 #PreLoadScreenMoviePlayer CIS fix
#ROBOMERGE-SOURCE: CL 9485143 via CL 9485182 via CL 9485183
#ROBOMERGE-BOT: (v508-9471939)

[CL 9485184 by bob tellez in Main branch]
2019-10-08 23:38:33 -04:00
bob tellez
f185612df6 #PreLoadScreenMoviePlayer CIS fix
[FYI] Justin.Marcus


#ROBOMERGE-SOURCE: CL 9484142 via CL 9484317
#ROBOMERGE-BOT: (v508-9471939)

[CL 9484348 by bob tellez in Main branch]
2019-10-08 20:19:27 -04:00
bob tellez
fddcd01e74 Merging CL#9483137
#PreLoadScreenMoviePlayer CIS fix

[FYI] Justin.Marcus


#ROBOMERGE-SOURCE: CL 9483197 via CL 9484312
#ROBOMERGE-BOT: (v508-9471939)

[CL 9484344 by bob tellez in Main branch]
2019-10-08 20:19:17 -04:00
brandon schaefer
a715ea4f14 Deprecate GIsRequestingExit
Get GIsRequestingExit now by IsEngineRequestingExit()

Set GIsRequestingExit now by RequestEngineExit(const TCHAR* Reason) or RequestEngineExit(const FString& Reason)
NOTE If Reason is 4 or less chars it will generate an ensure to force a reason to exit

The reason behind this change is right now setting GIsRequestingExit to true can cause many things to break mainly early on and with out any sort of log warning we have entered this state. We should wrap this behind a function to allow for proper handling

#rb Chris.Babcock, Michael.Trepka, Michael.Noland
#jira UE-79933
[FYI] Michael.Noland


#ROBOMERGE-SOURCE: CL 8649683 via CL 8653683
#ROBOMERGE-BOT: (v417-8656536)

[CL 8658680 by brandon schaefer in Main branch]
2019-09-12 14:21:26 -04:00
justin marcus
637c03cc22 Undo //Fortnite/Release-10.0/Engine/... changelist 7445561
Resubmitting CL 7437649

-Allow preload screens to optionally render
-Add FileExistsInPlatformPackage() to platform misc
-Add HasBuildMetaData() to bundle manager interface

[at]Thomas.Ross [at]Daniel.Lamb [at]Hongyi.Yu
#test preflight passed automation tests


#ROBOMERGE-SOURCE: CL 7474485 via CL 7474487 via CL 7475393
#ROBOMERGE-BOT: (v372-7473910)

[CL 7475436 by justin marcus in Main branch]
2019-07-22 11:49:15 -04:00
bob tellez
4ed7bb0b4e Back out changelist 7437649. Autotest errors on PS4
[FYI] Justin.Marcus


#ROBOMERGE-SOURCE: CL 7445561 via CL 7446165 via CL 7450457
#ROBOMERGE-BOT: (v371-7306989)

[CL 7450607 by bob tellez in Main branch]
2019-07-19 09:28:29 -04:00
justin marcus
3c1a624312 -Allow preload screens to optionally render
-Add FileExistsInPlatformPackage() to platform misc
-Add HasBuildMetaData() to bundle manager interface

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


#ROBOMERGE-SOURCE: CL 7437649 via CL 7437657 via CL 7438904
#ROBOMERGE-BOT: (v371-7306989)

[CL 7438929 by justin marcus in Main branch]
2019-07-18 12:42:09 -04: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
Ben Marsh
561cd02aa3 Fix missing or incorrect copyright notices.
#rb none
#rnx
#lockdown Nick.Penwarden

[CL 4661905 by Ben Marsh in Main branch]
2018-12-14 11:21:22 -05:00
Marcus Wassmer
2b944cb943 Copying //UE4/Dev-Rendering@4626416 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown nick.penwarden

[CL 4626501 by Marcus Wassmer in Main branch]
2018-12-03 22:25:23 -05:00
Guillaume Abadie
c72b7a33d8 Merging //UE4/Dev-Rendering-Graph@4492585 to Dev-Rendering (//UE4/Dev-Rendering)
This implements the framework to write the high level rendering code into passes organized in direct acyclic graph. It is also unifying the uniform buffer, shader parameters, and pass parameters to same single API: structures with run time meta data. This allow high level user code be extremely seamless, user code debugging, and render graph ease of implementation and debugging.

Issue of collaborative work of Arne Schnober, Brian Karis, Daniel Wright, Marcus Wassmer and Guillaume Abadie.

Names of the graph managed resources are not final.

#rb Arne.Schnober, Brian.Karis, Daniel.Wright, Marcus.Wassmer

[CL 4492694 by Guillaume Abadie in Dev-Rendering branch]
2018-10-19 17:36:35 -04:00
john mauney
f6d61ab7b6 Update Epic copyright from 2017 to 2018
#jira UE-653339
#RB none

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

[CL 4477669 by john mauney in Staging-4.21 branch]
2018-10-16 20:30:57 -04:00
Marc Audy
af90b7bcd4 Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main) @ 4395008
#rb
#rnx
#lockdown Nick.Penwarden

[CL 4395058 by Marc Audy in Main branch]
2018-09-25 10:11:35 -04:00