Commit Graph

4 Commits

Author SHA1 Message Date
thomas ross
03a38ed91b Added ability to use system fonts for a PreLoadScreenSettingsContainer font. Allows you to lower initial size by not including fonts.
Added ability for PreLoadScreenSettingsContainer to load slate brushes in groups. This way not all brushes are loaded at the same time.
#rb none
#tests Windows Editor, iOS client

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: thomas.ross
#ROBOMERGE-SOURCE: CL 6354660 via CL 6354661 via CL 6354936 via CL 6354941
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 6362652 by thomas ross in Dev-VR branch]
2019-05-08 01:01:04 -04:00
josh adams
019c12863e - 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: ryan.vance
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 5201138 via CL 5203024 via CL 5226277
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR)

[CL 5244512 by josh adams in Dev-VR branch]
2019-02-28 17:06:02 -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
f2890ac781 --------------------------------------
Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main) [at] 4395008
#rb
#rnx
#lockdown Nick.Penwarden

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

[CL 4398121 by jason bestimt in Dev-VR branch]
2018-09-26 10:08:47 -04:00