Commit Graph

114 Commits

Author SHA1 Message Date
joe barnes
a54312c776 Android hang detector and loading screen hang detector including fix for false hang trigger when app is backgrounded.
#rb Dmitriy.Dyomin

#ROBOMERGE-AUTHOR: joe.barnes
#ROBOMERGE-SOURCE: CL 20182600 via CL 20184433 via CL 20185023 via CL 20186359 via CL 20186677
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20188843 by joe barnes in ue5-main branch]
2022-05-13 16:42:56 -04:00
PJ Kack
91d645a0a8 Android editor integration improvements.
UAT RunClient: Continuously redirect output to uat stdout while client is running.
UAT RunClient: Add a process wrapper to kill client process when uat exits and to write the adb device log file to the host pc directories.
UAT RunClient: Push the ClientCmdLine args as a UECommandLine.txt file to the device to the correct location (different for adb deploy and android file server) to override the stage/apk command line.
UAT MakeApk: Add a UECommandLine.txt cache file to the intermediate directory to invalidate the apk when the stage/apk command line changes (e.g. when switching between CBTB or COTF or cooking with/without Zen).
LaunchAndroid.cpp: Add debug output for which override command line file that is being used.
LaunchAndroid.cpp: Implement missing -waitforattach/-waitfordebugger feature.
DataDrivenPlatformInfo.ini: set bUATClosesAfterLaunch=false to stop the editor from passing -nokill to uat to let it stop all processes when the client exits..

#jira none
#rb chris.babcock
#rnx
#preflight 6245849873665f7d5e4f0a18
#preflight 624be1f3dc6183e3f5518801

[CL 19621549 by PJ Kack in ue5-main branch]
2022-04-05 02:48:11 -04:00
dmytro vovk
0c9d7e9b9e Disable stackwalking on Android of XOM check is detected
#jira UE-134109
#rb Allan.Bentham
#preflight 61e6cba07f0c4b5aad604c0f

#ROBOMERGE-AUTHOR: dmytro.vovk
#ROBOMERGE-SOURCE: CL 18639423 in //UE5/Release-5.0/... via CL 18639429 via CL 18639432
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v900-18638592)

[CL 18639445 by dmytro vovk in ue5-main branch]
2022-01-18 09:31:30 -05:00
aurel cordonnier
1ee4eed9aa Merge from Release-Engine-Test @ 17666640 to UE5/Main
This represents UE4/Main @17638339 and Dev-PerfTest @17636504

[CL 17668579 by aurel cordonnier in ue5-main branch]
2021-09-29 17:45:16 -04:00
aurel cordonnier
e0ad4e25df Merge from Release-Engine-Test @ 16624776 to UE5/Main
This represents UE4/Main @ 16579691 and Dev-PerfTest @ 16579576

[CL 16625248 by aurel cordonnier in ue5-main branch]
2021-06-10 13:13:24 -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
jeff newquist
5ea7789d60 Rename UE4CommandLine.txt to UECommandLine.txt and deal with all the related changes
#rb TBD
#jira UE-113713

[CL 16093056 by jeff newquist in ue5-main branch]
2021-04-22 10:29:26 -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
Marc Audy
cac1fe0019 Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main
This represents UE4/Main @ CL# 15277572

[CL 15299962 by Marc Audy in ue5-main branch]
2021-02-03 14:57: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
bc88b73a29 Merge Release-Engine-Staging to Main @ CL# 15151250
Represents UE4/Main @ 15133763

[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -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
Jason Bestimt
20c77883a2 Tagging main thread as game thread on Android (similar to CL 14378525 for HL2)
#JIRA: UE-99920
#CodeReview: jules.blok, arne.schober

[CL 14630758 by Jason Bestimt in ue5-main branch]
2020-11-02 14:37:51 -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
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
Ben Marsh
03675533ea Rename UE4Game -> UnrealGame, UE4Client -> UnrealClient, UE4Server -> UnrealServer.
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]
2020-09-11 15:54:42 -04:00
chris babcock
0d107b1102 Unshelved from pending changelist '12670438':
Fix up Android NDK 21 merge differences and native issues

#jira FORT-275902
#android
[FYI] Ben.Temple
#rb Jack.Porter


#ROBOMERGE-OWNER: chris.babcock
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 12670408 via CL 12670410 via CL 12670462
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12671919 by chris babcock in Main branch]
2020-04-08 10:10:06 -04:00
chris babcock
b29a250c87 Fix issues with stdlib and x86_64 linking
#jira UE-89957,UE-90022
#ue4
#android
[FYI] Jack.Porter
#rb Jack.Porter

#ROBOMERGE-SOURCE: CL 12504708 in //UE4/Release-4.25/... via CL 12504709 via CL 12504729
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12504762 by chris babcock in Main branch]
2020-04-01 05:00:44 -04: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
bob tellez
745158e787 Back out changelist 9695177. Content CIS errors
[FYI] Brandon.Schaefer


#ROBOMERGE-SOURCE: CL 9702393 via CL 9702448
#ROBOMERGE-BOT: (v539-9700858)

[CL 9702452 by bob tellez in Main branch]
2019-10-18 17:26:44 -04:00
brandon schaefer
d3a24ca2e0 Only set GIsRequestingExit on the start of an Engine Tick. If its done in the middle of a tick bad things can happen!
[at]Chris.Babcock, [at]Michael.Noland, [at]Steve.Robb
#rb Chris.Babcock, Steve.Robb


#ROBOMERGE-SOURCE: CL 9695177 via CL 9695242
#ROBOMERGE-BOT: (v538-9681622)

[CL 9695248 by brandon schaefer in Main branch]
2019-10-18 14:52:50 -04:00
steve robb
14cab21e0c Deprecating ARRAY_COUNT and changing it to UE_ARRAY_COUNT.
Replicated from CL# 7924370.

#rb none


#ROBOMERGE-OWNER: steve.robb
#ROBOMERGE-AUTHOR: steve.robb
#ROBOMERGE-SOURCE: CL 9279060 via CL 9279063
#ROBOMERGE-BOT: (v443-9013191)

[CL 9279836 by steve robb in Main branch]
2019-09-28 08:19:35 -04:00
brandon schaefer
a715ea4f14 Deprecate GIsRequestingExit
Get GIsRequestingExit now by IsEngineRequestingExit()

Set GIsRequestingExit now by RequestEngineExit(const TCHAR* Reason) or RequestEngineExit(const FString& Reason)
NOTE If Reason is 4 or less chars it will generate an ensure to force a reason to exit

The reason behind this change is right now setting GIsRequestingExit to true can cause many things to break mainly early on and with out any sort of log warning we have entered this state. We should wrap this behind a function to allow for proper handling

#rb Chris.Babcock, Michael.Trepka, Michael.Noland
#jira UE-79933
[FYI] Michael.Noland


#ROBOMERGE-SOURCE: CL 8649683 via CL 8653683
#ROBOMERGE-BOT: (v417-8656536)

[CL 8658680 by brandon schaefer in Main branch]
2019-09-12 14:21:26 -04:00
chris varnsverry
24ecd70ab4 - Wake game thread when backgrounding event received
[at]Rob.Cannaday


#ROBOMERGE-SOURCE: CL 8639120 via CL 8639369 via CL 8651411
#ROBOMERGE-BOT: (v412-8640799)

[CL 8651575 by chris varnsverry in Main branch]
2019-09-12 02:27:31 -04:00