Commit Graph

296 Commits

Author SHA1 Message Date
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
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
jeff fisher
1a5d0ba3b9 Merging using Dev-VR_to_Release-4.21
4345353 UE-62255 Google 6DOF Motion Controller Support
-Added support for 6DOF controller tracking on daydream.
-Project Settings->Android->Advanced APK Packaging->Configure GoogleVR to support specific hardware configurations-> Set to Daydream(6.6 DoF) to enable support for two 6dof controllers. A single 3dof controller is also supported by this configuration, as is a single 6dof controller.
-Currently the 3dof controller is detected only by noticing that the positions returned for all controllers are exactly 0,0,0 per Google reccomendation.  A future API should make it explicit when a controller is 3dof or 6dof.
-Currently we arbitrarily make the controller at index 0 the right and the one at 1 the left.  A future api should let us query for controller handedness.

4346387 Fixing build break in GoogleVRControllerFunctionLibrary.h

4349142 Fixing GoogleVRController build warning

4349742 Fixing AndroidRuntimeSettings build errors.

4350977 Fix for static analysis warning

4351170 Build fix for bad assert

#jira UE-62255
#lockdown nick.penwarden
#rb Ryan.Vance

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

[CL 4411153 by jeff fisher in Staging-4.21 branch]
2018-10-01 13:04:40 -04:00