Commit Graph

88 Commits

Author SHA1 Message Date
aurel cordonnier
fc542f6cfd Merge from Release-Engine-Staging @ 18081189 to Release-Engine-Test
This represents UE4/Main @18073326, Release-5.0 @18081140 and Dev-PerfTest @18045971

[CL 18081471 by aurel cordonnier in ue5-release-engine-test branch]
2021-11-07 23:43:01 -05:00
aurel cordonnier
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
brandon schaefer
4fe357ee7c Fix spaces usage over tabs
#rb none
[FYI] none

#ROBOMERGE-SOURCE: CL 17237556 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v855-17104924)

[CL 17237567 by brandon schaefer in ue5-release-engine-test branch]
2021-08-19 14:47:44 -04:00
dan thompson
ab80c69fd3 Bink Audio :: 4/4 :: Integration :: #pf 60aea2116905a6000136901e #pf 60c9308ef7cffb0001674132
Integration touches several places in the engine:

1) SoundWave -- A check box enables Bink Audio as the codec of choice for that sound wave.

2) Decoder - Each supported platform's AudioMixer now returns BINK if the soundwave requests it. Additionally, the TargetPlatform returns BINK as an available codec, and returns it to the cooking code if the sound wave requests it.

3) Encode - TargetPlatform.Build.cs adds the encoder to the editor dependencies, and it gets picked up in the TPMM formats search.


#ROBOMERGE-SOURCE: CL 16682710 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v835-16672529)

[CL 16682731 by dan thompson in ue5-release-engine-test branch]
2021-06-15 20:30:02 -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
aaron mcleran
3609fc2ab1 Allowing SDL backend to be optimized
[FYI] Arciel.Rekman
#rb none
#jira none

#ROBOMERGE-SOURCE: CL 16424405 in //UE4/Release-4.27/... via CL 16424433
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Staging) (v811-16416015)

[CL 16424480 by aaron mcleran in ue5-release-engine-staging branch]
2021-05-21 16:30:22 -04:00
Brandon Schaefer
766c2bb68e Fixes Linux crash on startup trying to create and compress audio
#jira none
#rb Maxwell.Hayes

[CL 16251516 by Brandon Schaefer in ue5-main branch]
2021-05-10 14:21:42 -04:00
arciel rekman
8d4ab79ff4 AudioMixerSDL: only override the default device (UE-92340).
#rb none
#jira UE-92340
[FYI] Michael.Kirzinger

#ROBOMERGE-SOURCE: CL 13011565 in //UE4/Release-4.25/... via CL 13011572 via CL 13011590
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)

[CL 13011608 by arciel rekman in Main branch]
2020-04-23 14:41:09 -04:00
ethan geller
5584555a2d #jira none
Fix up min call in SDL code.
#rb none

#ROBOMERGE-SOURCE: CL 12122855 in //UE4/Release-4.25/... via CL 12122856
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v657-12064184)

[CL 12122858 by ethan geller in Main branch]
2020-03-11 00:28:36 -04:00
ethan geller
e7a0e97b5d #jira UE-89289
minor: sanity check num channels from the audio device on linux. Callstack for crash indicates an OOB access on envelope array.
#rb none

#ROBOMERGE-SOURCE: CL 12121694 in //UE4/Release-4.25/... via CL 12121697
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v657-12064184)

[CL 12121704 by ethan geller in Main branch]
2020-03-10 20:55:22 -04:00
phil popp
baefdea9aa Integrate FFTAlgorithm and ConvolutionAlgorithm work from //UE4/Private-Reverb/...
#rb Ethan.Geller, Maxwell.Hayes


#ROBOMERGE-SOURCE: CL 11285078 via CL 11285087
#ROBOMERGE-BOT: (v647-11244347)

[CL 11285092 by phil popp in Main branch]
2020-02-06 14:31:11 -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
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
nick shin
49d56735d0 remove more HTML5 code from engine
#jira UE-80050  Remove HTML5 code from engine
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 10272777 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v591-10236483)

[CL 10272778 by nick shin in Main branch]
2019-11-15 20:50:38 -05:00
brandon schaefer
56a2ade3c7 Move the default implementation of GetIndexForDevice to the base class
#jira UE-82032
#rb Ethan.Geller
[at]Ethan.Geller

#ROBOMERGE-SOURCE: CL 10174662 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v587-10111126)

[CL 10192019 by brandon schaefer in Main branch]
2019-11-14 07:00:39 -05:00
ethan geller
a8705988fc Add support for additional device routing to our native VOIP engine. This can be done either by using IOnlineVoice::PatchRemoteTalkerOutputToEndpoint(DeviceName), or by using the console command "voice.sendRemoteTalkersToEndpoint <Device Name Substring>"
#jira UE-82032
#rb
[FYI] brandon.schaefer

#ROBOMERGE-OWNER: ethan.geller
#ROBOMERGE-AUTHOR: ethan.geller
#ROBOMERGE-SOURCE: CL 10091768 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v574-10069753)

[CL 10091772 by ethan geller in Main branch]
2019-11-10 17:18:36 -05:00
nick shin
0423c3b4b5 HTML5 - more code removal - source code section
#jira UE-80050  Remove HTML5 code from engine
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 9884403 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v553-9872581)

[CL 9884404 by nick shin in Main branch]
2019-10-29 15:03:30 -04:00
arciel rekman
b329cf04c3 Fix CIS warnings (UE-82156)
#jira UE-82156
#rb none

#ROBOMERGE-SOURCE: CL 9734168 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v539-9700858)

[CL 9734172 by arciel rekman in Main branch]
2019-10-21 13:00:07 -04:00
Rolando Caloca
1a30325d6f Copying //UE4/Dev-RenderPlat-Staging@9551419 to //UE4/Main
#rb none
#rnx

[CL 9551447 by Rolando Caloca in Main branch]
2019-10-11 15:33:31 -04:00
Marcus Wassmer
6517c68ef5 Copying //UE4/Dev-RenderPlat-Staging@8684824 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 8684840 by Marcus Wassmer in Main branch]
2019-09-14 09:45:25 -04:00
Marcus Wassmer
ded7cece25 Copying //UE4/Dev-Rendering@8444433 to Dev-RenderPlat-Staging (//UE4/Dev-RenderPlat-Staging)
#rb none

[CL 8445676 by Marcus Wassmer in Dev-RenderPlat-Staging branch]
2019-09-03 19:19:28 -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
Michael Sartain
a65c919c15 Add LinuxAArch64 platform and Linux platform group
#jira none
#rb Brandon.Schaefer, Arciel.Rekman, Ben.Marsh

[CL 8175700 by Michael Sartain in Dev-Rendering branch]
2019-08-21 11:42:07 -04:00
brandon schaefer
6f98f71929 Mutex around the OutputBuffer and Closing of the SDL_AudioDevice
#jira UE-78401
[CODEREVIEW] Arciel.Rekman
[at]Arciel.Rekman
#rb Arciel.Rekman

#ROBOMERGE-SOURCE: CL 7882340 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7882360 by brandon schaefer in Main branch]
2019-08-08 11:21:39 -04:00
brandon schaefer
a7197250ab Fix HTML5 build for AudioMixer
#jira none
#rb none

#ROBOMERGE-SOURCE: CL 7775649 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v386-7774470)

[CL 7775660 by brandon schaefer in Main branch]
2019-08-05 16:47:23 -04:00