Commit Graph

115 Commits

Author SHA1 Message Date
aurel cordonnier
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
aurel cordonnier
dc4bf61540 Merge from Release-Engine-Staging @ 17030559 to Release-Engine-Test
This represents UE4/Main @ 17030256 and Dev-PerfTest @ 17030553

[CL 17031509 by aurel cordonnier in ue5-release-engine-test branch]
2021-08-03 11:56:47 -04:00
aurel cordonnier
02c0f425e8 Copy up from Release-Engine-Staging @ 16738359
This represents UE4/Main @ 16738161 and Dev-PerfTest @ 16737719

[CL 16738582 by aurel cordonnier in ue5-release-engine-test branch]
2021-06-22 00:27:54 -04:00
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -04:00
jack porter
946b30a59a Remove UE3/UE4 references
#jira UE-112108
#jira UE-111469
#jira UE-111456
#jira UE-111451
#jira UE-111331
#jira UE-111149
#jira UE-111136
#jira UE-110941
#jira UE-104701
#rb trivial
[FYI] Chris.Babcock
#preflight 606446947a99880001b3cbac

#ROBOMERGE-SOURCE: CL 15872931 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15872932 by jack porter in ue5-main branch]
2021-03-31 06:40:14 -04:00
Marc Audy
8f73cd7fa9 Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main
This represents UE4/Main @ 15601601

[CL 15631170 by Marc Audy in ue5-main branch]
2021-03-05 19:27:14 -04:00
Marc Audy
9753392e2b Merge UE5/RES CL# 15462083 to UE5/Main
This represents UE4/Main @ 15414221

[CL 15463811 by Marc Audy in ue5-main branch]
2021-02-18 18:13:28 -04:00
Chris Babcock
a2d9bd542e Change Android class names from ue4 to unreal
#jira UE-104943
#ue5
#android
#review @Jack.Porter
#rb Jack.Porter

[CL 15284943 by Chris Babcock in ue5-main branch]
2021-02-02 17:21:35 -04:00
Marc Audy
ada7c144fa Merge //UE5/Release-Engine-Staging @14903491 to //UE5/Main
[CL 14906022 by Marc Audy in ue5-main branch]
2020-12-11 14:21:20 -04:00
Marc Audy
a7f9391231 Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main
This represents UE4/Main @ 14768117

For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer

[CL 14811440 by Marc Audy in ue5-main branch]
2020-11-24 18:42:39 -04:00
Marc Audy
68150e0be7 Merge UE5/Release-Engine-Staging to UE5/Main @ 14611496
This represents UE4/Main @ 14594913

[CL 14612291 by Marc Audy in ue5-main branch]
2020-10-29 13:38:15 -04:00
Marc Audy
4c1bb11c29 Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck

[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Marc Audy
7379fa99c5 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14229157
[CL 14233282 by Marc Audy in ue5-main branch]
2020-09-01 14:07:48 -04:00
Marc Audy
a7c9001a94 Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
2020-08-11 01:36:57 -04:00
michael kirzinger
f6ac5e2ec8 Back out changelist 13033128 to fix CIS
#ROBOMERGE-SOURCE: CL 13034464 via CL 13034473
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)

[CL 13034478 by michael kirzinger in Main branch]
2020-04-24 12:28:08 -04:00
michael kirzinger
ba2dcd6317 Provide a way to pass an obfuscated user id when purchasing using GooglePlay. Google uses this as part of their anti-fraud efforts
[at]sam.zamani, [at]eric.newman, [at]rob.cannaday

#ROBOMERGE-OWNER: michael.kirzinger
#ROBOMERGE-AUTHOR: michael.kirzinger
#ROBOMERGE-SOURCE: CL 13032447 via CL 13033126 via CL 13033127 via CL 13033128 via CL 13033131
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)

[CL 13033133 by michael kirzinger in Main branch]
2020-04-24 10:10:53 -04:00
chris babcock
5901c8a0ca Add option for up to 2 overflow obb files
#ue4
#android
[CODEREVIEW] Jack.Porter
#rb none


#ROBOMERGE-SOURCE: CL 12910957 via CL 12910958 via CL 12910959
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12910960 by chris babcock in Main branch]
2020-04-19 04:56:53 -04:00
chris adams
ea1a66b980 adding android screenshot blocking, adding iOS screenshot/video caption detection, enabling video analytics for android
#rb jens.petersam

#ROBOMERGE-SOURCE: CL 12639572 via CL 12644286 via CL 12644366 via CL 12649419 via CL 12649467 via CL 12649516
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12649559 by chris adams in Main branch]
2020-04-07 00:48:33 -04:00
chris babcock
6df461dc0d Provide more control over OBB selection
#jira UE-89810
#ue4
#android
#rb Brandon.Schaefer

#ROBOMERGE-SOURCE: CL 11792686 in //UE4/Release-4.25/... via CL 11792867
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11792949 by chris babcock in Main branch]
2020-02-28 20:20:36 -05:00
ryan durand
0f0464a30e Updating copyright for Engine Runtime.
#rnx
#rb none


#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869210 via CL 10869511 via CL 10869900
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870549 by ryan durand in Main branch]
2019-12-26 14:45:42 -05:00
Marc Audy
0ea8c363bf Added ability to check OS level notification status on Android.
#author Casey.Spencer
#rb Chris.Babcock
#rnx

[CL 10795670 by Marc Audy in Main branch]
2019-12-18 10:25:26 -05:00
chris babcock
14547a1d0d Add option for public logs on Android
#ue4
#android
[FYI] Jack.Porter,Andrew.Grant
#rb Peter.Sauerbrei



#ROBOMERGE-SOURCE: CL 7113141 via CL 7113144 via CL 7165976
#ROBOMERGE-BOT: (v367-6836689)

[CL 7166205 by chris babcock in Main branch]
2019-06-21 23:50:54 -04:00
Jeff Fisher
bcc5bcf128 Copying //UE4/Dev-VR to Main (//UE4/Main)
-Copy up for 4.23
#rb none

[CL 6911980 by Jeff Fisher in Main branch]
2019-06-10 12:22:13 -04:00
chris babcock
b8e328bea6 Remove access token logging of java bridge on Android for shipping builds
#android
[REVIEW] [at]Michael.Kjeldsen


#ROBOMERGE-SOURCE: CL 6896599 via CL 6896601 via CL 6896638 via CL 6904737
#ROBOMERGE-BOT: (v366-6836689)

[CL 6906014 by chris babcock in Main branch]
2019-06-08 23:25:24 -04:00