Commit Graph

950 Commits

Author SHA1 Message Date
anthony bills
b2616cd708 [AutomationTool] Add support to override the launch command line per platform.
#rb david.harvey
[FYI] andrew.grant

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: anthony.bills
#ROBOMERGE-SOURCE: CL 5206466 via CL 5211320 via CL 5230557
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5248616 by anthony bills in Dev-VR branch]
2019-02-28 17:28:15 -05:00
josh adams
019c12863e - 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: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 5201138 via CL 5203024 via CL 5226277
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5244512 by josh adams in Dev-VR branch]
2019-02-28 17:06:02 -05:00
ben marsh
7011863b74 Remove RPCUtility.
#rb none
#jira UE-70509
[FYI] Peter.Sauerbrei

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5174514 in //UE4/Release-4.22/... via CL 5207569
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5223716 by ben marsh in Dev-VR branch]
2019-02-26 22:33:33 -05:00
cosmin sulea
c44a8176fd UE-63767 - iOS Device Output Log console does not work
#jira UE-63767
#rb Jack.Porter

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5036543 in //UE4/Release-4.22/... via CL 5036544
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

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

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4975198 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5032756 by josh adams in Dev-VR branch]
2019-02-16 07:16:33 -05:00
josh adams
8ba99b94de - Proper fix to merge conflicts
#jira nojira
[FYI] bob.tellez
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4974522 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5032626 by josh adams in Dev-VR branch]
2019-02-16 07:13:44 -05:00
bob tellez
1d031bb7be Back out revision 103 from CopyBuildToStagingDirectory.Automation.cs to fix CIS
#jira nojira
[FYI] Josh.Adams
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: bob.tellez
#ROBOMERGE-SOURCE: CL 4974353 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5032623 by bob tellez in Dev-VR branch]
2019-02-16 07:13:40 -05:00
arciel rekman
75cd110161 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: ryan.vance
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4963477 via CL 4963480 via CL 4964321 via CL 4969377
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5031241 by arciel rekman in Dev-VR branch]
2019-02-16 06:06:55 -05:00
arciel rekman
7eea5d5946 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: ryan.vance
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4963367 via CL 4963372 via CL 4964207 via CL 4969343
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5031233 by arciel rekman in Dev-VR branch]
2019-02-16 06:06:36 -05:00
josh adams
ba53727028 - 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: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 4963115 via CL 4963118 via CL 4963812 via CL 4969283
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5031108 by josh adams in Dev-VR branch]
2019-02-16 06:02:18 -05:00
ben marsh
20590a9f8e Fix ue4commandline.txt being written to engine directory during staging.
#rb none
#jira UE-69193

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4967031 in //UE4/Release-4.22/... via CL 4968665
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5031097 by ben marsh in Dev-VR branch]
2019-02-16 06:01:14 -05:00
arciel rekman
b83639afd6 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: ryan.vance
#ROBOMERGE-AUTHOR: arciel.rekman
#ROBOMERGE-SOURCE: CL 4965320 in //UE4/Release-4.22/... via CL 4968661
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5031096 by arciel rekman in Dev-VR branch]
2019-02-16 06:01:10 -05:00
ben marsh
29893a312d Fix times for MSVC timing info being out by a factor of 1000.
#rb none
#jira

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4919950 via CL 4922411 via CL 4922639
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5016545 by ben marsh in Dev-VR branch]
2019-02-16 01:12:51 -05:00
ben marsh
6b417a0b2f Add missing copyright notice.
#rb none
#rnx

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4897786 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4912971 by ben marsh in Dev-VR branch]
2019-02-05 18:55:39 -05:00
ben marsh
d5f04b3023 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: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4896229 via CL 4896975 via CL 4896977
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4912546 by ben marsh in Dev-VR branch]
2019-02-05 18:49:22 -05:00
ben marsh
764c622bbc 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: ryan.vance
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4896073 via CL 4896742 via CL 4896785
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4912487 by ben marsh in Dev-VR branch]
2019-02-05 18:49:07 -05:00
jamie dale
6072ce9820 Allow Localization Automation to be be submitted to Perforce
#rb Ben.Marsh

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jamie.dale
#ROBOMERGE-SOURCE: CL 4858896 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4858899 by jamie dale in Dev-VR branch]
2019-01-31 11:36:22 -05:00
chris gagnon
632b923945 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 4837001 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4837006 by chris gagnon in Dev-VR branch]
2019-01-29 19:23:19 -05:00
Ryan Vance
cf29818a4d Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
#rb integration
Unblocking RoboMerge

[CL 4836190 by Ryan Vance in Dev-VR branch]
2019-01-29 17:41:46 -05:00
Ryan Vance
82046cb96e Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
#rb integration
#lockdown nick.whiting

[CL 4819818 by Ryan Vance in Dev-VR branch]
2019-01-25 23:58:19 -05:00
Joe Conley
c12a880a0c Unshelved from pending changelist '4791207':
Source=CL 4772220 in //UE4/Main/...
Acknowledger=joe.conley (Thu Jan 24 2019 00:26:59 GMT+0000 (Coordinated Universal Time))
ShelfCl=4791207
Target=Dev-VR
Merge conflict:
/src/ROBOMERGE_DEVVR_Dev_VR/Engine/Plugins/Lumin/MagicLeap/Source/MagicLeapController/Private/MagicLeapController.cpp - merging //UE4/Main/Engine/Plugins/Lumin/MagicLeap/Source/MagicLeapController/Private/MagicLeapController.cpp#5

#rb Ryan.Vance

[CL 4792243 by Joe Conley in Dev-VR branch]
2019-01-23 19:56:41 -05:00
Ryan Vance
91cee27746 Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
#rb integration

[CL 4762854 by Ryan Vance in Dev-VR branch]
2019-01-21 13:30:34 -05:00
Ryan Vance
7c51ff94af Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
CL 1 of 8
#rb integration

[CL 4748712 by Ryan Vance in Dev-VR branch]
2019-01-17 18:54:05 -05:00
andrew grant
684336ccb1 Merging UAT fixes from 4.21.1
#jira UE-67014
#lockdown nick.penwarden
#rb na

#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 4612776 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4612782 by andrew grant in Dev-VR branch]
2018-11-29 17:12:48 -05:00
Jason Bestimt
e7ed7cd3ff Unblock robomerge from Main
#RB:none

[CL 4604382 by Jason Bestimt in Dev-VR branch]
2018-11-28 15:05:11 -05:00