Commit Graph

944 Commits

Author SHA1 Message Date
Josh Adams
8ff0d3e049 - Final fix now for merge issue (I had compiled wrong program to test my fix, oops)
#jira none
#rb none

[CL 4975198 by Josh Adams in Main branch]
2019-02-12 15:11:28 -05:00
Josh Adams
49a8c18de8 - Proper fix to merge conflicts
#jira nojira
#fyi bob.tellez
#rb none

[CL 4974522 by Josh Adams in Main branch]
2019-02-12 14:21:53 -05:00
Bob Tellez
4c1924b19d Back out revision 103 from CopyBuildToStagingDirectory.Automation.cs to fix CIS
#jira nojira
#fyi Josh.Adams
#rb none

[CL 4974353 by Bob Tellez in Main branch]
2019-02-12 13:52:23 -05:00
arciel rekman
6ca197ae6c PhysX: change v13 Linux toolchain to v12 one (for real).
- There are issues when the libraries are compiled with clang 7.0.1 (tracked as UE-69848).

#rb Ben.Marsh
#rnx
[FYI] [at]Bob.Tellez


#ROBOMERGE-SOURCE: CL 4963477 via CL 4963480 via CL 4964321

[CL 4969377 by arciel rekman in Main branch]
2019-02-12 10:28:47 -05:00
arciel rekman
7aeb1721ac PhysX: change v13 Linux toolchain to v12 one.
- There are issues when the libraries are compiled with clang 7.0.1 (tracked as UE-69848).

#rb Ben.Marsh
#rnx
[FYI] [at]Bob.Tellez


#ROBOMERGE-SOURCE: CL 4963367 via CL 4963372 via CL 4964207

[CL 4969343 by arciel rekman in Main branch]
2019-02-12 10:28:34 -05:00
josh adams
b7f8902fb9 - Memory Mapped IO enabled on IOS for Audio (via ini and platform property)
- -nommio on the commandline will disble it for testing
#rb gil.gribb


#ROBOMERGE-OWNER: josh.adams
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4963115 via CL 4963118 via CL 4963812

[CL 4969283 by josh adams in Main branch]
2019-02-12 10:27:29 -05:00
ben marsh
0bec0e7c0e Fix ue4commandline.txt being written to engine directory during staging.
#rb none
#jira UE-69193

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

[CL 4968665 by ben marsh in Main branch]
2019-02-12 09:41:24 -05:00
arciel rekman
a8c2062019 PhysX: change v13 Linux toolchain to v12 one.
- There are issues when the libraries are compiled with clang 7.0.1 (tracked as UE-69848).

#jira UE-69848
#rb Ben.Marsh
#rnx

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

[CL 4968661 by arciel rekman in Main branch]
2019-02-12 09:41:23 -05:00
ben marsh
350331202f Fix times for MSVC timing info being out by a factor of 1000.
#rb none
#jira


#ROBOMERGE-SOURCE: CL 4919950 via CL 4922411

[CL 4922639 by ben marsh in Main branch]
2019-02-06 13:47:04 -05:00
Ben Marsh
325745062e Add missing copyright notice.
#rb none
#rnx

[CL 4897786 by Ben Marsh in Main branch]
2019-02-05 09:50:56 -05:00
ben marsh
8505034179 Parse out a sorted list of classes and functions from the MSVC timing info. Groups templates together, to allow better understanding the most expensive code to compile.
#jira


#ROBOMERGE-SOURCE: CL 4896229 via CL 4896975

[CL 4896977 by ben marsh in Main branch]
2019-02-05 01:03:02 -05:00
ben marsh
0817777c73 UAT: Add a build command to parse the output from MSVC's /d1reportTime argument, and convert it into a trace that can be visualized in Chrome's chrome://tracing tab.
To generate an input file, compile a single file with UnrealBuildTool and redirect the output to a text file:

    UnrealBuildTool.exe UE4Editor Win64 Development -SingleFile="E:\P4\Engine\Source\Runtime\Core\Private\Misc\CoreGlobals.cpp" -Timing > E:\Output.txt

To convert into a trace readable by chrome:

   AutomationTool.exe ParseMsvcTimingInfo -File=E:\Output.txt

Output file will be written to the same directory as the input file, but with a json extension.

#jira


#ROBOMERGE-SOURCE: CL 4896073 via CL 4896742

[CL 4896785 by ben marsh in Main branch]
2019-02-05 00:35:21 -05:00
Jamie Dale
f3c2db7eb3 Allow Localization Automation to be be submitted to Perforce
#rb Ben.Marsh

[CL 4858896 by Jamie Dale in Main branch]
2019-01-31 11:36:19 -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
Jamie Dale
a27aefcf57 Changed some of the localization automation to use classes with read-only members, rather than use structs
#jira UE-65600
#rb Francis.Hurteau
#lockdown Matt.Kuhlenschmidt

[CL 4762550 by Jamie Dale in Dev-Editor branch]
2019-01-21 12:57:05 -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
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
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
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
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
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
Matt Kuhlenschmidt
0c387a28a1 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4395683 by Matt Kuhlenschmidt in Dev-Editor branch]
2018-09-25 13:44:09 -04:00