Commit Graph

229 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
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
bob tellez
4ed7bb0b4e Back out changelist 7437649. Autotest errors on PS4
[FYI] Justin.Marcus


#ROBOMERGE-SOURCE: CL 7445561 via CL 7446165 via CL 7450457
#ROBOMERGE-BOT: (v371-7306989)

[CL 7450607 by bob tellez in Main branch]
2019-07-19 09:28:29 -04:00
justin marcus
3c1a624312 -Allow preload screens to optionally render
-Add FileExistsInPlatformPackage() to platform misc
-Add HasBuildMetaData() to bundle manager interface

[at]Thomas.Ross [at]Daniel.Lamb [at]Hongyi.Yu


#ROBOMERGE-SOURCE: CL 7437649 via CL 7437657 via CL 7438904
#ROBOMERGE-BOT: (v371-7306989)

[CL 7438929 by justin marcus in Main branch]
2019-07-18 12:42:09 -04:00
chris babcock
14547a1d0d Add option for public logs on Android
#ue4
#android
[FYI] Jack.Porter,Andrew.Grant
#rb Peter.Sauerbrei



#ROBOMERGE-SOURCE: CL 7113141 via CL 7113144 via CL 7165976
#ROBOMERGE-BOT: (v367-6836689)

[CL 7166205 by chris babcock in Main branch]
2019-06-21 23:50:54 -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
33872d06cb Fixed: Crash after backgrounding during 'Launching...' phase with Vulkan Android
[CODEREVIEW] allan.bentham
[CODEREVIEW] Dmitriy.Dyomin


#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: dmitriy.dyomin
#ROBOMERGE-SOURCE: CL 7099317 via CL 7099318 via CL 7099319 via CL 7109380
#ROBOMERGE-BOT: (v367-6836689)

[CL 7109382 by marc audy in Main branch]
2019-06-20 15:12:05 -04:00
Chris Gagnon
9f1505e469 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6671275 by Chris Gagnon in Dev-Editor branch]
2019-05-29 20:48:56 -04:00
Gil Gribb
af0967e0cb UE4 - Reworked virtual memory API to support page caches and heterogeneous memory architectures. Switch is the only platform with substantive changes, the rest are just API upgrades.
#rb none
#jira none


#ROBOMERGE-OWNER: Gil.Gribb
#ROBOMERGE-AUTHOR: gil.gribb
#ROBOMERGE-SOURCE: CL 6663163 via CL 6664245
#ROBOMERGE-BOT: (vundefined-6654089)

[CL 6664629 by Gil Gribb in Main branch]
2019-05-29 12:21:13 -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
justin marcus
53f1f2e135 Add functions for native code to log using embedded UE4
[at]Chris.Babcock


#ROBOMERGE-SOURCE: CL 6594671 via CL 6594673 via CL 6595137
#ROBOMERGE-BOT: (v351-6581450)

[CL 6595188 by justin marcus in Main branch]
2019-05-21 10:50:42 -04:00
david harvey
72575e254e [FramePro] update to the latest version of FramePro runtime integration code (1.5.15.0)
#rb anthony.bills
[FYI] james.golding


#ROBOMERGE-SOURCE: CL 6533184 via CL 6533221

[CL 6533223 by david harvey in Main branch]
2019-05-16 06:18:28 -04:00
Chris Gagnon
56e73ed431 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 6042607 by Chris Gagnon in Dev-Editor branch]
2019-04-22 18:56:08 -04:00
david harvey
1e6ab4c704 Implement FPlatformProcess::GetCurrentCoreNumber
#rb anthony.bills


#ROBOMERGE-SOURCE: CL 5974941 via CL 5975387

[CL 5975410 by david harvey in Main branch]
2019-04-18 05:49:30 -04:00
chris babcock
772171c5d8 Fix non-JNI Android compile issue
#jira UE-72526
#ue4
#android
#rb trivial



#ROBOMERGE-SOURCE: CL 5831077 via CL 5831081 via CL 5835243

