Commit Graph

18 Commits

Author SHA1 Message Date
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
josh adams
a443cf98ad - Moved XboxOne source code into PlatformExtension location (not C#, ThirdParty, or plugins, yet)
#rb none

#ROBOMERGE-SOURCE: CL 13042000 via CL 13042003 via CL 13042011
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)

[CL 13042014 by josh adams in Main branch]
2020-04-24 18:36:00 -04:00
rui figueira
991bd90fd7 Bringing what I had in CL 11245130.
#jira UE-87999
#rb Marc.Audy

#ROBOMERGE-SOURCE: CL 13008857 in //UE4/Release-4.25/... via CL 13008859 via CL 13008871
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 13008877 by rui figueira in Main branch]
2020-04-23 12:53:34 -04:00
Rolando Caloca
5b82f15def Copying //UE4/Dev-RenderPlat-Staging@11388153 to //UE4/Main
#rb none
#rnx

[CL 11388545 by Rolando Caloca in Main branch]
2020-02-12 13:27:19 -05:00
Josh Adams
aa9705149b Copying Private-LoadTimes-4.24 stream to Main. Biggest changes are in Materials/Shader memory freezing.
#rb none

[CL 11282608 by Josh Adams in Main branch]
2020-02-06 13:13:41 -05:00
Juan Canada
2ecf4f9708 Merging //UE4/Dev-Main@10877709 to Dev-RenderPlat-Staging(//UE4/Dev-Rendering)
#rnx
#rb none

[CL 10895568 by Juan Canada in Dev-RenderPlat-Staging branch]
2020-01-07 13:45:01 -05: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
Robert Manuszewski
7b6f840f7f Copying //UE4/Dev-Core @ 10708550 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 10708666 by Robert Manuszewski in Main branch]
2019-12-13 11:07:03 -05:00
Rui Figueira
e1ae7b35f5 Missing #include
#jira UE-85346
#rb NONE

[CL 10502035 by Rui Figueira in Main branch]
2019-12-03 17:10:25 -05:00
Rui Figueira
653490b226 Missing #if
#jira UE-85290
#rb Marc.Audy

[CL 10501787 by Rui Figueira in Main branch]
2019-12-03 16:53:18 -05:00
Rui Figueira
cf0af5f5ea Fixed compile error for non Windows platforms. (had a #else instead of a #elif)
#rb Marc.Audy

[CL 10480019 by Rui Figueira in Main branch]
2019-11-29 07:21:09 -05:00
Rui Figueira
3ce110e18b Added #if around Windows & XboxOne code, so it's not compiled for any other platforms.
#rb Marc.Audy

[CL 10478414 by Rui Figueira in Main branch]
2019-11-28 08:44:18 -05:00
Rui Figueira
839705101b Rename/move file(s) (Moved NvEnc and Amf to a ThirdParty folder)
#jira UE-85171
#rb Marc.Audy

[CL 10477946 by Rui Figueira in Main branch]
2019-11-28 05:57:21 -05:00
Marc Audy
061f56ee1c Fix PVS warning V607: Ownerless expression 'Config.Bitrate'.
#rb Fred.Kimberley
#rnx
#codereview Rui.Figueira

[CL 10475735 by Marc Audy in Main branch]
2019-11-27 15:38:16 -05:00
Rui Figueira
6174ae1641 Compile fix (clang is more strict than visual studio)
#rb Marc.Audy

[CL 10473800 by Rui Figueira in Main branch]
2019-11-27 13:31:52 -05:00
Rui Figueira
aca355d838 compiler fix (Typo)
#rb Marc.Audy

[CL 10473780 by Rui Figueira in Main branch]
2019-11-27 13:29:51 -05:00
Rui Figueira
0d7efb9784 Compile fix (missing header)
#rb Marc.Audy

[CL 10473681 by Rui Figueira in Main branch]
2019-11-27 13:18:07 -05:00
Rui Figueira
c6c755a1f3 UE-74862 : Reusable media encoder framework implementation
#rb Andriy.Tylychko

[CL 10462307 by Rui Figueira in Main branch]
2019-11-26 17:28:51 -05:00