Commit Graph

211 Commits

Author SHA1 Message Date
josh adams
ec100b6e76 - Added early check before creating a TargetPlatform object if the PlatformInfo will be found (check a static function to see if it's usable before making it)
- Changed each platform's GetTargetPlatform[s] function
#rb none
#jira UE-78692
[FYI] bob.tellez

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 7952099 via CL 7954770 via CL 7954968
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v399-8035122)

[CL 8037950 by josh adams in Dev-Build branch]
2019-08-14 12:53:10 -04:00
josh adams
3d282bf6e7 - Added early check before creating a TargetPlatform object if the PlatformInfo will be found (check a static function to see if it's usable before making it)
- Changed each platform's GetTargetPlatform[s] function
#rb none
#jira UE-78692
[FYI] bob.tellez


#ROBOMERGE-SOURCE: CL 7952099 via CL 7954770
#ROBOMERGE-BOT: (v393-7951996)

[CL 7954968 by josh adams in Main branch]
2019-08-12 18:12:07 -04:00
Ben Marsh
beb4519169 Rename EBuildConfigurations::Type to EBuildConfiguration.
#rb none

[CL 7937697 by Ben Marsh in Dev-Build branch]
2019-08-09 17:35:36 -04:00
Ben Marsh
78e5da3eab Rename EBuildTargets::Type to EBuildTargetType, and add missing entries for server and program targets. Also replace usages of PlatformInfo::EPlatformType with EBuildTargetType.
#rb none
#rnx

[CL 7937405 by Ben Marsh in Dev-Build branch]
2019-08-09 16:46:25 -04:00
ethan geller
b82b8aa4f2 [FYI] hongyi.yu, aaron.mcleran
#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ethan.geller
#ROBOMERGE-SOURCE: CL 7674538 via CL 7680304 via CL 7680413
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v388-7785529)

[CL 7805654 by ethan geller in Dev-Build branch]
2019-08-06 12:31:04 -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
jack porter
c273115228 Mark ES2 as deprecated, use ES31 as default for Android
#jira UE-76519
#rb Allan.Bentham
[FYI] Chris.Babcock

#ROBOMERGE-SOURCE: CL 7609267 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7609275 by jack porter in Main branch]
2019-07-24 12:23:33 -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
Marc Audy
8ba11eb5c1 Fix up inconsistencies between UE4/Main and Dev-EngineMerge
#rb
#rnx

[CL 7021692 by Marc Audy in Main branch]
2019-06-14 22:32:59 -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
Ben Marsh
0cc6e3dca6 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 6631504 by Ben Marsh in Main branch]
2019-05-24 11:51:54 -04:00
josh jensen
ce6131c3dd Remove extraneous line causing compilation issues
#jira UE-74417
#rb none


#ROBOMERGE-SOURCE: CL 6405105 via CL 6406458

[CL 6406568 by josh jensen in Main branch]
2019-05-09 20:06:29 -04:00
josh jensen
9b2dfb2906 Change the Feature Rendering Level back to SM5 when disabling Android ES2, ES3.1, or Vulkan if one is the active Feature Rendering Level
#jira UE-70580
#rb Allan.Bentham


#ROBOMERGE-SOURCE: CL 6400587 via CL 6402808

[CL 6402891 by josh jensen in Main branch]
2019-05-09 15:41:20 -04:00
rob gay
52e89fb60a Seekable Streams Using LPCM/ADPCM
#rb aaron.mcleran
https://p4-swarm.epicgames.net/reviews/6345090


#ROBOMERGE-SOURCE: CL 6399748 via CL 6400508

[CL 6400529 by rob gay in Main branch]
2019-05-09 12:53:22 -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
ethan geller
ebf65014e8 Fix for ensure on cook for Switch/iOS/Android.
#ROBOMERGE-SOURCE: CL 5102439 via CL 5103044

[CL 5103074 by ethan geller in Main branch]
2019-02-20 20:58:14 -05:00
Marcus Wassmer
68f340a63c Merging //UE4/Dev-Main@4825910 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
KNOWN BROKEN DO NOT SYNC
#lockdown rolando.caloca

[CL 4827063 by Marcus Wassmer in Dev-Rendering branch]
2019-01-28 21:04:21 -05:00
Ryan Vance
d5aa052fe5 Copying //UE4/Dev-VR to Dev-Main (//UE4/Dev-Main) Souce CL: 4824152
#lockdown: Nick.Penwarden
#rb Integration

[CL 4824851 by Ryan Vance in Main branch]
2019-01-28 16:31:25 -05:00
Rolando Caloca
732810a13b DR - Copying //UE4/Dev-Main@4785067 to //UE4-DevRendering
#rb none
#rnx
#lockdown Marcus.Wassmer

[CL 4790611 by Rolando Caloca in Dev-Rendering branch]
2019-01-23 17:01:56 -05:00
Robert Manuszewski
cfa01c09c7 Merging //UE4/Dev-Main to Dev-Core (//UE4/Dev-Core)
#rb none

[CL 4731457 by Robert Manuszewski in Dev-Core branch]
2019-01-16 04:23:12 -05:00
Marcus Wassmer
a8d6cc952b Merging //UE4/Dev-Main@4700769 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none

[CL 4729861 by Marcus Wassmer in Dev-Rendering branch]
2019-01-15 18:04:38 -05:00
Ben Marsh
c09b6d7f18 Merge from //UE4/Main.
#rb none
#rnx

[CL 4701155 by Ben Marsh in Dev-Build branch]
2019-01-10 11:10:29 -05:00
Marc Audy
ab108c215e Copying to Dev-Main @ CL# 4688301
#rb
#rnx

[CL 4688816 by Marc Audy in Main branch]
2019-01-08 11:38:48 -05:00
Marcus Wassmer
cbfcbbb93b Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
Should be just copyright updates

[CL 4680440 by Marcus Wassmer in Dev-Rendering branch]
2019-01-03 19:16:26 -05:00
Robert Manuszewski
2752c82adc Merging //UE4/Dev-Main @ 4664414 to Dev-Core (//UE4/Dev-Core)
#rb none

[CL 4675693 by Robert Manuszewski in Dev-Core branch]
2019-01-02 00:55:51 -05:00