Commit Graph

5 Commits

Author SHA1 Message Date
allan bentham
556a84f4f7 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-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: allan.bentham
#ROBOMERGE-SOURCE: CL 5432919 via CL 5437672 via CL 5437750
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5440624 by allan bentham in Dev-Networking branch]
2019-03-18 21:01:12 -04:00
ryan gerleve
49c748d021 Merging 5360223 from Dev-EngineMerge. DevK integration.
#rb #jira na

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 5361784 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5404294 by ryan gerleve in Dev-Networking branch]
2019-03-14 18:40:04 -04:00
justin marcus
483dc52197 Fix module name
#jira UE-69927
#rb trivial

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: justin.marcus
#ROBOMERGE-SOURCE: CL 4972979 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5076862 by justin marcus in Dev-Networking branch]
2019-02-19 18:05:53 -05:00
justin marcus
b7b157e365 Update coopyright notices
#jira UE-69926
#rb trivial

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: justin.marcus
#ROBOMERGE-SOURCE: CL 4970841 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5076651 by justin marcus in Dev-Networking branch]
2019-02-19 18:02:22 -05:00
justin marcus
a72aa3c306 [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.




#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: justin.marcus
#ROBOMERGE-SOURCE: CL 4949345 via CL 4952070 via CL 4961624
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5073469 by justin marcus in Dev-Networking branch]
2019-02-19 17:16:21 -05:00