Commit Graph

25 Commits

Author SHA1 Message Date
matthew cotton
53649e835e Merging //UE5/Dev-TensorWorks to Release-5.0 (//UE5/Release-5.0)
Fixing non unity builds.

#jira UE-136530, UE-136531, UE-136532, UE-136537, UE-136543, UE-136549
#rb aidan.possemiers, luke.bermingham, nick.pace
[FYI] Mattias.Jansson

#ROBOMERGE-AUTHOR: matthew.cotton
#ROBOMERGE-SOURCE: CL 18363268 in //UE5/Release-5.0/... via CL 18363279
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18363286 by matthew cotton in ue5-release-engine-test branch]
2021-12-02 21:10:53 -05:00
matthew cotton
add868a255 Merging //UE5/Dev-TensorWorks to Release-5.0 (//UE5/Release-5.0)
Fixing warning about includes after code.

#rb aidan.possemiers, luke.bermingham, nick.pace
[FYI] Mattias.Jansson

#ROBOMERGE-AUTHOR: matthew.cotton
#ROBOMERGE-SOURCE: CL 18346877 in //UE5/Release-5.0/... via CL 18346901
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18346917 by matthew cotton in ue5-release-engine-test branch]
2021-12-01 18:13:06 -05:00
matthew cotton
1363134cbe Merging //UE5/Dev-TensorWorks CLs 18200048 and 18306147 to Release-5.0 (//UE5/Release-5.0)
- Changing the offer/request order
- Adding sfu support
- Adding simulcast support
- Largish structural changes
- adding reference SFU server

#jira UE-136239, UE-136238
#rb aidan.possemiers, luke.bermingham, nick.pace
[FYI] Mattias.Jansson

#ROBOMERGE-AUTHOR: matthew.cotton
#ROBOMERGE-SOURCE: CL 18345619 in //UE5/Release-5.0/... via CL 18345653
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18345683 by matthew cotton in ue5-release-engine-test branch]
2021-12-01 16:57:33 -05:00
nick pace
a977d8c332 Enable D3D12 to use CUDA for PixelStreaming backbuffer textures in order to resolve NVENC encoder latency issues
#JIRA UE-133431
#rb aidan.possemiers
[FYI] luke.bermingham, marco.anastasi, mattias.jansson
#lockdown Mitchell.Wilson

#ROBOMERGE-OWNER: nick.pace
#ROBOMERGE-AUTHOR: nick.pace
#ROBOMERGE-SOURCE: CL 18298384 in //UE4/Main/... via CL 18298455 via CL 18298465
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)
#ROBOMERGE[STARSHIP]: UE5-Main

[CL 18298471 by nick pace in ue5-release-engine-test branch]
2021-11-26 03:04:55 -05:00
nick pace
65bfcfd2e7 Integrate Dev-TensorWorks PixelStreaming/AVEncoder changes into Main
#JIRA UCS-1831
[FYI] luke.bermingham, marco.anastasi
#rb aidan.possemiers

#ROBOMERGE-AUTHOR: nick.pace
#ROBOMERGE-SOURCE: CL 17920208 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v885-17909292)

[CL 17922580 by nick pace in ue5-release-engine-test branch]
2021-10-26 09:13:01 -04:00
aurel cordonnier
02c0f425e8 Copy up from Release-Engine-Staging @ 16738359
This represents UE4/Main @ 16738161 and Dev-PerfTest @ 16737719

[CL 16738582 by aurel cordonnier in ue5-release-engine-test branch]
2021-06-22 00:27:54 -04:00
marc audy
551d59a824 Fix compile error caused by changing signature to be consistent (reversed which direction it was made consistent)
[CODEREVIEW] Nick.Pace, marco.anastasi, luke.bermingham, matthew.cotton, aidan.possemiers
#rb
#jira
#rnx

#ROBOMERGE-SOURCE: CL 16452508 in //UE4/Release-4.27/... via CL 16452519 via CL 16452523
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v818-16446889)

[CL 16452536 by marc audy in ue5-release-engine-test branch]
2021-05-25 13:29:57 -04:00
marc audy
d12005b51e Make function signature in header consistent with cpp
[CODEREVIEW] Nick.Pace, marco.anastasi, luke.bermingham, matthew.cotton, aidan.possemiers
#rb
#jira
#rnx

#ROBOMERGE-SOURCE: CL 16450303 in //UE4/Release-4.27/... via CL 16450336 via CL 16450345
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v818-16446889)

[CL 16450355 by marc audy in ue5-release-engine-test branch]
2021-05-25 11:58:49 -04:00
Marc Audy
e80ea6b959 Merge from Release-Engine-Staging @ 16444985
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16445122 by Marc Audy in ue5-release-engine-test branch]
2021-05-25 02:43:26 -04:00
Marc Audy
f02d489290 Update Release-Engine-Test from Release-Engine-Staging @ 16264272
[CL 16264458 by Marc Audy in ue5-release-engine-test branch]
2021-05-11 01:10:20 -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
David Harvey
80aba12736 remove WITH_LEGACY_XDK
#rb jon.cain
#fyi josh.adams
#rnx

[CL 15270061 by David Harvey in ue5-main branch]
2021-02-01 08:25:01 -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
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
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
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
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
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
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