Commit Graph

1033 Commits

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

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: anthony.bills
#ROBOMERGE-SOURCE: CL 5206466 via CL 5211320 via CL 5230557
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5282902 by anthony bills in Dev-Core branch]
2019-03-04 10:52:46 -05:00
robert manuszewski
ad12528093 - 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: robert.manuszewski
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 5201138 via CL 5203024 via CL 5226277
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5282591 by robert manuszewski in Dev-Core branch]
2019-03-04 10:41:42 -05:00
Josh Adams
d0bf843c9c - 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: josh.adams
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 5201138 via CL 5203024

[CL 5226277 by Josh Adams in Main branch]
2019-02-27 11:57:17 -05:00
ben marsh
a982fffe96 Remove RPCUtility.
#rb none
#jira UE-70509
[FYI] Peter.Sauerbrei

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

[CL 5220394 by ben marsh in Dev-Core branch]
2019-02-26 21:02:18 -05:00
ben marsh
0a7bff24d0 Remove RPCUtility.
#rb none
#jira UE-70509
[FYI] Peter.Sauerbrei

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

[CL 5207569 by ben marsh in Main branch]
2019-02-26 16:38:49 -05:00
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
cosmin sulea
1a8c3d35f5 UE-63767 - iOS Device Output Log console does not work
#jira UE-63767
#rb Jack.Porter

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

[CL 5036544 by cosmin sulea in Main branch]
2019-02-18 05:54:48 -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