Commit Graph

197 Commits

Author SHA1 Message Date
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
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
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
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
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
Ben Marsh
530369c613 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4662695 by Ben Marsh in Dev-Build branch]
2018-12-14 14:49:12 -05:00
Ben Marsh
7598af0532 Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden

[CL 4662404 by Ben Marsh in Main branch]
2018-12-14 13:41:00 -05:00
Robert Manuszewski
d299e8f501 Merging //UE4/Dev-Main @ 4506166 to Dev-Core (//UE4/Dev-Core)
#rb none

[CL 4506617 by Robert Manuszewski in Dev-Core branch]
2018-10-25 08:06:47 -04:00
Ben Marsh
0f022f2f46 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none

[CL 4502641 by Ben Marsh in Dev-Build branch]
2018-10-24 13:03:31 -04:00
jack porter
10b83f5723 Fix static analysis warning, based on CL 4485257 from BogdanV
#jira UE-65435
#lockdown: Cristina.Riveron
#rb Jack.Porter

#ROBOMERGE-SOURCE: CL 4493162 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4493165 by jack porter in Staging-4.21 branch]
2018-10-19 19:43:24 -04:00
Robert Manuszewski
28e4e84273 Merging //UE4/Dev-Main @ 4486869 to Dev-Core (//UE4/Dev-Core)
#rb none

[CL 4489929 by Robert Manuszewski in Dev-Core branch]
2018-10-19 02:49:41 -04:00
Josh Adams
4f63a76b48 - Changed compression methods to be an FName instead of hardcoded enum
- Added support for compression plugins
- Removed the Custom compression concept, now using plugins properly
- Modified UnrealPak to use FNames, and allow for multiple compression methods (fallbacks on error or unavailability, etc)
- Added project settings for compression method selection for UnrealPak, and additional settings to be passed to UnrealPak (for instance, to control compression size/speed, etc)
- Deprecated a bunch of old function calls
- Improved pak file "old format" reading ability
- Brought over some changes from Fortnite for pak file encryption and memory savings
- Implemented a parallel compression pull request (#4129) to speed up pak file compression
#jira UE-51294
#rb ben.marsh

[CL 4480944 by Josh Adams in Dev-Core branch]
2018-10-17 14:18:10 -04:00
dmitriy dyomin
b098144a5e non-unity build fix
#jira none
#rb none

#ROBOMERGE-SOURCE: CL 4478530 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4478531 by dmitriy dyomin in Staging-4.21 branch]
2018-10-17 02:36:20 -04:00
Robert Manuszewski
f7deabad2a Merging //UE4/Dev-Main @ 4476447 to Dev-Core (//UE4/Dev-Core)
#rb none

[CL 4478311 by Robert Manuszewski in Dev-Core branch]
2018-10-17 00:50:23 -04:00
dmitriy dyomin
423f2a8633 Exposed 'Support Software Occlusion Culling' option to project settings
#jira UE-65268
#rb none

#ROBOMERGE-SOURCE: CL 4472938 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4472944 by dmitriy dyomin in Staging-4.21 branch]
2018-10-16 08:46:29 -04:00
Robert Manuszewski
23519de3ce Merging //UE4/Dev-Main @ 4470579 to Dev-Core (//UE4/Dev-Core)
#rb none

[CL 4472296 by Robert Manuszewski in Dev-Core branch]
2018-10-16 00:53:57 -04:00
chris babcock
b5337a945f Hide the x86 setting properly on Android
#jira UE-65054
#ue4
#android
#rb none

#ROBOMERGE-SOURCE: CL 4460943 in //UE4/Release-4.21/...
#ROBOMERGE-BOT: RELEASE (Release-4.21 -> Release-Staging-4.21)

[CL 4460944 by chris babcock in Staging-4.21 branch]
2018-10-12 13:39:37 -04:00
Ben Marsh
983f6e4d86 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none

[CL 4450587 by Ben Marsh in Dev-Build branch]
2018-10-11 09:04:26 -04:00
Robert Manuszewski
8841a31595 Merging //UE4/Dev-Main @ 4448303 to Dev-Core (//UE4/Dev-Core)
#rb none

[CL 4450493 by Robert Manuszewski in Dev-Core branch]
2018-10-11 08:14:26 -04:00