Commit Graph

59 Commits

Author SHA1 Message Date
hongyi yu
3356da3bfb Added support for per-platform mapping from chunkid to pakchunk index. Part 1
- This feature allows different chunk layout on different platforms.
- Most mapping work is done in AssetRegistryGenerator.
- Terminology of ChunkID and Pakchunk Index are now separated and they are no longer the same if chunk id to pakchunk index mapping is defined.  The ChunkIDs in FAssetData is not renamed to keep consistency, but it actually is pakchunk index.  FAssetData.ChunkIDs is used for ChunkInstall.
- Chunks with encryption key guid or unique assetregistry name are not allowed to be mapped.  There are code to filter out those chunks and log errors while initializing mapping
- CheckChunkAssetsAreNotInChild() and ResolveChunkDependencyGraph() is skipped when making build for XboxOne and PS4, since they are not needed.  If for some reason, we need chunk dependency on console builds, we need to implement per-platform dependency graph, since now we support different chunk layout on different platforms.
- Disabled a few pak file overide rules for console builds, since they should only be applied to builds with Kairos chunk layout.

#test A preflight was kicked and tested on PS4 and XboxOne.  No new issue was found.
#rb Daniel.Lamb

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: hongyi.yu
#ROBOMERGE-SOURCE: CL 5470414 via CL 5474050 via CL 5474308
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5506163 by hongyi yu in Dev-VR branch]
2019-03-22 17:04:02 -04:00
mark satterthwaite
4f6d186dec In order to keep up with the HLR the desktop renderers now require Metal 2.0 or later on Apple's platforms - Metal 1.2 just isn't sufficient.
#rb none
#jira UE-71589

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: mark.satterthwaite
#ROBOMERGE-SOURCE: CL 5415631 in //UE4/Release-4.22/... via CL 5415651
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5420963 by mark satterthwaite in Dev-VR branch]
2019-03-15 16:59:28 -04:00
Ryan Vance
35eb0041ab Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
#rb integration

[CL 5387703 by Ryan Vance in Dev-VR branch]
2019-03-13 15:19:08 -04:00
cosmin sulea
ca2f211eca UE-70653 - Edit hangs for a few seconds when entering iOS commands in device output log
#jira UE-70653
#rb Jack.Porter

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

[CL 5255158 by cosmin sulea in Dev-VR branch]
2019-02-28 18:18:53 -05:00
cosmin sulea
bf697f4104 UE-62851 - Remote Build pre-check error does not appear when missing required arguments
#jira UE-62851
#rb Jack.Porter

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

[CL 5255153 by cosmin sulea in Dev-VR branch]
2019-02-28 18:18:50 -05:00
cosmin sulea
75785e6646 UE-70550 - //UE4/Release-4.22 - UE4Editor Static Analysis Win64 (MSVC) - warning C6387: 'mutex' could be '0': this does not adhere to the specification for the function 'CloseHandle' - iostargetdevice.cpp
#jira UE-70550
#rb none

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

[CL 5223719 by cosmin sulea in Dev-VR branch]
2019-02-26 22:33:38 -05:00
cosmin sulea
d59584a7d3 UE-70234 - Error: Failed to connect to deployment server at 127.0.0.1:41000 - DeploymentServer not running
#jira UE-70234
#rb Jack.Porter

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

[CL 5223715 by cosmin sulea in Dev-VR branch]
2019-02-26 22:33:31 -05:00
ethan geller
e08e9e160d Fix for ensure on cook for Switch/iOS/Android.
#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: ethan.geller
#ROBOMERGE-SOURCE: CL 5102439 via CL 5103044 via CL 5103074
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5212489 by ethan geller in Dev-VR branch]
2019-02-26 18:22:23 -05:00
cosmin sulea
c56a603f71 UE-70234 - Error: Failed to connect to deployment server at 127.0.0.1:41000 - DeploymentServer not running
#jira UE-70234
#rb Jack.Porter

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

[CL 5208656 by cosmin sulea in Dev-VR branch]
2019-02-26 16:54:13 -05:00
cosmin sulea
fa6d859bb1 UE-70234 - Error: Failed to connect to deployment server at 127.0.0.1:41000 - DeploymentServer not running
#jira UE-70234
#rb Jack.Porter

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

[CL 5138796 by cosmin sulea in Dev-VR branch]
2019-02-22 05:41:22 -05:00
cosmin sulea
187c667954 UE-70204 - //UE4/Main 'Build Tools' - Couldn't find parent type for 'MovieScene2DTransformTrack' named 'UMovieScenePropertyTrack'
#jira UE-70204
#rb none

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

[CL 5138712 by cosmin sulea in Dev-VR branch]
2019-02-22 05:37:30 -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
jack porter
237365f22d Detect TVOS or IOS connected device type so Launch on Windows uses the correct target
Rebuild DeploymentServer
[FYI] Cosmin.Sulea
#rb None
#jira UE-69615

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 4947304 in //UE4/Release-4.22/... via CL 4947306
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5026229 by jack porter in Dev-VR branch]
2019-02-16 03:34:49 -05:00
cosmin sulea
41f95962cb UE-69143 - //UE4/Main 'Build DCC Win64' - Warning: CreateProc failed: The system cannot find the file specified #3
#jira UE-69143
#rb Jack.Porter
#lockdown: Nick.Penwarden

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

[CL 4863023 by cosmin sulea in Dev-VR branch]
2019-02-01 03:41:20 -05:00
marcus wassmer
b259f65406 Copying //UE4/Dev-Rendering[at]4854522 to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 4854553 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4854570 by marcus wassmer in Dev-VR branch]
2019-01-30 21:24:04 -05:00
cosmin sulea
42dfb556bf UE-69143 - //UE4/Main 'Build DCC Win64' - Warning: CreateProc failed: The system cannot find the file specified
#jira UE-69143
#rb Peter.Sauerbrei
#lockdown Nick.Penwarden

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

[CL 4842995 by cosmin sulea in Dev-VR branch]
2019-01-30 10:54:59 -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
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
marc audy
aa583e8b9b Copying //UE4/Release-Staging-4.21 to Dev-Main (//UE4/Dev-Main) [at] 4530863
#rb none
#rnx
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 4530881 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4530887 by marc audy in Dev-VR branch]
2018-11-01 09:57:45 -04:00
Jason Bestimt
011680795f Merging //UE4/Main to Dev-VR-Minimal (//UE4/Dev-VR-Minimal)
Unblocking robomerge

#RB:none

[CL 4524004 by Jason Bestimt in Dev-VR branch]
2018-10-30 11:00:11 -04:00
ben marsh
5a701625db Copying //UE4/Release-Staging-4.21 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4502288 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4502301 by ben marsh in Dev-VR branch]
2018-10-24 11:55:58 -04:00
ben marsh
8bcc19a04b Merging CL 4478531 from 4.21 branch to fix non-unity build error.
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4479120 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4479129 by ben marsh in Dev-VR branch]
2018-10-17 09:52:13 -04:00
ben marsh
0e522adfd8 Merging //UE4/Release-Staging-4.21 [at] CL 4472944.
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4476447 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4476456 by ben marsh in Dev-VR branch]
2018-10-16 17:22:48 -04:00