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
Matt Kuhlenschmidt
a4cd6f7167
Fix notifications which are just duplicating widgets in order to show the default notification background. This is no longer necessary.
...
[CL 16124682 by Matt Kuhlenschmidt in ue5-main branch]
2021-04-27 09:25:32 -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
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
Matt Kuhlenschmidt
603a4119c5
Fix HAL/PlatformFileManager.h non-portable casing CIS issues
...
#rb none
[CL 13214257 by Matt Kuhlenschmidt in ue5-main branch]
2020-05-06 17:58:18 -04:00
Ethan Geller
62f4f15a8f
#jira none
...
Fix merge issue: merges seem to have accepted target for any files that had additional changes in the target to resolve against.
#fyi marc.audy
#rb none
[CL 11194069 by Ethan Geller in Main branch]
2020-01-31 04:30:15 -05:00
ryan mangin
ecac024413
Undo changelist 11153200:
...
CL 1 of 3: Refactor Audio Device Manager.
[FYI] ethan.geller
#rb: none
#ROBOMERGE-OWNER: ryan.mangin
#ROBOMERGE-AUTHOR: ryan.mangin
#ROBOMERGE-SOURCE: CL 11160333 via CL 11160335
#ROBOMERGE-BOT: (v640-11091645)
[CL 11162634 by ryan mangin in Main branch]
2020-01-29 11:34:23 -05:00
ethan geller
4fff0cce59
CL 1 of 3: Refactor Audio Device Manager.
...
[FYI] aaron.mcleran, rob.gay
#ROBOMERGE-OWNER: ethan.geller
#ROBOMERGE-AUTHOR: ethan.geller
#ROBOMERGE-SOURCE: CL 11153200 via CL 11153210
#ROBOMERGE-BOT: (v640-11091645)
[CL 11153252 by ethan geller in Main branch]
2020-01-29 05:00:56 -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
9facdbe356
More fix-ups for editor calls to deprecated audio device calls
...
#rb none
#ROBOMERGE-SOURCE: CL 11119849 via CL 11119933
#ROBOMERGE-BOT: (v640-11091645)
[CL 11119941 by rob gay in Main branch]
2020-01-27 15:58:04 -05:00
JeanMichel Dignard
70d074639f
Merging //UE4/Dev-Main @ 10886849 to Dev-Tools-Staging (//UE4/Dev-Tools-Staging)
...
#rb none
#rnx
[CL 10906274 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-08 13:26:18 -05:00
ryan durand
627baf970a
Updating copyright for Engine Editor.
...
#rnx
#rb none
#ROBOMERGE-SOURCE: CL 10869241 via CL 10869527 via CL 10869904
#ROBOMERGE-BOT: (v613-10869866)
[CL 10870586 by ryan durand in Main branch]
2019-12-26 15:33:43 -05:00
Matt Hoffman
925ce9590f
Significantly refactored PIE startup and consolidated a fair bit of the existing code into structures that better reflect the lifespan that they are valid for. This refactoring will make it easier for systems that are requesting PIE startup to have better control over the instance that is started up. This refactoring also changes network testing to focus on the role you want to test (standalone, client, listen server) and the number of clients you want to test instead of of trying to determine this information based on other variables.
...
#rb None
#fyi Michael.Noland
[CL 9754486 by Matt Hoffman in Dev-Editor branch]
2019-10-22 22:03:49 -04:00
Max Chen
4561801a81
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) @7119039
...
#rb none
[CL 7120528 by Max Chen in Dev-Editor branch]
2019-06-21 01:21:43 -04:00
Matt Kuhlenschmidt
fddbe0a896
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 6190096 by Matt Kuhlenschmidt in Dev-Editor branch]
2019-05-01 09:59:38 -04:00
Max Chen
d01249e924
Movie Scene Capture: Allow game sounds if capturing audio
...
#jira UE-68812
#rb matt.hoffman
[CL 6113781 by Max Chen in Dev-Sequencer branch]
2019-04-26 17:27:22 -04:00
Max Chen
c33049fcbd
Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)
...
#rb none
[CL 5730143 by Max Chen in Dev-Sequencer branch]
2019-04-04 02:48:32 -04:00
Max Chen
d7d8a482eb
Sequencer: Texture streaming toggle also sets r.TextureStreaming
...
#jira UE-69784
#rb none
[CL 5671352 by Max Chen in Dev-Sequencer branch]
2019-04-01 14:03:18 -04:00
Chris Gagnon
00f8b72a0b
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 5602170 by Chris Gagnon in Dev-Editor branch]
2019-03-27 15:03:08 -04:00
Chris Gagnon
1dd3e0189f
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 4730305 by Chris Gagnon in Dev-Editor branch]
2019-01-15 18:47:22 -05:00
Francis Hurteau
57c677da93
Copying //UE4/Dev-Enterprise@4705006 to Dev-Main (//UE4/Dev-Main)
...
#rb none
#lockdown Nick.Penwarden
[CL 4705151 by Francis Hurteau in Main branch]
2019-01-10 17:26:53 -05:00
Chris Gagnon
8fc25ea18e
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 4676797 by Chris Gagnon in Dev-Editor branch]
2019-01-02 14:54:39 -05:00
Ben Marsh
7598af0532
Update copyright notices to 2019.
...
#rb none
#lockdown Nick.Penwarden
[CL 4662404 by Ben Marsh in Main branch]
2018-12-14 13:41:00 -05:00
Marc Audy
af90b7bcd4
Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main) @ 4395008
...
#rb
#rnx
#lockdown Nick.Penwarden
[CL 4395058 by Marc Audy in Main branch]
2018-09-25 10:11:35 -04:00
Max Chen
e1c6e93f60
Merging //UE4/Dev-Main to Dev-Sequencer (//UE4/Dev-Sequencer)
...
#rb none
[CL 4284369 by Max Chen in Dev-Sequencer branch]
2018-08-14 14:07:41 -04:00
