Commit Graph

267 Commits

Author SHA1 Message Date
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
Marc Audy
50a3d7d368 Merge Release-Engine-Staging to Main @ CL# 14467590
This represents UE4/Main @ 14432125 + some cherrypick fixes

[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -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
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
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
florin pascu
13f7595d06 fix t7xx t6xx Stretching Geometry GPUScene
#jira UE-85166
#rb Jack.Porter, Dmitriy.Dyomin

#ROBOMERGE-SOURCE: CL 13030690 in //UE4/Release-4.25/... via CL 13030692 via CL 13030694
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)

[CL 13030695 by florin pascu in Main branch]
2020-04-24 02:47:06 -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
kenzo terelst
5b7560be1b Editgrate fixes from Dev-Rendering
- Add static cleanup function for platform specific files which are used by the CrashContext
- Move CrashVideo.avi to platform specific cleanup function
- ReportGPUCrash on Windows raised exception via Try/Catch because function can be called when the guarded entry is not set

#rb Johan.Berg

#ROBOMERGE-SOURCE: CL 12508002 via CL 12508003 via CL 12508004
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12508009 by kenzo terelst in Main branch]
2020-04-01 12:41:12 -04:00
jamie dale
d9273b52a8 Allow Truncate to retry if interrupted
Ensure we're using the 64-bit version of Truncate so it can deal with large files correctly.

#jira UE-89826
#rb Stefan.Boberg

#ROBOMERGE-SOURCE: CL 12094830 in //UE4/Release-4.25/... via CL 12094841
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v657-12064184)

[CL 12094854 by jamie dale in Main branch]
2020-03-09 17:05:42 -04:00
justin marcus
e6a11e9c33 Implement FPlatformMisc::RestartApplication for Android.
[at]Hongyi.Yu [at]Chris.Babcock



#ROBOMERGE-SOURCE: CL 12079614 via CL 12079620 via CL 12079628
#ROBOMERGE-BOT: (v657-12064184)

[CL 12079635 by justin marcus in Main branch]
2020-03-09 13:50:12 -04:00
carl lloyd
b347222d10 Added disable flag for SM5 so that specific devices can be targetted for desktop quality rendering
[at]Jack.Porter
#rb Jack.Porter
#jira none

#ROBOMERGE-SOURCE: CL 12058597 in //UE4/Release-4.25/... via CL 12058609
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v657-12064184)

[CL 12076392 by carl lloyd in Main branch]
2020-03-09 13:21:52 -04:00
allan bentham
b457410244 Add option for android crash context to not write log when storing crashinfo.
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]
2020-03-04 06:55:54 -05: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
allan bentham
63d1c8eaa2 Android Crash Reporter
- Dump logcat on non fatal reports.
#rb chris.babcock
[FYI] chris.babcock


#ROBOMERGE-SOURCE: CL 11600670 via CL 11600686 via CL 11600693
#ROBOMERGE-BOT: (v656-11643781)

[CL 11722236 by allan bentham in Main branch]
2020-02-27 21:28:37 -05:00
chris babcock
c0d1cde0b0 Update Android toolchain to NDK 21 (20 also supported for x86_64)
#jira UE-80046
#ue4
#android
#rb Bradon.Schaefer


#ROBOMERGE-SOURCE: CL 11554677 in //UE4/Release-4.25/... via CL 11554724
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11578268 by chris babcock in Main branch]
2020-02-21 15:06:37 -05:00
allan bentham
b53079ec7b Flush logs when triggering a non-fatal report
[FYI] chris.babcock
#rb none
#rnx


#ROBOMERGE-SOURCE: CL 11567461 via CL 11567464 via CL 11567467 via CL 11567470
#ROBOMERGE-BOT: (v654-11333218)

[CL 11567472 by allan bentham in Main branch]
2020-02-20 13:16:03 -05:00
allan bentham
2d03b3e19a Add SIGABRT to fatal signals list.
#rb none
[FYI] chris.babcock
#rnx


#ROBOMERGE-SOURCE: CL 11564732 via CL 11564733 via CL 11564734
#ROBOMERGE-BOT: (v654-11333218)

[CL 11564736 by allan bentham in Main branch]
2020-02-20 08:47:54 -05:00
Rolando Caloca
5b82f15def Copying //UE4/Dev-RenderPlat-Staging@11388153 to //UE4/Main
#rb none
#rnx

[CL 11388545 by Rolando Caloca in Main branch]
2020-02-12 13:27:19 -05:00
allan bentham
81a9d7b568 Allow non-native Android callstacks to be stored in crash context's <callstack> property.
#rb chris.babcock, Brandon.Schaefer
[FYI] chris.babcock
#rnx


#ROBOMERGE-SOURCE: CL 11279067 via CL 11279069 via CL 11279071
#ROBOMERGE-BOT: (v0-11244347)

[CL 11279072 by allan bentham in Main branch]
2020-02-06 06:58:09 -05:00
chris babcock
a963357022 Add FAndroidMisc::IsSupportedAndroidDevice()
#android
[FYI] Wes.Hunt
#rb Wes.Hunt



#ROBOMERGE-SOURCE: CL 11258490 via CL 11258499 via CL 11258503
#ROBOMERGE-BOT: (v647-11244347)

[CL 11258949 by chris babcock in Main branch]
2020-02-05 14:42:51 -05:00
Stefan Boberg
55a8b15f1f Copying //UE4/Dev-Core to Main (//UE4/Main)
#rb none

[CL 11258477 by Stefan Boberg in Main branch]
2020-02-05 14:26:36 -05:00