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
anna lantz
fd5ab8cead
Fix for compiler warning in initialization of FAudioInputDeviceInfo
...
#jira UE-112813
#rb phil.popp
#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: anna.lantz
#ROBOMERGE-SOURCE: CL 15935818 via CL 15949478 via CL 15949552 via CL 15960205
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Main) (v787-15839533)
[CL 15960217 by anna lantz in ue5-main branch]
2021-04-08 16:58:36 -04:00
Marc Audy
01b7c9f4f5
Merge UE5/RES @ 15958325 to UE5/Main
...
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304
[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -04:00
Josh Adams
b0e4357576
- UBT Code changes to remove 32-bit Windows support (C++ code for 32-bit still exists)
...
#rb marc.audy (concept, not each file)
[CL 15265424 by Josh Adams in ue5-main branch]
2021-01-31 15:09:58 -04:00
Marc Audy
bc88b73a29
Merge Release-Engine-Staging to Main @ CL# 15151250
...
Represents UE4/Main @ 15133763
[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -04:00
Marc Audy
68150e0be7
Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
...
This represents UE4/Main @ 14594913
[CL 14612291 by Marc Audy in ue5-main branch]
2020-10-29 13:38:15 -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
brooke hubert
48113fc77e
Adding EditorFramework to build.cs files
...
#rnx
#Jira UE-96448
#rb chris.gagnon
[CL 14114839 by brooke hubert in ue5-main branch]
2020-08-14 13:24:16 -04:00
maxwell hayes
e6b842bbc2
Port of audio capture implementation fixes
...
#jira UE-91858
#rb Ethan.Geller
#ROBOMERGE-SOURCE: CL 12926579 in //UE4/Release-4.25/... via CL 12926596 via CL 12926657
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)
[CL 12926695 by maxwell hayes in Main branch]
2020-04-20 12:56:15 -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
710501600c
- Fixed non-unity compile
...
#rb none
#jira UE-88607
[CL 11386425 by Josh Adams in Main branch]
2020-02-12 11:52:50 -05:00
ethan geller
e4279917b1
#jira UE-87437
...
fix for usoundwave created with mic capture in the Take Recorder window not playing back.
#Rb phil.popp
[FYI] max.chen
#lockdown nick.penwarden
#ROBOMERGE-SOURCE: CL 11365035 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v654-11333218)
[CL 11365055 by ethan geller in Main branch]
2020-02-11 19:14:51 -05:00
Josh Adams
6bd5d97d8b
- Moved AudioCaptureModuleName spec to a .ini setting, and updated all relevant .ini files
...
- Fixed .ini staging to follow the IniParent chain for PlatformExtensions
#rb ethan.geller
[CL 11346916 by Josh Adams in Main branch]
2020-02-11 13:51:26 -05:00
bob tellez
73f3d19f1f
Back out changelist 11119764, 11119772, 11119809, 11119849, 11121802, 11125895, 11124508. AutoTest assert
...
[FYI] Rob.Gay
#ROBOMERGE-SOURCE: CL 11125898 via CL 11126424
#ROBOMERGE-BOT: (v640-11091645)
[CL 11126508 by bob tellez in Main branch]
2020-01-28 05:18:04 -05:00
rob gay
dd71a4cd08
- Deprecate AudioDevice implementation Engine/UnrealEngine monolythics & move to AudioDeviceManager
...
- Remove redundant static calls on AudioDevice in favor of AudioDeviceManager for finding Main/Active Devices (state managed by the manager, not individual devices)
#rb ethan.geller ryan.mangin
#ROBOMERGE-SOURCE: CL 11119764 via CL 11119771
#ROBOMERGE-BOT: (v640-11091645)
[CL 11119776 by rob gay in Main branch]
2020-01-27 15:55:07 -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
Marc Audy
360d078ca3
Second batch of remaining Engine copyright updates.
...
#rnx
#rb none
[CL 10871248 by Marc Audy in Main branch]
2019-12-27 09:26:59 -05:00
aaron mcleran
f289686f11
Fix for audio capture implementation not being loaded.
...
Explicitly call LoadModule.
ethan.geller, cristina.riveron
#rb ethan.geller
#lockdown cristina.riveron
#jira UE-85280
[FYI] Thomas.Dowd
#ROBOMERGE-SOURCE: CL 10487878 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v606-10482310)
[CL 10487896 by aaron mcleran in Main branch]
2019-12-02 14:48:36 -05: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
jules blok
76c44450a1
Fix bad merge in AudioCaptureMLAudio
...
#rb Robert.Mobbs
#jira UE-78717
#ROBOMERGE-SOURCE: CL 7949994 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v392-7949540)
[CL 7949995 by jules blok in Main branch]
2019-08-12 09:59:20 -04:00
JeanMichel Dignard
0f9ad96858
Copying //UE4/Dev-Enterprise @ cl 6890376 to Dev-Main (//UE4/Dev-Main)
...
#lockdown nick.penwarden
#rb none
[CL 6890764 by JeanMichel Dignard in Main branch]
2019-06-07 11:22:52 -04:00
Chris Gagnon
930e33cb48
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
...
#rb none
[CL 6838042 by Chris Gagnon in Main branch]
2019-06-04 15:42:48 -04:00
ethan geller
99dddbb3ea
#jira UE-74169 Fix for AudioCapture linkage error in non-unity builds.
...
#rb aaron.mcleran
#lockdown cristina.riveron
#ROBOMERGE-SOURCE: CL 6285259 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)
[CL 6317352 by ethan geller in Main branch]
2019-05-06 11:32:48 -04:00
Aaron McLeran
a502a7973d
Attempted fix to build error part 2
...
#jira UE-71417
#codereview Ethan.Geller
#rb Rob.Gay
[CL 5370360 by Aaron McLeran in Main branch]
2019-03-12 14:25:57 -04:00
Aaron McLeran
bafc9826bb
Attempted fix to build error.
...
#jira UE-71417
#codereview Ethan.Geller
#rb none
[CL 5370102 by Aaron McLeran in Main branch]
2019-03-12 13:47:56 -04:00
