Commit Graph

29 Commits

Author SHA1 Message Date
Marcus Wassmer
459dd9960c Force integrate 5317515 from release-4.22 to fix some issues with 'undo'.
#rb none

[CL 5337699 by Marcus Wassmer in Main branch]
2019-03-07 11:25:32 -05:00
Juan Canada
d2f93b57b2 Undo //UE4/Main/... changelist 5335728
#rb marcus.wassmer

[CL 5335770 by Juan Canada in Main branch]
2019-03-06 23:59:18 -05:00
Juan Canada
27b0d7a824 Copying //UE4/Private-Woodchuck-Staging[at]5316917 to Release-4.22 (//UE4/Release-4.22)
#rb none
#JIRA

#ROBOMERGE-OWNER: Juan.Canada
#ROBOMERGE-AUTHOR: juan.canada
#ROBOMERGE-SOURCE: CL 5317515 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5335728 by Juan Canada in Main branch]
2019-03-06 23:42:45 -05:00
Josh Adams
d0bf843c9c - 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: josh.adams
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 5201138 via CL 5203024

[CL 5226277 by Josh Adams in Main branch]
2019-02-27 11:57:17 -05:00