Commit Graph

3211 Commits

Author SHA1 Message Date
michael trepka
e864c7a6cc Change the minimum OS version required to launch the game on Mac to 10.14.6
[FYI] Matt.Collins, Will.Damon


#ROBOMERGE-SOURCE: CL 11301793 via CL 11301794 via CL 11301795 via CL 11301796
#ROBOMERGE-BOT: (v0-11244347)

[CL 11301797 by michael trepka in Main branch]
2020-02-09 12:25:33 -05:00
jack porter
28d01347a9 Prevent IOS provisioning parse failure when remote building on a Mac without internet access
#rb trivial


#ROBOMERGE-SOURCE: CL 11300828 via CL 11300829
#ROBOMERGE-BOT: (v647-11244347)

[CL 11300830 by jack porter in Main branch]
2020-02-08 04:25:47 -05:00
Josh Adams
aa9705149b Copying Private-LoadTimes-4.24 stream to Main. Biggest changes are in Materials/Shader memory freezing.
#rb none

[CL 11282608 by Josh Adams in Main branch]
2020-02-06 13:13:41 -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
ben marsh
8c54206370 UBT: Fix UHT always running for installed engine builds. Was dependent on timestamps of binaries downloaded by launcher.
#rb none
#jira UE-88122

#ROBOMERGE-SOURCE: CL 11248022 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v647-11244347)

