Commit Graph

4 Commits

Author SHA1 Message Date
justin marcus
e0be3df6ca 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

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: justin.marcus
#ROBOMERGE-SOURCE: CL 4948018 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5026240 by justin marcus in Dev-VR branch]
2019-02-16 03:35:11 -05:00
Joe Conley
c12a880a0c Unshelved from pending changelist '4791207':
Source=CL 4772220 in //UE4/Main/...
Acknowledger=joe.conley (Thu Jan 24 2019 00:26:59 GMT+0000 (Coordinated Universal Time))
ShelfCl=4791207
Target=Dev-VR
Merge conflict:
/src/ROBOMERGE_DEVVR_Dev_VR/Engine/Plugins/Lumin/MagicLeap/Source/MagicLeapController/Private/MagicLeapController.cpp - merging //UE4/Main/Engine/Plugins/Lumin/MagicLeap/Source/MagicLeapController/Private/MagicLeapController.cpp#5

#rb Ryan.Vance

[CL 4792243 by Joe Conley in Dev-VR branch]
2019-01-23 19:56:41 -05:00
Ryan Vance
7c51ff94af Merging //UE4/Dev-Main to Dev-VR (//UE4/Dev-VR)
CL 1 of 8
#rb integration

[CL 4748712 by Ryan Vance in Dev-VR branch]
2019-01-17 18:54:05 -05:00
jason bestimt
9a64d93526 --------------------------------------
Copying //UE4/Dev-Rendering[at]4626416 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown nick.penwarden

#ROBOMERGE-OWNER: jason.bestimt
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 4626501 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 4627410 by jason bestimt in Dev-VR branch]
2018-12-04 09:59:43 -05:00