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
Marcus Wassmer
3b81cf8201
Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
...
autoresolved files
#rb none
[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -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
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
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
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
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
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
