Mostly a find/replace, though I have looked through the changes and attempted to update references to other things as necessary (eg. renaming IOS plist files for IOS). I'm not set up to test on any platforms other than windows, and was hoping to get your blessing to submit and give QA enough time as possible to uncover issues before the next milestone release.
Particular things that I know I'm not sure about:
- Android references /UE4Game/ paths everywhere (for paths on device, I think). I have no idea if I've got them all.
- I've renamed the iOS mobileprovisions, but I don't know if they need regenerating for the new app name.
- Likewise, not sure what needs to be updated for icon bundles on iOS.
Things that have not been changed:
- Windows still uses IDI_UE4ICON for its icon
- UE4CommandLine.txt
- There's still a UE4Game module which is used by content-only projects
#rb none
[CL 14301890 by Ben Marsh in ue5-main branch]
[at]Michael.Kirzinger [at]Sam.Zamani
#ROBOMERGE-SOURCE: CL 13147638 via CL 13151387 via CL 13151410 via CL 13151437 via CL 13151456
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v688-13145358)
[CL 13151482 by chris varnsverry in Main branch]
#ROBOMERGE-SOURCE: CL 13034464 via CL 13034473
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)
[CL 13034478 by michael kirzinger in Main branch]
[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]
#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]
#jira UE-90022
#ue4
#android
[FYI] Jack.Porter
#rb Jack.Porter
#ROBOMERGE-SOURCE: CL 12670397 in //UE4/Release-4.25/... via CL 12670401 via CL 12670403
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)
[CL 12671917 by chris babcock in Main branch]
#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]
[FYI] Carl.Lloyd, Chris.Babcock
#jira UE-90022
#rb Chris.Babcock
#lockdown cristina.riveron
#ROBOMERGE-SOURCE: CL 12506958 in //UE4/Release-4.25/... via CL 12506959 via CL 12506964
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)
[CL 12506966 by jack porter in Main branch]
#jira UE-90200
#rb chris.babcock
#ROBOMERGE-SOURCE: CL 12496258 in //UE4/Release-4.25/... via CL 12496262 via CL 12496270
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)
[CL 12496280 by dmitriy dyomin in Main branch]
- Fixes possible race condition in which startActivity could create the new activity in the same process as the outgoing activity and then exiting process.
#rb chris.babcock
#ROBOMERGE-SOURCE: CL 12298521 via CL 12298547 via CL 12298553 via CL 12298562
#ROBOMERGE-BOT: (v670-12295787)
[CL 12298568 by allan bentham in Main branch]
Summary:
For some reason some wifis appear to have issues contacting `https://example.com/`
In logs provided by Stephen, it is clear in the logs that it is failing to contact this host, and even in a web browser he was unable to open `https://example.com` which is extremely unexpected.
This changes updates the network manager to include two other hosts as options to validate internet connectivity against:
"https://google.com/"
"https://www.samsung.com/"
I included samsung in-case google was blocked such as in a region like China.
The verification of the internet will check all 3 domains before determining that network connectivity is down.
If one domain fails (such as example.com) but the next succeeds, because of how the indexing is performed the next time the internet is validated the previously used host that was successfully validated against will be used first in its check.
Test-plan:
I performed multiple network checks and saw no anomolies:
1. I turned the wifi off and then back on
2. I turned the wifi on, and then back off as soon as it connected to force a validation failure
- Verified in the logs that it attempted to contact all 3 hosts
In all my testing the network connectivity was correctly identified as I would expect and while connected I was able to use the app.
As a final test, I gave Stephen Leicht an APK with these changes to verify that he was no longer experiencing what he reported in FORT-271049.
He saw no issues when using the app and it functioned as expected
[REVIEW] chris.babcock, mor.sela, zhaolong.zhong
#ROBOMERGE-SOURCE: CL 12237831 via CL 12237839 via CL 12237841 via CL 12245951
#ROBOMERGE-BOT: (v668-12245121)
[CL 12246023 by ben temple in Main branch]
Importing changes applied to 12.10 here: https://p4-swarm.epicgames.net/reviews/12121724/
Test Plan:
Launched app and game without fix
Verified that after typing in text, using auto complete, and dismissing the keyboard the game did crash
Launched app and game with fix
Verified that after typing in text, using auto complete, and dismissing the keyboard the game did not crash
This was tested and verified by QA in 12.10. See this review: https://p4-swarm.epicgames.net/reviews/12121724/ and the referenced jira task.
#ROBOMERGE-SOURCE: CL 12140768 via CL 12140800 via CL 12140828
#ROBOMERGE-BOT: (v659-12123632)
[CL 12140854 by ben temple in Main branch]
#jira none
#rb mi.wang
#ROBOMERGE-SOURCE: CL 12124819 in //UE4/Release-4.25/... via CL 12124822
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v659-12123632)
[CL 12124826 by wei liu in Main branch]
#rb chris.babcock
#rnx
#fyi Allan.Bentham
#ROBOMERGE-OWNER: jack.porter
#ROBOMERGE-AUTHOR: allan.bentham
#ROBOMERGE-SOURCE: CL 12000213 via CL 12000756 via CL 12002284 via CL 12005787
#ROBOMERGE-BOT: (v656-11643781)
[CL 12048213 by jack porter in Main branch]
Add gameActivityOnRestartApplicationAdditions to allow plugins to get notice of app restart requests.
#rb chris.babcock
#rnx
#ROBOMERGE-OWNER: allan.bentham
#ROBOMERGE-AUTHOR: allan.bentham
#ROBOMERGE-SOURCE: CL 11894983 via CL 11894984 via CL 11894986
#ROBOMERGE-BOT: (v656-11643781)
[CL 11895006 by allan bentham in Main branch]
#jira UE-89450
#rb chris.babcock, jack.porter, mi.wang, yuntian.chai
#ROBOMERGE-SOURCE: CL 11850513 in //UE4/Release-4.25/... via CL 11850514
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)
[CL 11850704 by wei liu in Main branch]
#android
[REVIEW]
#rb none
#ROBOMERGE-SOURCE: CL 11642140 via CL 11642332 via CL 11642349 via CL 11642365
#ROBOMERGE-BOT: (v656-11643781)
[CL 11834211 by chris babcock in Main branch]
#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]
