Commit Graph

29 Commits

Author SHA1 Message Date
aurel cordonnier
25a11deeac Merge from Release-Engine-Staging @ 16579919
This represents UE4/Main @ 16579691 and Dev-PerfTest @ 16579576

[CL 16581170 by aurel cordonnier in ue5-release-engine-test branch]
2021-06-07 20:09:45 -04:00
aurel cordonnier
6d1c8dc26f Fixes for no unity build errors
#fyi dominik.peacock
#rb trivial
#rnx

[CL 16554663 by aurel cordonnier in ue5-main branch]
2021-06-03 18:36:47 -04:00
nick pace
e7222605ec Fix all NonUnity issues related to AVEncoder and PixelStreaming, and some minor code clean up
#JIRA UE-116483, UCS-1236
#rb marc.audy
[FYI] luke.bermingham, marco.anastasi

#ROBOMERGE-OWNER: aurel.cordonnier
#ROBOMERGE-AUTHOR: nick.pace
#ROBOMERGE-SOURCE: CL 16542087 in //UE4/Release-4.27/... via CL 16542200 via CL 16542401 via CL 16553910
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Test -> Main) (v828-16531559)

[CL 16553921 by nick pace in ue5-main branch]
2021-06-03 17:43:29 -04:00
aurel cordonnier
8f14e34a2e CIS no unity fixes
#rb trivial
#jira none

[CL 16496557 by aurel cordonnier in ue5-main branch]
2021-05-27 22:11:51 -04:00
aurel cordonnier
43fa62fcd8 Merge from Release-Engine-Test @ 16487383 to UE5/Main
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16488106 by aurel cordonnier in ue5-main branch]
2021-05-27 13:40:37 -04:00
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
David Harvey
cace2d3611 remove PLATFORM_XBOXONE from media code.
#jira UECON-543
#rnx
#rb eric.mcdaniel

[CL 16301679 by David Harvey in ue5-main branch]
2021-05-12 13:11:45 -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
matthew cotton
a3032a4f97 Removing mentions of UE4 in commends and code.
#JIRA UE-111086 UE-111183 UE-111245 UE-111249 UE-111259 UE-111288 UE-111391 UE-111374 UE-111323 UE-111286 UE-111283 UE-111281 UE-111278 UE-111272 UE-111269 UE-111265 UE-111201
#rb self
[FYI] marco.anastasi luke.bermingham

#ROBOMERGE-SOURCE: CL 16152256 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v789-15992632)

[CL 16152320 by matthew cotton in ue5-main branch]
2021-04-28 21:53:35 -04:00
Steve Robb
4fa411c84e Removal of dependencies to Windows Vista or earlier.
#jira UE-110555
#rb josh.adams

[CL 15746365 by Steve Robb in ue5-main branch]
2021-03-19 08:05:49 -04:00
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
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
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
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