Commit Graph

58 Commits

Author SHA1 Message Date
Marc Audy
0c3be2b6ad Merge Release-Engine-Staging to Test @ CL# 18240298
[CL 18241953 by Marc Audy in ue5-release-engine-test branch]
2021-11-18 14:37:34 -05:00
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
allan bentham
d42b8aa0ab Add optional properties map to device profile selector module.
This allows Device profile selector interface to be queried for platform specific properties.
Device preview can also set simulated values.
tidy up affected PIE preview and CheckAndroidDeviceProfile code.

#rb chris.babcock
[FYI] jack.porter
[REVIEW]

#ROBOMERGE-OWNER: allan.bentham
#ROBOMERGE-AUTHOR: allan.bentham
#ROBOMERGE-COMMAND: _robomerge[starship] ue5-main
#ROBOMERGE-SOURCE: CL 17132981 via CL 17133206 via CL 17134238 via CL 17134244 via CL 17134246
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v865-17346139)
#ROBOMERGE[STARSHIP]: UE5-Main

[CL 17385090 by allan bentham in ue5-release-engine-test branch]
2021-09-01 07:53:06 -04:00
rolando caloca
f6cd88c157 UE5 - Remove platform
#rb Steve.Smith
[FYI] Jules.Blok, Ryan.Durand, Ben.Marsh

#ROBOMERGE-SOURCE: CL 17295935 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v861-17282326)

[CL 17295945 by rolando caloca in ue5-release-engine-test branch]
2021-08-24 19:28:38 -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
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
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
Ben Marsh
6f927647b1 Changing C# code over to using EpicGames.Core over DotNETCommon.
#rb none
#rnx

[CL 14962096 by Ben Marsh in ue5-main branch]
2020-12-21 23:07:37 -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
josh adams
8564e1b315 - Changes to various modules, plugins, programs, websites, thirdparty code, etc that had NotForLicensees folders within them, to move to Restricted
- Moved the AndroidDeviceProfileSelector secret guid to a NoRedist .ini setting
[CODEREVIEW] alistair.white,chris.babcock,jack.porter
#rb ben.marsh, advisor

#ROBOMERGE-SOURCE: CL 12706094 via CL 12709228 via CL 12709456
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v676-12543919)

[CL 12709555 by josh adams in Main branch]
2020-04-09 19:58:35 -04:00
jack porter
5063e8c620 Made Android device rule profile hash checking case insensitive. Updated hashed device profiles.
#rb None
[FYI] Chris.Babcock


#ROBOMERGE-SOURCE: CL 12192136 via CL 12192137 via CL 12197036
#ROBOMERGE-BOT: (v662-12191386)

[CL 12197381 by jack porter in Main branch]
2020-03-16 09:20:36 -04:00
Jack Porter
09de789957 Pulling Dev-RPS
#rb None

[CL 11173577 by Jack Porter in Dev-Mobile branch]
2020-01-30 00:16:34 -05:00
Jack Porter
30064f87e0 Change AndroidDeviceProfileSelector editor module loading phase to manual
#jira None
#rb None
#fyi Allan.Bentham, Jules.Blok

[CL 10902137 by Jack Porter in Dev-Mobile branch]
2020-01-08 02:38:10 -05:00
Juan Canada
2ecf4f9708 Merging //UE4/Dev-Main@10877709 to Dev-RenderPlat-Staging(//UE4/Dev-Rendering)
#rnx
#rb none

[CL 10895568 by Juan Canada in Dev-RenderPlat-Staging branch]
2020-01-07 13:45:01 -05:00
Jack Porter
e75ba23361 Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)
#rb None

[CL 6662857 by Jack Porter in Dev-Mobile branch]
2019-05-29 05:11:25 -04:00
Ben Marsh
0cc6e3dca6 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 6631504 by Ben Marsh in Main branch]
2019-05-24 11:51:54 -04:00
Jack Porter
8d3bbb48b2 Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)
#rb None
#jira None

[CL 5826383 by Jack Porter in Dev-Mobile branch]
2019-04-11 06:05:49 -04:00
jack porter
f602370c42 Added CMP_Hash operation to compare against a salted SHA1 hash when matching Android device profiles
#rb chris.babcock


#ROBOMERGE-SOURCE: CL 5687122 via CL 5687140 via CL 5687143 via CL 5687152 via CL 5693311

[CL 5693510 by jack porter in Main branch]
2019-04-02 17:45:32 -04:00
chris babcock
c70cffcc9f Allow hardware/chipset check in device profile matching rules for Android
#ue4
#android
[CODEREVIEW] Jack.Porter
#rb Jack.Porter



#ROBOMERGE-SOURCE: CL 5643240 via CL 5643267 via CL 5643275 via CL 5643285 via CL 5644513

[CL 5648243 by chris babcock in Main branch]
2019-03-29 13:37:32 -04:00
Jack Porter
9d2ebe90d2 Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)
#rb None
#jira 0

[CL 5396125 by Jack Porter in Dev-Mobile branch]
2019-03-14 00:59:16 -04:00
allan bentham
72a97b5140 Take Android matching rules from AndroidDeviceProfles.ini
#rb Jack.porter


#ROBOMERGE-SOURCE: CL 4981621 via CL 4981622 via CL 4981756

[CL 4984523 by allan bentham in Main branch]
2019-02-13 13:06:37 -05:00
Ryan Vance
d5aa052fe5 Copying //UE4/Dev-VR to Dev-Main (//UE4/Dev-Main) Souce CL: 4824152
#lockdown: Nick.Penwarden
#rb Integration

[CL 4824851 by Ryan Vance in Main branch]
2019-01-28 16:31:25 -05:00
Jack Porter
0245e895e4 Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)
#rb None

[CL 4675678 by Jack Porter in Dev-Mobile branch]
2019-01-01 23:32:24 -05:00
Ben Marsh
530369c613 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4662695 by Ben Marsh in Dev-Build branch]
2018-12-14 14:49:12 -05:00
Ben Marsh
7598af0532 Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden

[CL 4662404 by Ben Marsh in Main branch]
2018-12-14 13:41:00 -05:00