Commit Graph

23 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
chris babcock
50e9b2fdc5 Update to AndroidX
#jira UE-117916
#android
#rb Steve.Smith


#ROBOMERGE-SOURCE: CL 16635021 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v831-16623017)

[CL 16635027 by chris babcock in ue5-release-engine-test branch]
2021-06-10 21:45:12 -04:00
aurel cordonnier
50944fd712 Merge UE5/RES @ 16162155 to UE5/Main
This represents UE4/Main @ 16130047 and Dev-PerfTest @ 16126156

[CL 16163576 by aurel cordonnier in ue5-main branch]
2021-04-29 19:32:06 -04:00
michael noland
9756461b45 Quick pass at some plugin category clean up
- Moved various things from "Programming" and "Blueprints" to more domain-specific categories
- Merged "Media" and "Movie Players" into "Media Players"
- Merged "Automation" into "Testing"
- Merged "Widgets" and "Web" into "UI"
etc...
[FYI] brooke.hubert
#jira UE-106862

#ROBOMERGE-SOURCE: CL 15390321 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15390329 by michael noland in ue5-main branch]
2021-02-11 14:59:10 -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
Chris Babcock
aede886079 Update log tags from UE4 to UE
#jira none
#codereview @Jack.Porter
#rb Jack.Porter

[CL 14991156 by Chris Babcock in ue5-main branch]
2021-01-05 11:06:30 -04:00
Rolando Caloca
bbb9564388 Copying //UE4/Dev-RenderPlat-Staging@11110326 to //UE4/Main
#rb none
#rnx

[CL 11110369 by Rolando Caloca in Main branch]
2020-01-24 18:07:01 -05:00
Marc Audy
360d078ca3 Second batch of remaining Engine copyright updates.
#rnx
#rb none

[CL 10871248 by Marc Audy in Main branch]
2019-12-27 09:26:59 -05:00
pete procopio
bd252967cb FORT-169910: Build error in firebase for classic build
#jira:FORT-169910
#rb:Chris.Babcock


#ROBOMERGE-SOURCE: CL 6140357 via CL 6140361 via CL 6140897

[CL 6175556 by pete procopio in Main branch]
2019-04-30 11:45:36 -04:00
pete procopio
b103e3207c FORT-169125: Update google firebase json files so we can use different ones in prod, stage and dev
#rb:Chris.Babcock
#jira:FORT-169125
#kairos
#android


#ROBOMERGE-SOURCE: CL 6111340 via CL 6111356 via CL 6112810

[CL 6112982 by pete procopio in Main branch]
2019-04-26 16:43:03 -04:00
teemu pohjanlehto
ffd2dec57e iOS Firebase .tps file included
[FYI] josh.adams


#ROBOMERGE-SOURCE: CL 6104478 via CL 6104479 via CL 6104994

[CL 6105041 by teemu pohjanlehto in Main branch]
2019-04-26 09:47:01 -04:00
teemu pohjanlehto
33506596a6 Remove unnecessary log
[FYI] josh.adams


#ROBOMERGE-SOURCE: CL 6092431 via CL 6092432 via CL 6092693

[CL 6092694 by teemu pohjanlehto in Main branch]
2019-04-25 07:42:43 -04:00
teemu pohjanlehto
986ec40204 Add iOS to firebase plugin
[FYI] josh.adams


#ROBOMERGE-SOURCE: CL 6076226 via CL 6076230 via CL 6077008

[CL 6077015 by teemu pohjanlehto in Main branch]
2019-04-24 09:40:57 -04:00
pete procopio
197f46175c Add Google Firebase tps
#android
#kairos
#rb:Chris.Babcock
#jira:none


#ROBOMERGE-SOURCE: CL 5766123 via CL 5766125 via CL 5768292 via CL 5770059

[CL 5770111 by pete procopio in Main branch]
2019-04-05 19:51:42 -04:00
chris babcock
4c34e3b97b Remove unneeded import
#ue4
#android
[FYI] Jon.Hunt
#rb Jon.Hunt



#ROBOMERGE-SOURCE: CL 5538342 via CL 5538633

[CL 5538639 by chris babcock in Main branch]
2019-03-25 16:25:42 -04:00
chris babcock
8b5a02d7eb Fix Firebase resource staging and harden GooglePlay login error handling
#android
[FYI] Joe.Barrett,Pete.Procopio,Josh.Markiewicz
#rb Peter.Sauerbrei



#ROBOMERGE-SOURCE: CL 5462800 via CL 5464354 via CL 5465274

[CL 5465332 by chris babcock in Main branch]
2019-03-19 22:20:55 -04:00
Andrew Grant
da2cbfff1f Merging 5360223 from Dev-EngineMerge. DevK integration.
#rb #jira na

[CL 5361784 by Andrew Grant in Main branch]
2019-03-11 15:12:02 -04:00
chris babcock
5443bb063a More fallout of merge in GameActivity
- added GameApplication, network change notifications, Firebase, and lifecycle

#android
#rb Pete.Procopio



#ROBOMERGE-SOURCE: CL 5232162 via CL 5238945

[CL 5239022 by chris babcock in Main branch]
2019-02-28 11:31:08 -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
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
Ben Marsh
ea340d3fbf Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

[CL 4567513 by Ben Marsh in Main branch]
2018-11-14 19:05:13 -05:00
James Hopkin
67499ce019 Removed unnecessary resource file
#jira UE-65241
#lockdown Nick.Penwarden

[CL 4468727 by James Hopkin in Main branch]
2018-10-15 14:17:41 -04:00
Marc Audy
af90b7bcd4 Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main) @ 4395008
#rb
#rnx
#lockdown Nick.Penwarden

[CL 4395058 by Marc Audy in Main branch]
2018-09-25 10:11:35 -04:00