Commit Graph

47 Commits

Author SHA1 Message Date
Jack Porter
d4207c49d9 Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)
#rb None

[CL 8074187 by Jack Porter in Dev-Mobile branch]
2019-08-16 01:45:16 -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
Jack Porter
e75ba23361 Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)
#rb None

[CL 6662857 by Jack Porter in Dev-Mobile branch]
2019-05-29 05:11:25 -04:00
Ben Marsh
0cc6e3dca6 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 6631504 by Ben Marsh in Main branch]
2019-05-24 11:51:54 -04:00
Jack Porter
8d3bbb48b2 Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)
#rb None
#jira None

[CL 5826383 by Jack Porter in Dev-Mobile branch]
2019-04-11 06:05:49 -04:00
yuriy odonnell
706506a4ab Fixed compile errors when compiling Win64 Clang Editor config due to FLocTextHelper move ctor and assignment.
FLocTextConflicts ConflictTracker member is explicitly marked non-copyable / movable, therefore default move for FLocTextHelper can't be generated. There is currently no reason for FLocTextHelper to be movable, therefore default move ops are now simply removed from code. Move ops can be added to FLocTextConflicts if necessary in the future.

#rb arciel.rekman
#jira UE-72151
#lockdown cristina.riveron

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

[CL 5773429 by yuriy odonnell in Main branch]
2019-04-08 08:17:50 -04:00
Jack Porter
9d2ebe90d2 Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)
#rb None
#jira 0

[CL 5396125 by Jack Porter in Dev-Mobile branch]
2019-03-14 00:59:16 -04:00
jamie dale
72512ca8a6 Fixed uninitialized variables
#jira UE-70784
#rb none
#rnx

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

[CL 5274923 by jamie dale in Main branch]
2019-03-02 11:56:31 -05:00
jamie dale
deb01fdcf2 Added whitespace validation to LocRes compilation, and added flags to control which validation to run on a per-target basis
#jira
#rb Nick.Darnell


#ROBOMERGE-OWNER: jamie.dale
#ROBOMERGE-AUTHOR: jamie.dale
#ROBOMERGE-SOURCE: CL 5232237 via CL 5239160

[CL 5239165 by jamie dale in Main branch]
2019-02-28 11:46:11 -05:00
Chris Gagnon
80918bea22 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 5110714 by Chris Gagnon in Dev-Editor branch]
2019-02-21 13:05:30 -05:00
jamie dale
05009aa0c7 Allow game localization targets to gather engine sources from an out-of-source project
The localization pipeline locks the relative paths used by a target to either the engine or project root (depending on the target type), however the UE4 engine isn't localized into many languages, so project targets often have to override some of the engine localization to support their additional languages. For in-source builds, this was possible by using a project relative path to the engine directory (which was in a fixed location), however for any out-of-source projects (such as those in the "Unreal Projects" directory) there was no way to do this in a portable way.

This change adds a "path root" to every include and exclude path, which can be set to "Auto" (the default, which detects the root based on the target type), "Engine" (to force the path to be resolved relative to the engine root), or "Project" (to force the path to be resolved relative to the project root). This allows out-of-source projects to specify paths relative to the engine in a portable way.

#jira UE-70296
#rb Lauren.Ridge

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

[CL 5073205 by jamie dale in Main branch]
2019-02-19 17:04:12 -05:00
Jamie Dale
adc2fefb19 Added support for splitting off per-platform localization
This is handled by the ELocTextPlatformSplitMode enum, used by FLocTextHelper (default is ELocTextPlatformSplitMode::None to preserve old behavior), and allows you to optionally split localization data for all platforms, or for any NDA restricted platforms. Note: Any localization data that is used by multiple platforms is still considered platform agnostic, even if it appears only within platform specific files.

#jira UE-65600
#rb Francis.Hurteau
#lockdown Matt.Kuhlenschmidt

[CL 4761508 by Jamie Dale in Dev-Editor branch]
2019-01-21 11:07:47 -05:00
Jack Porter
068ca68f0b Merging //UE4/Main/Engine/... to //UE4/Dev-Mobile
#rb None

[CL 4749281 by Jack Porter in Dev-Mobile branch]
2019-01-17 21:54:28 -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
Chris Gagnon
1a3bf5caf1 Merging The Engine directory from //UE4/Dev-Main to //UE4/Dev-Editor upto CL 4698813
#rb none

[CL 4720826 by Chris Gagnon in Dev-Editor branch]
2019-01-14 16:55:55 -05:00
Ben Marsh
e26dfd2100 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4716250 by Ben Marsh in Dev-Build branch]
2019-01-12 13:09:07 -05:00
Ben Marsh
129aac0526 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4706788 by Ben Marsh in Dev-Build branch]
2019-01-10 20:03:35 -05:00
Ben Marsh
c09b6d7f18 Merge from //UE4/Main.
#rb none
#rnx

[CL 4701155 by Ben Marsh in Dev-Build branch]
2019-01-10 11:10:29 -05:00
Ben Marsh
287fa130a3 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4677654 by Ben Marsh in Dev-Build branch]
2019-01-02 20:42:29 -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
Jack Porter
0245e895e4 Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)
#rb None

[CL 4675678 by Jack Porter in Dev-Mobile branch]
2019-01-01 23:32:24 -05:00
Ben Marsh
0c830ebcdb Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4671723 by Ben Marsh in Dev-Build branch]
2018-12-20 08:33:57 -05:00
Ben Marsh
530369c613 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4662695 by Ben Marsh in Dev-Build branch]
2018-12-14 14:49:12 -05:00
Jack Porter
a400cb96bf Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)
#rb None
#jira None

[CL 4564204 by Jack Porter in Dev-Mobile branch]
2018-11-13 23:40:18 -05:00