Commit Graph

195 Commits

Author SHA1 Message Date
Max Chen
e4d4965491 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 7774443 by Max Chen in Dev-Editor branch]
2019-08-05 15:48:51 -04:00
daniel lamb
f46a50c93c Added support for ClientOnlyNoCommandlet to module type.
Robert.Manuszewski


#ROBOMERGE-OWNER: daniel.lamb
#ROBOMERGE-AUTHOR: daniel.lamb
#ROBOMERGE-SOURCE: CL 7614033 via CL 7614038 via CL 7614047 via CL 7623664
#ROBOMERGE-BOT: (v372-7473910)

[CL 7623665 by daniel lamb in Main branch]
2019-07-25 10:12:32 -04:00
NextTurn
84351b3c5e PR #6013: Fix comment for PostBuildSteps (Contributed by NextTurn)
#rb Chris.Gagnon

[CL 7234231 by Chris Gagnon in Dev-Editor branch]
2019-07-08 18:16:19 -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
justin marcus
46cf77c9d6 Fix Plugin config stomping command line INI overrides.
[at]Daniel.Lamb


#ROBOMERGE-SOURCE: CL 7000877 via CL 7000914 via CL 7020168
#ROBOMERGE-BOT: (v367-6836689)

[CL 7020250 by justin marcus in Main branch]
2019-06-14 19:35:39 -04:00
Mitchell Wilson
3f8c52a80a Copying //UE4/Dev-Documentation to Samples-Main (//UE4/Samples-Main)
#rb none

[CL 6955335 by Mitchell Wilson in Main branch]
2019-06-12 12:19:04 -04:00
mark fitt
e9c0c87a99 Undo changelist 6576392
#ROBOMERGE-SOURCE: CL 6578903 via CL 6578904 via CL 6578905 via CL 6590873
#ROBOMERGE-BOT: (v351-6581450)

[CL 6591022 by mark fitt in Main branch]
2019-05-20 20:31:24 -04:00
mark fitt
9be2e1139f Only load embedded JSBridge modules for whitelisted platforms and remove for shipping builds in some instances.
[at]Sam.Zamani


#ROBOMERGE-SOURCE: CL 6576392 via CL 6576394 via CL 6576409 via CL 6580719
#ROBOMERGE-BOT: (v350-6578747)

[CL 6580944 by mark fitt in Main branch]
2019-05-20 14:59:42 -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
ben marsh
a3a247c51c Ensure that a project is converted to a code project if it has a plugin enabled for the target platform being packaged.
#rb none
#jira UE-71909

#ROBOMERGE-SOURCE: CL 6038501 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 6038503 by ben marsh in Main branch]
2019-04-22 16:01:17 -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
francis hurteau
d1bf09e21f Fixed plugin config overrides for out of tree projects, also route plugin overrides properly when specifying ini on the command line
#jira UE-71747
#rb Jamie.Dale, Ben.Marsh, Josh.Adams
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 5482926 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5482940 by francis hurteau in Main branch]
2019-03-20 15:07:36 -04:00
arthur flew
70dc83848c Allow you to enable certain plugins via the command line using -EnablePlugins
#rb Ben.Marsh
[FYI] jamie.dale, hazel.kelly, joseph.sozio


#ROBOMERGE-SOURCE: CL 5228404 via CL 5228405 via CL 5228406 via CL 5228408 via CL 5229158

[CL 5233423 by arthur flew in Main branch]
2019-02-27 17:31:04 -05:00
Josh Adams
d0bf843c9c - Merging Dev-Kairos/Engine/... to Main/Engine/...
- Brings over the necessary engine changes for embedding UE4 mobile as a dylib/so in native mobile app
- Various changes for facial animation, screen recording, others
- ARKit and ARCore plugins were removed, as deemed "not ready"
#rb many people


#ROBOMERGE-OWNER: josh.adams
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 5201138 via CL 5203024

[CL 5226277 by Josh Adams in Main branch]
2019-02-27 11:57:17 -05:00
Chris Gagnon
a48e767b94 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4835066 by Chris Gagnon in Dev-Editor branch]
2019-01-29 16:15:19 -05:00
Chris Gagnon
0dbe1f7fb2 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4766091 by Chris Gagnon in Dev-Editor branch]
2019-01-21 17:47:02 -05:00
andrew grant
fb332a9b31 Fix issue where failure to load a plugin was a silent failure with unattended.
#jira UE-68367
#lockdown Nick.Penwarden
#rb na

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 4729104 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 4734682 by andrew grant in Dev-Core branch]
2019-01-16 14:04:44 -05:00
James Hopkin
a9f7efc154 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 4718806

[CL 4732416 by James Hopkin in Dev-Core branch]
2019-01-16 10:11:46 -05: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
Andrew Grant
e586867484 Fix issue where failure to load a plugin was a silent failure with unattended.
#jira UE-68367
#lockdown Nick.Penwarden
#rb na
#robomerge FORTNITE-MAIN

[CL 4729104 by Andrew Grant in Main branch]
2019-01-15 17:16:51 -05:00
Ben Marsh
a22b952aa9 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 4718806 by Ben Marsh in Main branch]
2019-01-14 12:11:24 -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
Robert Manuszewski
2752c82adc Merging //UE4/Dev-Main @ 4664414 to Dev-Core (//UE4/Dev-Core)
#rb none

[CL 4675693 by Robert Manuszewski in Dev-Core branch]
2019-01-02 00:55:51 -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
Robert Manuszewski
1685ed0b2e Merging //UE4/Dev-Main @ 4620382 to Dev-Core (//UE4/Dev-Core)
#rb none

[CL 4631078 by Robert Manuszewski in Dev-Core branch]
2018-12-04 23:30:42 -05:00