Commit Graph

7 Commits

Author SHA1 Message Date
justin marcus
17111943a8 Install Bundle Manager / ESP
- Pause background downloads instead of canceling bundle install when failing over to cellular.  This should prevent losing active background http progress on IOS.  It doesn't help on Android right now.
- All the check cellular flag to be cleared on a bundle after it is already enqued in order to restart the download on cellular if the user OKs it.

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


#ROBOMERGE-SOURCE: CL 5677826 via CL 5677828 via CL 5677829 via CL 5677830 via CL 5681702

[CL 5681705 by justin marcus in Main branch]
2019-04-01 21:38:56 -04:00
andrew grant
5ddb192339 Merging from DK to Main
https://p4-swarm.epicgames.net/reviews/5435295
https://p4-swarm.epicgames.net/reviews/5435326

[FYI] daniel.lamb,bob.tellez,justin.marcus,sam.zamani
#rb codereviewed


#ROBOMERGE-SOURCE: CL 5448748 via CL 5450359

[CL 5450390 by andrew grant in Main branch]
2019-03-19 13:06:47 -04:00
allan bentham
cdc95a9ec5 Merge CL 5361873.
Stop using a define to determine whether launch engine loop should mount paks and load shaderlibs.  Instead, see if bundle manager is going to do it.
Fix shader binaries not being fully cached on Android because cache was being opened too early.
#rb none


#ROBOMERGE-SOURCE: CL 5432919 via CL 5437672

[CL 5437750 by allan bentham in Main branch]
2019-03-18 18:04:10 -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
Justin Marcus
75fc7317f3 Fix module name
#jira UE-69927
#rb trivial

[CL 4972979 by Justin Marcus in Main branch]
2019-02-12 12:05:41 -05:00
Justin Marcus
3421b059f4 Update coopyright notices
#jira UE-69926
#rb trivial

[CL 4970841 by Justin Marcus in Main branch]
2019-02-12 10:52:20 -05:00
justin marcus
8c97e3c469 #CodeReview: justin.marcus,jeff.williams
Merge conflict.
justin.marcus, please merge this change by hand.
More info at https://robomerge.epicgames.net#FORTNITE

/src/robomerge_ue4_main_01/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformMisc.cpp - merging //Fortnite/Dev-EngineMerge/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericPlatformMisc.cpp#3
/src/robomerge_ue4_main_01/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericWidePlatformString.cpp - merging //Fortnite/Dev-EngineMerge/Engine/Source/Runtime/Core/Private/GenericPlatform/GenericWidePlatformString.cpp#4
/src/robomerge_ue4_main_01/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformMisc.h - merging //Fortnite/Dev-EngineMerge/Engine/Source/Runtime/Core/Public/GenericPlatform/GenericPlatformMisc.h#3


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

Get Install Bundle Manager and dependcies building in main.



#ROBOMERGE-SOURCE: CL 4949345 via CL 4952070

#rb none

[CL 4961624 by justin marcus in Main branch]
2019-02-11 09:22:06 -05:00