Commit Graph

4544 Commits

Author SHA1 Message Date
Thomas Sarkanen
cc942a3341 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4768627
#rb none
#jira none

[CL 4769629 by Thomas Sarkanen in Dev-Anim branch]
2019-01-22 06:48:04 -05:00
Lina Halper
f473c3d669 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim)
#fyi: Laurent.Delayen, Thomas.Sarkanen
#rb: none
#lockdown thomas.sarkanen

[CL 4715236 by Lina Halper in Dev-Anim branch]
2019-01-11 21:07:09 -05:00
Lina Halper
c1cde9927a Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim)
#fyi: Laurent.Delayen, Thomas.Sarkanen
#rb: none
#lockdown thomas.sarkanen

[CL 4715192 by Lina Halper in Dev-Anim branch]
2019-01-11 20:48:06 -05:00
Jurre deBaare
1b42cbd5e1 Fix CIS issues with merge from Main
#jira none
#rb none
#lockdown Thomas.Sarkanen

[CL 4708777 by Jurre deBaare in Dev-Anim branch]
2019-01-11 08:47:02 -05:00
Thomas Sarkanen
b709a10f4c Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4708558
#rb none
#jira none
#lockdown Laurent.Delayen

[CL 4708630 by Thomas Sarkanen in Dev-Anim branch]
2019-01-11 07:37:39 -05:00
Thomas Sarkanen
e0f6136524 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4704791
#rb none
#jiira none

[CL 4708070 by Thomas Sarkanen in Dev-Anim branch]
2019-01-11 04:11:30 -05:00
Jurre deBaare
8fc9b7e60e Removed thirdparty modules and dependencies
#jira UE-65642
#rb none

[CL 4691986 by Jurre deBaare in Dev-Anim branch]
2019-01-09 06:58:40 -05:00
Thomas Sarkanen
7088a2f273 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4683693
#rb none
#jira none

[CL 4684302 by Thomas Sarkanen in Dev-Anim branch]
2019-01-07 05:38:46 -05:00
Thomas Sarkanen
8ba3c4c087 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
#rb none
#jira none

[CL 4665410 by Thomas Sarkanen in Dev-Anim branch]
2018-12-17 06:31:16 -05:00
Thomas Sarkanen
e5eb5adfbe Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4643671
#rb none
#jira none

[CL 4644540 by Thomas Sarkanen in Dev-Anim branch]
2018-12-10 05:09:18 -05:00
Thomas Sarkanen
ce1d05fdb1 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4620382
#rb none
#jira none

[CL 4623267 by Thomas Sarkanen in Dev-Anim branch]
2018-12-03 05:28:11 -05:00
Thomas Sarkanen
c51a339259 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4574801
#jira none
#rb none

[CL 4575789 by Thomas Sarkanen in Dev-Anim branch]
2018-11-19 07:03:18 -05:00
Thomas Sarkanen
c359a36380 Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4534846
#rb none
#jira none

[CL 4539252 by Thomas Sarkanen in Dev-Anim branch]
2018-11-05 05:56:30 -05:00
Ben Marsh
00732c096d UAT: Allow targets to be built with parallel executor *and* XGE in a single UE4Build instance. Some platforms don't support XGE (but do support parallel exector), so we need to allow them to build in parallel if possible.
#rb none
#lockdown Nick.Penwarden

[CL 4513312 by Ben Marsh in Main branch]
2018-10-26 16:01:33 -04:00
Chad Garyet
f9c18324cd BuildGraph: Allow specifying a target for badges, which marks all dependencies as required.
#rb none
#jira none
#lockdown nick.penwarden

[CL 4503321 by Chad Garyet in Main branch]
2018-10-24 14:45:25 -04:00
jack porter
6d09f08fad Add detection and device profiles for iPhone XS / XS Max / SR
Integrated from CL 4433649
#jira UE-65622
#rb None
[FYI] Peter.Sauerbrei
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 4501118 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4501119 by jack porter in Staging-4.21 branch]
2018-10-24 03:55:48 -04:00
ben marsh
36a1b72319 Copy minidumps generated on build machines into the UAT log folder.
#rb none
[FYI] Rolando.Caloca
#jira UE-65505

#ROBOMERGE-SOURCE: CL 4500691 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4500692 by ben marsh in Staging-4.21 branch]
2018-10-23 20:30:15 -04:00
cosmin sulea
ca2a6caa39 UE-65016 - OpenGLES API deprecated warnings when packaging AR Samples
#rb Allan.Bentham
#jira UE-65016

#ROBOMERGE-SOURCE: CL 4498197 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4498198 by cosmin sulea in Staging-4.21 branch]
2018-10-23 11:01:20 -04:00
ben marsh
71279739f0 Allow multiple targets of the same type when generating project files. Secondary targets (as determined by sorting target files alphabetically) are placed in their own generated project file, with the ability to override the name of it specified by the GeneratedProjectName variable in the TargetRules class.
#rb none
#jira UE-65286

#ROBOMERGE-SOURCE: CL 4497282 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4497284 by ben marsh in Staging-4.21 branch]
2018-10-22 20:14:06 -04:00
brian karis
7dac4df357 Fixed rect light lightmass issues.
#jira UE-65612
#rb none

#ROBOMERGE-SOURCE: CL 4496582 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4496583 by brian karis in Staging-4.21 branch]
2018-10-22 16:37:39 -04:00
ben marsh
9baadfcdcd Undo //UE4/Release-4.21/Engine/Source/Programs/AutomationTool/AutomationUtils/... changelist 4494623
Prevents UAT running on Mac.

[FYI] Sorin.Gradinaru
#rb none
#jira

#ROBOMERGE-SOURCE: CL 4496215 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4496217 by ben marsh in Staging-4.21 branch]
2018-10-22 15:14:04 -04:00
chad garyet
ffba4ee00d Somehow the csproj change by itself didn't make it back into main from 4.20
Integrating that over.
#jira UE-61955
#rb none

#ROBOMERGE-SOURCE: CL 4495328 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4495334 by chad garyet in Staging-4.21 branch]
2018-10-22 11:40:39 -04:00
alistair white
bbc13ee360 Copy of changelists 4415335, 4439166
+ Adding scripts for running Cirrus with a TURN server
+ Adding scripts for starting STUN and TURN servers
+ Adding batch and powershell scripts to package

#rb Stuart.Hill, Simon.Tourangeau
#jira UE-65576

#ROBOMERGE-SOURCE: CL 4495309 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4495310 by alistair white in Staging-4.21 branch]
2018-10-22 11:33:56 -04:00
cmp-
2109e86ea9 PR #5180: Fix wrong .natvis file path in generated Visual Studio solution (Contributed by cmp-)
#jira UE-65432
#rb none

#ROBOMERGE-SOURCE: CL 4495051 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4495053 by ben marsh in Staging-4.21 branch]
2018-10-22 10:26:40 -04:00
cosmin sulea
f42b0c7554 UE-40545 - TVOS images are throwing errors when attempting to deploy to iTunes Connect
#rb Brian.Zaugg
#jira UE-40545

#ROBOMERGE-SOURCE: CL 4494811 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4494813 by cosmin sulea in Staging-4.21 branch]
2018-10-22 08:32:42 -04:00