izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity
46,149 Commits 23 Branches 254 Tags
2bbc43bc53aef9638cea601577833c424e69bdfd
Commit Graph

4474 Commits

Author SHA1 Message Date
jack porter
2bbc43bc53 Copying //UE4/Dev-Mobile to Dev-Main (//UE4/Dev-Main) Souce CL: 4806680 
#lockdown: Nick.Penwarden
#rb None

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 4806726 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4806733 by jack porter in Dev-Networking branch]
 2019-01-24 20:39:08 -05:00
andrew grant
71f1425fb6 Added GetCachedConfig accessor to prevent multiple configs being constructed. 
#rb na

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 4800128 via CL 4800129 via CL 4803111 via CL 4804853
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4805037 by andrew grant in Dev-Networking branch]
 2019-01-24 16:33:25 -05:00
steve robb
d42cd122bf Refactored structs to reduce executable space from UHT-generated code tables. 
#rb robert.manuszewski
[FYI] peter.sauerbrei


#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: steve.robb
#ROBOMERGE-SOURCE: CL 4784689 via CL 4789908 via CL 4794430
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4803761 by steve robb in Dev-Networking branch]
 2019-01-24 15:50:36 -05:00
ryan gerleve
efd1e98234 Resolving conflict. 
/src/ROBOMERGE_ENGINE_Dev_Networking/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.cpp - merging //UE4/Main/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.cpp#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.h - merging //UE4/Main/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.h#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Enterprise/Plugins/Editor/MDLImporter/Source/MDLImporter/Private/MDLImporterFactory.h - merging //UE4/Main/Enterprise/Plugins/Editor/MDLImporter/Source/MDLImporter/Private/MDLImporterFactory.h#1


--------------------------------------
Copying //UE4/Dev-Enterprise [at] cl 4784880 to Dev-Main (//UE4/Dev-Main)

#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jeanmichel.dignard
#ROBOMERGE-SOURCE: CL 4784913 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4788073 by ryan gerleve in Dev-Networking branch]
 2019-01-23 16:05:15 -05:00
robert manuszewski
be36beb7e4 Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main) 
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 4772220 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4782699 by robert manuszewski in Dev-Networking branch]
 2019-01-23 09:49:18 -05:00
ben marsh
274f393899 Convert project file path to absolute before passing on the command line to UBT. 
#rb none
#jira UE-68863

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4771381 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4782695 by ben marsh in Dev-Networking branch]
 2019-01-23 09:49:02 -05:00
ben marsh
02577b4e35 Fix comment. 
#jira

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4761641 via CL 4761649 via CL 4761658
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4761662 by ben marsh in Dev-Networking branch]
 2019-01-21 11:20:39 -05:00
graeme thornton
0fb3354acc When adding additional files to the UFS staging list, omit movie files on dedicated servers 
#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: graeme.thornton
#ROBOMERGE-SOURCE: CL 4760621 via CL 4760623 via CL 4760625 via CL 4760626
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4760627 by graeme thornton in Dev-Networking branch]
 2019-01-21 08:44:22 -05:00
ben marsh
98ec1c5ec9 UAT: Use Dns.GetHostName() rather than Environment.MachineName to determine the hostname for matching P4 clients. Environment.MachineName is the short NETBIOS name, and may not include the ".local" suffix typical on Mac. 
#rb none
#jira UE-68746

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4758191 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4758192 by ben marsh in Dev-Networking branch]
 2019-01-18 21:56:22 -05:00
ben marsh
1f428244a7 Fix hot reload from IDE for DebugGame targets. Now that UE4Editor has a separate executable in DebugGame, we have to check for it running when starting a build/ 
#rb none
#jira UE-67911

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4758134 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4758135 by ben marsh in Dev-Networking branch]
 2019-01-18 21:31:48 -05:00
ben marsh
32b42c1e58 CrashReportClient: Grey out the option to opt-out of being contacted for internal engine builds. 
#rb none
#jira UE-68745

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4758106 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4758110 by ben marsh in Dev-Networking branch]
 2019-01-18 21:16:26 -05:00
ben marsh
a931d5f5bf UBT: Add support for Aras-P's -ftime-trace PR for Clang, which outputs a JSON file containing a timeline for the compile. See http://aras-p.info/blog/2019/01/16/time-trace-timeline-flame-chart-profiler-for-Clang/ for more info. 
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4757790 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4757801 by ben marsh in Dev-Networking branch]
 2019-01-18 20:24:36 -05:00
