Commit Graph

118 Commits

Author SHA1 Message Date
Max Chen
e4d4965491 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 7774443 by Max Chen in Dev-Editor branch]
2019-08-05 15:48:51 -04:00
ethan geller
13d186f8b3 [FYI] hongyi.yu, aaron.mcleran
#ROBOMERGE-SOURCE: CL 7674538 via CL 7680304
#ROBOMERGE-BOT: (v382-7680231)

[CL 7680413 by ethan geller in Main branch]
2019-08-01 06:46:29 -04:00
Chris Gagnon
d7d4ee7b38 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) at CL 7473521
#rb none
#fyi Max.Chen, Tim.Gautier

[CL 7614721 by Chris Gagnon in Dev-Editor branch]
2019-07-24 15:05:52 -04:00
cosmin sulea
62115adeeb UE-73418 - DevelopmentServerLauncher.exe loops whenever the editor is open even if no iOS devices are connected
#jira UE-73418
#rb Jack.Porter

#ROBOMERGE-SOURCE: CL 7318570 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7318571 by cosmin sulea in Main branch]
2019-07-16 05:47:47 -04:00
Max Chen
4561801a81 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) @7119039
#rb none

[CL 7120528 by Max Chen in Dev-Editor branch]
2019-06-21 01:21:43 -04:00
marc audy
a98d95f9ef #rb aaron.mcleran
[FYI] rob.gay aaron.mcleran maxwell.hayes phil.popp
[FYI] Ethan.Geller


#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: ethan.geller
#ROBOMERGE-SOURCE: CL 7095880 via CL 7106842
#ROBOMERGE-BOT: (v367-6836689)

[CL 7106847 by marc audy in Main branch]
2019-06-20 13:28:39 -04:00
Rolando Caloca
aa0d2303d6 Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) @ 6944469
#rb none
#rnx

[CL 6944849 by Rolando Caloca in Main branch]
2019-06-11 18:27:07 -04:00
Ryan Gerleve
550ee54fef Copying //UE4/Dev-Networking to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 6843774 by Ryan Gerleve in Main branch]
2019-06-04 22:25:03 -04:00
Chris Gagnon
00f8b72a0b Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 5602170 by Chris Gagnon in Dev-Editor branch]
2019-03-27 15:03:08 -04:00
hongyi yu
81db12b9e8 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.gerleve
#ROBOMERGE-AUTHOR: hongyi.yu
#ROBOMERGE-SOURCE: CL 5470414 via CL 5474050 via CL 5474308
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5505867 by hongyi yu in Dev-Networking branch]
2019-03-22 17:02:07 -04:00
hongyi yu
6e46797857 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-SOURCE: CL 5470414 via CL 5474050

[CL 5474308 by hongyi yu in Main branch]
2019-03-20 13:11:58 -04:00
mark satterthwaite
bfd7c9b9bd 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.gerleve
#ROBOMERGE-AUTHOR: mark.satterthwaite
#ROBOMERGE-SOURCE: CL 5415631 in //UE4/Release-4.22/... via CL 5415651
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5420947 by mark satterthwaite in Dev-Networking branch]
2019-03-15 16:59:18 -04:00
mark satterthwaite
07f1594ba5 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-SOURCE: CL 5415631 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5415651 by mark satterthwaite in Main branch]
2019-03-15 12:04:52 -04:00
peter sauerbrei
e68ce50723 disable XGE shader compiling for IOS
#jira UE-33401
#rb john.mauney

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: peter.sauerbrei
#ROBOMERGE-SOURCE: CL 5340798 in //UE4/Release-4.22/... via CL 5340840
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5401373 by peter sauerbrei in Dev-Networking branch]
2019-03-14 17:01:27 -04:00
peter sauerbrei
2b8158239f disable XGE shader compiling for IOS
#jira UE-33401
#rb john.mauney

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

[CL 5340840 by peter sauerbrei in Main branch]
2019-03-07 15:36:00 -05:00
cosmin sulea
d7bdf6d74f 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.gerleve
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5238340 in //UE4/Release-4.22/... via CL 5238343
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5255111 by cosmin sulea in Dev-Networking branch]
2019-02-28 18:17:39 -05:00
cosmin sulea
4095dab2db UE-62851 - Remote Build pre-check error does not appear when missing required arguments
#jira UE-62851
#rb Jack.Porter

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

[CL 5255107 by cosmin sulea in Dev-Networking branch]
2019-02-28 18:17:35 -05:00
cosmin sulea
650a265cbf UE-70653 - Edit hangs for a few seconds when entering iOS commands in device output log
#jira UE-70653
#rb Jack.Porter

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

[CL 5238343 by cosmin sulea in Main branch]
2019-02-28 10:15:39 -05:00
cosmin sulea
4204740174 UE-62851 - Remote Build pre-check error does not appear when missing required arguments
#jira UE-62851
#rb Jack.Porter

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

[CL 5238312 by cosmin sulea in Main branch]
2019-02-28 10:11:34 -05:00
cosmin sulea
de58370aa0 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.gerleve
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5175315 in //UE4/Release-4.22/... via CL 5207588
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5235373 by cosmin sulea in Dev-Networking branch]
2019-02-27 18:57:06 -05:00
ryan gerleve
6431b1641c 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.gerleve
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5174208 in //UE4/Release-4.22/... via CL 5207564
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5235367 by ryan gerleve in Dev-Networking branch]
2019-02-27 18:56:24 -05:00
Chris Gagnon
42c199aeb6 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 5225772 by Chris Gagnon in Dev-Editor branch]
2019-02-27 11:02:17 -05:00
cosmin sulea
e44eff7a3e 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-SOURCE: CL 5175315 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5207588 by cosmin sulea in Main branch]
2019-02-26 16:38:55 -05:00
cosmin sulea
f25292daee 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-SOURCE: CL 5174208 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5207564 by cosmin sulea in Main branch]
2019-02-26 16:38:46 -05:00
Jake Leonard
6f71e0f438 Fixing iOS build warnings from robomerge
#rnx
#rb: none
#Jira: none

[CL 5151685 by Jake Leonard in Dev-Networking branch]
2019-02-22 15:03:48 -05:00