Marc Audy
b04bcc03de
Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 4677883
...
#rb
#rnx
[CL 4678256 by Marc Audy in Dev-Framework branch]
2019-01-03 09:32:53 -05:00
Ben Marsh
8f69278255
UBT: Use the 6.00 version of Clang by default on Windows, until fixes for newer versions have been merged into Main.
...
#rb none
#lockdown Nick.Penwarden
[CL 4677458 by Ben Marsh in Main branch]
2019-01-02 18:18:47 -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
Marc Audy
cfa34cf59d
Remove UHT error for now. Deal with it next year.
...
#rnx
#rb
[CL 4666992 by Marc Audy in Dev-Framework branch]
2018-12-17 17:00:18 -05:00
Marc Audy
9cf12554f0
Added UHT error for marking a struct property as BlueprintAssignable since it cannot be bound in blueprints.
...
#rb
[CL 4666372 by Marc Audy in Dev-Framework branch]
2018-12-17 13:55:22 -05:00
Marc Audy
608734e30d
Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 4664414
...
#rb
#rnx
[CL 4666113 by Marc Audy in Dev-Framework branch]
2018-12-17 12:24:20 -05:00
Brandon Schaefer
a0afd67f03
Disable XGE again for cross compiling Linux builds
...
#jira UE-67657
#rb none
#lockdown matt.kuhlenschmidt
[CL 4666034 by Brandon Schaefer in Dev-Editor branch]
2018-12-17 11:52:17 -05:00
Matt Kuhlenschmidt
7a313bf0eb
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 4659626 by Matt Kuhlenschmidt in Dev-Editor branch]
2018-12-13 17:04:16 -05:00
Marc Audy
680c98e3a3
Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 4656692
...
#rb
#rnx
[CL 4657607 by Marc Audy in Dev-Framework branch]
2018-12-13 11:17:01 -05:00
Matt Kuhlenschmidt
f4b5f6c454
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 4650481 by Matt Kuhlenschmidt in Dev-Editor branch]
2018-12-11 17:08:36 -05:00
Marc Audy
6883d64fb7
PR #5284 : Allow multiple ExpandEnumsAsExecs parameters (Contributed by korkuveren)
...
#jira UE-66615
#rb Me
[CL 4649624 by Marc Audy in Dev-Framework branch]
2018-12-11 15:10:39 -05:00
Ben Marsh
d1863e0cdf
UBT: Fix CachedIncludePaths not being set correctly for modules which do not use unity builds and do not have IWYU enabled. Set the cached include paths for all source files, regardless of the code path used to compile them.
...
Causes files to not be rebuilt when headers change, potentially causing memory corruption, etc...
#rb none
#lockdown Nick.Penwarden
[CL 4644975 by Ben Marsh in Main branch]
2018-12-10 10:36:00 -05:00
Marcus Wassmer
2b944cb943
Copying //UE4/Dev-Rendering@4626416 to Dev-Main (//UE4/Dev-Main)
...
#rb none
#lockdown nick.penwarden
[CL 4626501 by Marcus Wassmer in Main branch]
2018-12-03 22:25:23 -05:00
Matt Kuhlenschmidt
fcc9402ceb
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 4623549 by Matt Kuhlenschmidt in Dev-Editor branch]
2018-12-03 09:48:43 -05:00
Andrew Grant
82d60da43f
Merging UAT fixes from 4.21.1
...
#jira UE-67014
#lockdown nick.penwarden
#rb na
[CL 4612776 by Andrew Grant in Main branch]
2018-11-29 17:12:30 -05:00
Jamie Dale
9310bde898
Added support for staging DLC localization data, and consistently implemented target exclusion
...
#rb Francis.Hurteau
[CL 4597248 by Jamie Dale in Dev-Editor branch]
2018-11-27 11:49:20 -05:00
Matt Kuhlenschmidt
cde8160913
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 4572510 by Matt Kuhlenschmidt in Dev-Editor branch]
2018-11-16 11:15:08 -05:00
Ben Marsh
7f3f2662a0
UAT: Match the pattern "START XXX HACK" when looking for branch-specific hacks in the codebase.
...
#rb none
#fyi Marc.Audy
#lockdown Nick.Penwarden
[CL 4568902 by Ben Marsh in Main branch]
2018-11-15 09:21:13 -05:00
Ben Marsh
d4d25c6238
Merging CopyBuildToStagingDirectory.Automation.cs from Fortnite-Staging, excluding hacks.
...
#rb none
#lockdown Nick.Penwarden
[CL 4567547 by Ben Marsh in Main branch]
2018-11-14 19:08:12 -05:00
Ben Marsh
ea340d3fbf
Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main)
...
#rb none
#lockdown Nick.Penwarden
[CL 4567513 by Ben Marsh in Main branch]
2018-11-14 19:05:13 -05:00
Matt Kuhlenschmidt
0751bf9e3a
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 4566293 by Matt Kuhlenschmidt in Dev-Editor branch]
2018-11-14 15:27:39 -05:00
Ben Marsh
b1d44977f8
Fix remote builds failing due to new default SSH key format generated by version of ssh included with MacOS Mojave. The new format (as indicated by a "BEGIN OPENSSH PRIVATE KEY" header) is not supported by the version of SSH that we ship with the engine.
...
* Remote building now includes the SSH error when a build fails.
* Any private keys that don't have a BEGIN RSA PRIVATE KEY header are rejected, causing MakeAndInstallSSHKey to be re-run.
* MakeAndInstallSSHKey.bat now passes -m PEM to ssh-keygen, to force generation of keys in the old format.
#rb none
#lockdown Nick.Penwarden
[CL 4555827 by Ben Marsh in Main branch]
2018-11-09 13:09:06 -05:00
Ben Marsh
9aa4b31fbc
Merge fixes to project file generator from 4.21 branch (duplicate projects appearing in Xcode workspace, incorrect version association for solution on Windows)
...
#rb none
#lockdown Nick.Penwarden
[CL 4551290 by Ben Marsh in Main branch]
2018-11-08 10:18:07 -05:00
Matt Kuhlenschmidt
46e3285149
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 4543237 by Matt Kuhlenschmidt in Dev-Editor branch]
2018-11-06 10:00:36 -05:00
chris babcock
10a934a5b5
Fix for Ant NotificationCompat issue
...
#jira UE-66125
#ue4
#android
[FYI] Jack.Porter
#rb Hongyi.Yu
#lockdown Cristina.Riveron
#ROBOMERGE-SOURCE: CL 4537669 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)
[CL 4537673 by chris babcock in Staging-4.21 branch]
2018-11-02 18:09:16 -04:00