[CL 11254406 by ben marsh in Main branch]
2020-02-05 12:40:41 -05:00
brandon schaefer
77081a0b31 Append a suffix to the binary name before the extension when using llvm sanitizers to avoid overwriting binary/*.so names
#jira UE-88101
#rb none
[FYI] Michael.Sartain, Michael.Trepka


#ROBOMERGE-SOURCE: CL 11246101 via CL 11246102 via CL 11246103
#ROBOMERGE-BOT: (v647-11244347)

[CL 11254337 by brandon schaefer in Main branch]
2020-02-05 12:40:10 -05:00
Marc Audy
aec58d8240 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 11246035
#rb
#rnx

[CL 11252410 by Marc Audy in Dev-Framework branch]
2020-02-05 12:12:38 -05:00
Marc Audy
4ec917cbba Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 11213977
#rb
#rnx

[CL 11215578 by Marc Audy in Dev-Framework branch]
2020-02-04 11:43:57 -05:00
Marc Audy
6be7175165 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 11203868
#rb
#rnx

[CL 11203920 by Marc Audy in Dev-Framework branch]
2020-02-01 14:39:32 -05:00
Marc Audy
9b14e17824 Merging //UE4/Dev-Main to Dev-Framework (//UE4/Dev-Framework) @ 11128285
#rb
#rnx

[CL 11130996 by Marc Audy in Dev-Framework branch]
2020-01-28 11:29:06 -05:00
PJ Kack
ef8a7b620e AUTO MERGE
Merging //UE4/Main @ 11112898 to //UE4/Dev-Core (dev-core-l0178)

#rb none

(ushell-p4-mergedown)

[CL 11113593 by PJ Kack in Dev-Core branch]
2020-01-26 11:35:42 -05:00
PJ Kack
3a9ca4d2f9 Merging //UE4/Main @ 11112898 to //UE4/Dev-Core (dev-core-l0178)
#rb none

(ushell-p4-mergedown)

[CL 11113592 by PJ Kack in Dev-Core branch]
2020-01-26 11:33:22 -05:00
michael noland
d7901307b8 Adding preliminary support for enabling the warning C4244 ('argument': conversion from 'type1' to 'type2', possible loss of data) on a module by module basis to help catch int64->int32 and double->float / float<->int confusion
- UnsafeTypeCastWarningLevel can be set to WarningLevel.Warning or WarningLevel.Error in ModuleName.Build.cs (off by default)
- Currently only supported on MS compilers (Clang ignores the setting for now)
#jira UE-86949
#rb ben.marsh


#ROBOMERGE-SOURCE: CL 11050203 via CL 11050250 via CL 11050262
#ROBOMERGE-BOT: (v637-11041722)

[CL 11050266 by michael noland in Main branch]
2020-01-17 13:27:48 -05:00
justin marcus
b434d4c28e Make InstallBundleConfig a hierarchical INI.
Fix FConfigCacheIni::GetSectionNames returning names in reverse order.
Make sure build scripts properly respect bundle order.

change 2/2 - everything not internal

[at]Daniel.Lamb [at]Hongyi.Yu




#ROBOMERGE-SOURCE: CL 11047646 via CL 11047649 via CL 11047656
#ROBOMERGE-BOT: (v637-11041722)

[CL 11047666 by justin marcus in Main branch]
2020-01-17 12:25:29 -05:00
alejandro aguilar
aa5cba7f8a PR #6420: Added code to support Sign in with apple. (Contributed by hoiogi)
#jira UE-85469

[CL 11042164 by alejandro aguilar in Main branch]
2020-01-17 08:39:22 -05:00
PJ Kack
5d37548746 UAT: Change the default DeployFolder name to be ShortProjectName-RootFolderName-UserName truncated to 50 characters.
This will deploy the same project from different streams or users to to different workspaces.
Use the DeployFolder instead of the ShortProjectName for all platforms.
The existing -deploy=DeployFolder argument can be used to specify any custom workspace name.

#rb jeff.newquist

[CL 11041420 by PJ Kack in Dev-Core branch]
2020-01-17 04:36:41 -05:00
chad garyet
7c5f99777c - add CompileChaos and -UseChaos flags
#rb ben.marsh

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: chad.garyet
#ROBOMERGE-SOURCE: CL 10995988 via CL 10996038 via CL 10996040 via CL 10996048
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v633-10983880)

[CL 11025805 by chad garyet in Dev-Core branch]
2020-01-16 01:03:05 -05:00
sergio gardeazabal
7f7e90cdb7 Fix for compilation errors using SN-DBS
#rb Mike.Beach, Markus.Breyer, Ryan.Durrand

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: sergio.gardeazabal
#ROBOMERGE-SOURCE: CL 10995948 via CL 10995968 via CL 10995972
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v633-10983880)

[CL 11025798 by sergio gardeazabal in Dev-Core branch]
2020-01-16 01:02:46 -05:00
graeme thornton
615b7060a3 RulesAssembly.GetTargetNameByType() will only consider primary targets
#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: graeme.thornton
#ROBOMERGE-SOURCE: CL 10991531 via CL 10991532 via CL 10991534 via CL 10991536
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v633-10983880)

[CL 11015983 by graeme thornton in Dev-Core branch]
2020-01-15 22:32:52 -05:00
derek ehrman
269f7f4233 Back out changelist 10983314
re-enabling chaos in 12.00 to avoid impacting downstream ... will redo it and deadend appropriately.



[FYI] Max.Whitehead, Michael.Lentine

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: derek.ehrman
#ROBOMERGE-SOURCE: CL 10985069 via CL 10985152 via CL 10985168 via CL 10985197
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v633-10983880)

[CL 11010007 by derek ehrman in Dev-Core branch]
2020-01-15 22:07:50 -05:00
derek ehrman
9e43ffb552 Disabling Chaos in 12.00
[FYI] Michael.Lentine

#rb trivial



#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: derek.ehrman
#ROBOMERGE-SOURCE: CL 10983314 via CL 10983319 via CL 10983323 via CL 10983325
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v633-10983880)

[CL 11008958 by derek ehrman in Dev-Core branch]
2020-01-15 22:03:50 -05:00
jon nabozny
53952b18c1 Redo changes from CL-10931598 with crash fix and copyright update.
[FYI] Bob.Tellez
#rb None

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: jon.nabozny
#ROBOMERGE-SOURCE: CL 10982730 via CL 10982741 via CL 10982750 via CL 10983012
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v633-10983880)

[CL 11008716 by jon nabozny in Dev-Core branch]
2020-01-15 22:02:50 -05:00
chad garyet
010f58f9a0 - add CompileChaos and -UseChaos flags
#rb ben.marsh


#ROBOMERGE-OWNER: chad.garyet
#ROBOMERGE-AUTHOR: chad.garyet
#ROBOMERGE-SOURCE: CL 10995988 via CL 10996038 via CL 10996040
#ROBOMERGE-BOT: (v633-10983880)

[CL 10996048 by chad garyet in Main branch]
2020-01-15 14:42:16 -05:00
sergio gardeazabal
78b3ca62f2 Fix for compilation errors using SN-DBS
#rb Mike.Beach, Markus.Breyer, Ryan.Durrand


#ROBOMERGE-SOURCE: CL 10995948 via CL 10995968
#ROBOMERGE-BOT: (v633-10983880)

[CL 10995972 by sergio gardeazabal in Main branch]
2020-01-15 14:32:38 -05:00
graeme thornton
c8d155afc8 RulesAssembly.GetTargetNameByType() will only consider primary targets
#ROBOMERGE-SOURCE: CL 10991531 via CL 10991532 via CL 10991534
#ROBOMERGE-BOT: (v633-10983880)

[CL 10991536 by graeme thornton in Main branch]
2020-01-15 03:55:30 -05:00