Commit Graph

6 Commits

Author SHA1 Message Date
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
Jason Bestimt
e7ed7cd3ff Unblock robomerge from Main
#RB:none

[CL 4604382 by Jason Bestimt in Dev-VR branch]
2018-11-28 15:05:11 -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
Marc Audy
d90da4ab1a Merge to Dev-Main for 4.20 @ 4090813
#rb
#rnx
#lockdown Nick.Penwarden

[CL 4091081 by Marc Audy in Main branch]
2018-05-23 21:04:31 -04:00
Ben Marsh
d832dacf48 Merging //UE4/Release-4.18 @ CL 3709383 to Release-Staging-4.18 (//UE4/Release-Staging-4.18)
#rb none
#jira

[CL 3715930 by Ben Marsh in Staging-4.18 branch]
2017-10-24 10:14:07 -04:00
Ben Marsh
4cf17e6c44 Merging //UE4/Release-4.18 @ 3660388 to Release-Staging-4.18 (//UE4/Release-Staging-4.18)
#rb none
#jira

[CL 3662266 by Ben Marsh in Staging-4.18 branch]
2017-09-25 14:08:25 -04:00