Commit Graph

1040 Commits

Author SHA1 Message Date
justin marcus
4195a2ef5c Merging //Fortnite/Dev-Kairos to Main (//Fortnite/Main)
CL 5287635

Fix memory mapped bulk data files all being put in chunk0 because they have a wierd compound extension.

review-5287636 [at]Daniel.Lamb

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: justin.marcus
#ROBOMERGE-SOURCE: CL 5296981 via CL 5307598 via CL 5307724
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5323587 by justin marcus in Dev-Core branch]
2019-03-06 18:07:58 -05:00
justin marcus
ff1b2096b2 Merging //Fortnite/Dev-Kairos to Main (//Fortnite/Main)
CL 5287635

Fix memory mapped bulk data files all being put in chunk0 because they have a wierd compound extension.

review-5287636 [at]Daniel.Lamb


#ROBOMERGE-SOURCE: CL 5296981 via CL 5307598

[CL 5307724 by justin marcus in Main branch]
2019-03-05 18:02:04 -05:00
graeme thornton
3cd044cbc2 Minor unrealpak refactor
- Added a "-sign" parameter to enable signing for the given pak. The cached settings in the crypto.json file aren't used to enable signing any more.
 - Encapsulated all signing and encryption keys in a single keychain object which is passed around, rather than individual keys
 - Added some validation to UBT/UAT encryption config parsing so that if you enable any signing or encryption stuff but haven't generated a key, it'll warn and disable everything.

#jira

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: graeme.thornton
#ROBOMERGE-SOURCE: CL 5237725 via CL 5237726 via CL 5240337 via CL 5240343
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5284373 by graeme thornton in Dev-Core branch]
2019-03-04 11:29:26 -05:00
joe conley
d153297d32 #jira UE-69839 Lumin fails to launch with assert: ICU data directory was not discovered
NonUFSDebugFiles were getting copied to the staging directory first, but did not respect the "DeployLowerCaseFilenames" setting, and were incorrectly determining the captalization of the Engine/Content directory. Copy them after we copy UFSFiles.

#rb Ben.Marsh

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: joe.conley
#ROBOMERGE-SOURCE: CL 5235658 in //UE4/Release-4.22/... via CL 5235659
#ROBOMERGE-BOT: CORE (Main -> Dev-Core)

[CL 5283490 by joe conley in Dev-Core branch]
2019-03-04 11:16:07 -05:00
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
graeme thornton
a668621c8a Minor unrealpak refactor
- Added a "-sign" parameter to enable signing for the given pak. The cached settings in the crypto.json file aren't used to enable signing any more.
 - Encapsulated all signing and encryption keys in a single keychain object which is passed around, rather than individual keys
 - Added some validation to UBT/UAT encryption config parsing so that if you enable any signing or encryption stuff but haven't generated a key, it'll warn and disable everything.

#jira


#ROBOMERGE-OWNER: graeme.thornton
#ROBOMERGE-AUTHOR: graeme.thornton
#ROBOMERGE-SOURCE: CL 5237725 via CL 5237726 via CL 5240337

[CL 5240343 by graeme thornton in Main branch]
2019-02-28 12:55:02 -05:00
joe conley
70819ab103 #jira UE-69839 Lumin fails to launch with assert: ICU data directory was not discovered
NonUFSDebugFiles were getting copied to the staging directory first, but did not respect the "DeployLowerCaseFilenames" setting, and were incorrectly determining the captalization of the Engine/Content directory. Copy them after we copy UFSFiles.

#rb Ben.Marsh

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

[CL 5235659 by joe conley in Main branch]
2019-02-27 20:15:43 -05:00
anthony bills
1b3f526f1c [AutomationTool] Add support to override the launch command line per platform.
#rb david.harvey
[FYI] andrew.grant


#ROBOMERGE-OWNER: anthony.bills
#ROBOMERGE-AUTHOR: anthony.bills
#ROBOMERGE-SOURCE: CL 5206466 via CL 5211320

[CL 5230557 by anthony bills in Main branch]
2019-02-27 16:35:15 -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