Commit Graph

8 Commits

Author SHA1 Message Date
Marc Audy
8f73cd7fa9 Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main
This represents UE4/Main @ 15601601

[CL 15631170 by Marc Audy in ue5-main branch]
2021-03-05 19:27:14 -04:00
Emil Persson
4516b985df Name all resources and make naming mandatory
#rb yuriy.odonnel, kenzo.terelst

[CL 15416919 by Emil Persson in ue5-main branch]
2021-02-16 08:37:39 -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
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
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
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
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