aaron mcleran
ed7878cd8f Implementing cook-time analysis data 
#rb Ethan.Geller

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: aaron.mcleran
#ROBOMERGE-SOURCE: CL 4748946 via CL 4748948 via CL 4748951 via CL 4748954
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4748970 by aaron mcleran in Dev-Networking branch]
 2019-01-17 19:53:03 -05:00
peter sauerbrei
eef12e461f fix for minimum version we support for TVOS 
#jira UE-68514
#rb john.mauney

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: peter.sauerbrei
#ROBOMERGE-SOURCE: CL 4744409 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4744412 by peter sauerbrei in Dev-Networking branch]
 2019-01-17 13:10:29 -05:00
Peter Engstrom
39c0dc7067 Programs need to build with support for developer tools in order to get all SlateEditorStyle code.. 
TODO: Be more restrictive about SlateReflector's use of MessageLog so that there's no dependency on EditorStyle unless needed.

#rb matt.kuhlenschmidt

[CL 4742927 by Peter Engstrom in Dev-Networking branch]
 2019-01-17 10:52:45 -05:00
chris babcock
304989fcdd Fix issue with compiler executable paths with spaces on Android 
#jira UE-68380
#ue4
#android
[FYI] Jack.Porter
#rb Jack.Porter

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 4738473 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4738476 by chris babcock in Dev-Networking branch]
 2019-01-16 22:01:02 -05:00
ben marsh
0b32cd5b67 Fix command line arguments not being split by delimiter characters, and revert CL 4737886. 
#rb none
[FYI] Chris.Babcock

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4738035 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4738036 by ben marsh in Dev-Networking branch]
 2019-01-16 20:06:48 -05:00
chris babcock
f20f3a6362 Fix issue with -Architectures and GPUArchitectures not being split properly 
#jira UE-68518
#ue4
#android
[FYI] Ben.Marsh
#rb John.Mauney

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 4737886 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4737889 by chris babcock in Dev-Networking branch]
 2019-01-16 19:29:56 -05:00
ben marsh
5cbdbd4599 Disable warnings about unused arguments when generating project files. We do additional argument parsing after the point that the warning is output. 
#rb none
#jira UE-68511

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4737711 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4737714 by ben marsh in Dev-Networking branch]
 2019-01-16 18:36:29 -05:00
marc audy
892f022bda Copying //UE4/Dev-Framework to Dev-Main (//UE4/Dev-Main) [at] 4736279 
#rb
#rnx

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 4736445 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4736453 by marc audy in Dev-Networking branch]
 2019-01-16 16:19:29 -05:00
chris babcock
993f55695f Remove SDK missing error if Gradle enabled since it can download it if necessary 
#jira UE-68588
#ue4
#android
#rb John.Mauney

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 4736204 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4736208 by chris babcock in Dev-Networking branch]
 2019-01-16 15:43:06 -05:00
ben marsh
6a826e27e9 Fix errors building foreign projects with a space in the path. 
#rb none
#rnx

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4735380 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4735382 by ben marsh in Dev-Networking branch]
 2019-01-16 15:02:47 -05:00
ben marsh
fb7ad5e843 Add more debug info to exceptions thrown when a target is invalid. 
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4733751 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4734082 by ben marsh in Dev-Networking branch]
 2019-01-16 13:42:22 -05:00
ben marsh
82f2080de3 Copy UGS from Dev-Build (pt 2) 
#rb none
#rnx

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4732764 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4733960 by ben marsh in Dev-Networking branch]
 2019-01-16 13:39:33 -05:00
ryan gerleve
cac17e709a Fixing merge conflict. 
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Programs/UnrealGameSync/UnrealGameSync/Forms/PerforceSyncSettingsWindow.cs - merging //UE4/Main/Engine/Source/Programs/UnrealGameSync/UnrealGameSync/Forms/PerforceSyncSettingsWindow.cs#1


--------------------------------------
Copying latest UGS from Dev-Build (pt 1)

#rb none
#rnx

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4732753 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4733949 by ryan gerleve in Dev-Networking branch]
 2019-01-16 13:38:33 -05:00