Commit Graph

1027 Commits

Author SHA1 Message Date
cosmin sulea
1898787cf3 UE-63767 - iOS Device Output Log console does not work
#jira UE-63767
#rb Jack.Porter

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5036543 in //UE4/Release-4.22/... via CL 5036544
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5122331 by cosmin sulea in Dev-Core branch]
2019-02-22 00:59:41 -05:00
josh adams
f13da13e76 - Final fix now for merge issue (I had compiled wrong program to test my fix, oops)
#jira none
#rb none

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4975198 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5056967 by josh adams in Dev-Core branch]
2019-02-18 19:38:10 -05:00
josh adams
ecd44e7703 - Proper fix to merge conflicts
#jira nojira
[FYI] bob.tellez
#rb none

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4974522 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5056898 by josh adams in Dev-Core branch]
2019-02-18 19:37:05 -05:00
bob tellez
2ef13ee02b Back out revision 103 from CopyBuildToStagingDirectory.Automation.cs to fix CIS
#jira nojira
[FYI] Josh.Adams
#rb none

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 4974353 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5056895 by bob tellez in Dev-Core branch]
2019-02-18 19:37:00 -05:00
arciel rekman
30667d0e7c 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-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4963477 via CL 4963480 via CL 4964321 via CL 4969377
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5055239 by arciel rekman in Dev-Core branch]
2019-02-18 19:05:42 -05:00
arciel rekman
a3e0161d9e 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-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4963367 via CL 4963372 via CL 4964207 via CL 4969343
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5055223 by arciel rekman in Dev-Core branch]
2019-02-18 19:04:53 -05:00
josh adams
641c6a16db - 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: robert.manuszewski
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4963115 via CL 4963118 via CL 4963812 via CL 4969283
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5055189 by josh adams in Dev-Core branch]
2019-02-18 19:04:03 -05:00
ben marsh
87fda12955 Fix ue4commandline.txt being written to engine directory during staging.
#rb none
#jira UE-69193

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4967031 in //UE4/Release-4.22/... via CL 4968665
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5055178 by ben marsh in Dev-Core branch]
2019-02-18 19:03:41 -05:00
arciel rekman
63a5bfe447 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-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4965320 in //UE4/Release-4.22/... via CL 4968661
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5055177 by arciel rekman in Dev-Core branch]
2019-02-18 19:03:39 -05:00
ben marsh
55cd1e07bf Fix times for MSVC timing info being out by a factor of 1000.
#rb none
#jira

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4919950 via CL 4922411 via CL 4922639
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5048841 by ben marsh in Dev-Core branch]
2019-02-18 17:01:55 -05:00
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
df5c6a2906 Add missing copyright notice.
#rb none
#rnx

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4897786 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 4947125 by ben marsh in Dev-Core branch]
2019-02-08 06:21:11 -05:00
ben marsh
34edeac563 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-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4896229 via CL 4896975 via CL 4896977
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 4947080 by ben marsh in Dev-Core branch]
2019-02-08 06:17:34 -05:00
ben marsh
18f03be4dc 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-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4896073 via CL 4896742 via CL 4896785
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 4947067 by ben marsh in Dev-Core branch]
2019-02-08 06:16:41 -05:00
jamie dale
eb572a781f Allow Localization Automation to be be submitted to Perforce
#rb Ben.Marsh

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: jamie.dale
#ROBOMERGE-SOURCE: CL 4858896 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 4931515 by jamie dale in Dev-Core branch]
2019-02-07 07:53:44 -05:00
chris gagnon
165d6fd28e Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 4837001 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 4930699 by chris gagnon in Dev-Core branch]
2019-02-07 07:21:33 -05:00
Robert Manuszewski
338a61ef26 Copying //UE4/Dev-Console to Main (//UE4/Main) Source CL: 4825024
#lockdown: Nick.Penwarden
#rb integration


#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: joe.barnes
#ROBOMERGE-SOURCE: CL 4825156 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 4930119 by Robert Manuszewski in Dev-Core branch]
2019-02-07 07:01:03 -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