Commit Graph

7 Commits

Author SHA1 Message Date
Marc Audy
c43360f47c Eliminate whitespace only differences between Release-Engine-Staging and Release-Engine-Test
#[fyi] Aurel.Cordonnier

#ushell-cherrypick of 18448630 by Marc.Audy
#preflight none

[CL 18483677 by Marc Audy in ue5-main branch]
2021-12-17 03:41:59 -05:00
jimmy smith
92077a136b New logging around device swap to track down device swap problems.
#rb aaron.mcleran phil.popp

#ROBOMERGE-OWNER: jimmy.smith
#ROBOMERGE-AUTHOR: jimmy.smith
#ROBOMERGE-SOURCE: CL 17737920 via CL 17737990 via CL 17738115 via CL 17738154 via CL 17738283
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v879-17706426)
#ROBOMERGE-CONFLICT from-shelf
#ROBOMERGE[STARSHIP]: UE5-Main

[CL 17738621 by jimmy smith in ue5-release-engine-test branch]
2021-10-06 14:34:52 -04:00
aurel cordonnier
7f517562d5 Merge from Release-Engine-Staging @ 17438845 to Release-Engine-Test
This represents UE4/Main @17430120 and Dev-PerfTest @17437669

[CL 17439044 by aurel cordonnier in ue5-release-engine-test branch]
2021-09-06 12:23:53 -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
4b9f6a685a Added missing include.
#ROBOMERGE-SOURCE: CL 9123497 via CL 9123498 via CL 9123499
#ROBOMERGE-BOT: (v443-9013191)

[CL 9123502 by rui figueira in Main branch]
2019-09-26 08:12:08 -04:00
rui figueira
4d00acf272 Fixed the null audio device pace.
Improved GameplayMediaEncoder audio handling (timestamps and duration). It now also adjust the audio clock if it falls behind, such as if we break into the debugger.

[FYI] Aaron.McLeran, Matt.Hoffman
#rb Peter.Lockhart


#ROBOMERGE-SOURCE: CL 9123362 via CL 9123364 via CL 9123367
#ROBOMERGE-BOT: (v443-9013191)

[CL 9123369 by rui figueira in Main branch]
2019-09-26 07:27:04 -04:00
Josh Markiewicz
d79515867d Copying //UE4/Dev-Online to Dev-Main (//UE4/Dev-Main)
- Up to CL8320930 from DevOnline and 8311605 Merge Down from Main
- skipped some Fortnite content/plugins/code where it tried to reintegrate files that had been moved pending investigation
#rb none

[CL 8321295 by Josh Markiewicz in Main branch]
2019-08-26 18:35:22 -04:00