[CL 5836037 by chris babcock in Main branch]
2019-04-12 10:07:16 -04:00
teemu pohjanlehto
004b6621ea #android
#ios
[FYI] Chris.Babcock, Pete.Procopio


#ROBOMERGE-SOURCE: CL 5773526 via CL 5773528 via CL 5773529 via CL 5773688

[CL 5773694 by teemu pohjanlehto in Main branch]
2019-04-08 09:31:12 -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
Andrew Grant
da2cbfff1f Merging 5360223 from Dev-EngineMerge. DevK integration.
#rb #jira na

[CL 5361784 by Andrew Grant in Main branch]
2019-03-11 15:12:02 -04:00
Josh Adams
d0bf843c9c - Merging Dev-Kairos/Engine/... to Main/Engine/...
- Brings over the necessary engine changes for embedding UE4 mobile as a dylib/so in native mobile app
- Various changes for facial animation, screen recording, others
- ARKit and ARCore plugins were removed, as deemed "not ready"
#rb many people


#ROBOMERGE-OWNER: josh.adams
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 5201138 via CL 5203024

[CL 5226277 by Josh Adams in Main branch]
2019-02-27 11:57:17 -05:00
Chris Gagnon
80918bea22 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 5110714 by Chris Gagnon in Dev-Editor branch]
2019-02-21 13:05:30 -05:00
Justin Marcus
a6267fe237 Merging using //Fortnite/Dev-EngineMerge-To-//UE4/Main
Manual merge of CL 4940744 because robomerge had issues.

Original Description:

Merging //Fortnite/Dev-Kairos to Main (//Fortnite/Main)

Getting ready for Install Bundle Manager merge to main.  These are Engine/Core fixes


4440445
Fix FBuildPatchInstaller::Initialize() failing for manifests that did not include the empty tag.

#jira no jira
#rb Leigh.Swift


4474598
Add Android Macros to disable optimization
Fix Android directory iteration for OBBs.  FindFilesRecursive() now works.
#jira UEATM-177
#rb Chris.Babcock

4487221
Android file - When mounting an OBB, fix possibly mounting directories as files.
#rb Chris.Babcock

4511214
Fix Android directory iteration not returning the visitor result.  This would cause IPlatformFile::FindFilesRecursively() to prematurely end iteration.
#rb Chris.Babcock

4670945
Fix GetVarArgs format specifier off by 1 error.  These would only show up if you had the format specifier at the end of the format string and only with 'l' and not 'll'.  In that case the code would walk off the end of the format string, usually into another static string.

Fix GetVarArgs to never walk off the end of the format string.

#rb [at]ben.ziegler

4746778
Fix FShaderCodeEntry ref counts being off by one.
This bug was exposed because [Project Name Redacted] doesn't load shaderlibs or the PSO cache until well after engine init.  That means some FShaderResource's are loaded before shader libs or PSO cache and FShaderCodeLibrary::RequestShaderCode() can fail in FShaderResource::SerializeShaderCode().

#rb [at]Gil.Gribb [at]Chris.Babcock

[CL 4948018 by Justin Marcus in Main branch]
2019-02-08 11:00:43 -05:00
ben marsh
a8d3c8d5a3 Fix compile error.
[FYI] Ryan.Vance
#jira UE-69635
#rb none

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

[CL 4919718 by ben marsh in Main branch]
2019-02-06 08:47:54 -05:00
ryan vance
91c8d0214c Adding native android trace support.
#rb jack.porter
#jira 0

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

[CL 4905122 by ryan vance in Main branch]
2019-02-05 16:14:41 -05:00
Jeff Fisher
71067225d5 UE-69300 //UE4/Main - Compile UE4Game Lumin - fatal error: 'android/asset_manager.h' file not found
-Wrapped a couple new things in USE_ANDROID_JNI
#jira UE-69300
#rb build

[CL 4854582 by Jeff Fisher in Main branch]
2019-01-30 21:34:25 -05:00
Chris Gagnon
1ca592a256 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4836782 by Chris Gagnon in Dev-Editor branch]
2019-01-29 18:04:41 -05:00