Commit Graph

5 Commits

Author SHA1 Message Date
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
marcus wassmer
db87425ef0 Force integrate 5317515 from release-4.22 to fix some issues with 'undo'.
#rb none

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

[CL 5376632 by marcus wassmer in Dev-Networking branch]
2019-03-12 21:25:54 -04:00
juan canada
31b2097cfb Undo //UE4/Main/... changelist 5335728
#rb marcus.wassmer

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: juan.canada
#ROBOMERGE-SOURCE: CL 5335770 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5376135 by juan canada in Dev-Networking branch]
2019-03-12 21:19:38 -04:00
juan canada
341a17ce77 Copying //UE4/Private-Woodchuck-Staging[at]5316917 to Release-4.22 (//UE4/Release-4.22)
#rb none
#JIRA

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: juan.canada
#ROBOMERGE-SOURCE: CL 5317515 in //UE4/Release-4.22/... via CL 5335728
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5376119 by juan canada in Dev-Networking branch]
2019-03-12 21:19:16 -04:00
josh adams
86071fdfce - 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.gerleve
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 5201138 via CL 5203024 via CL 5226277
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 5246044 by josh adams in Dev-Networking branch]
2019-02-28 17:14:17 -05:00