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
243,805 Commits 23 Branches 254 Tags
99e9cd0694de7b74df6419509de104818ecc0453
Commit Graph

188 Commits

Author SHA1 Message Date
josh adams
5482171bf2 - Removed extra Engine directory under the UE4 project above the Platforms directory (Platforms was the only folder in the Engine folder) 
#jira UE-89854
#rb ben.marsh

#ROBOMERGE-SOURCE: CL 11827890 in //UE4/Release-4.25/... via CL 11827895
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11827996 by josh adams in Main branch]
 2020-03-02 11:48:53 -05:00
anthony bills
1ef400627b Add support for whitelisting additional plugins and adding additional modules to plugin extensions. 
Additionally allow monolithic programs inside platform extensions to ouput to the Binaries directory in the extension.

[at]brian.white, [at]josh.adams, [at]ben.marsh
#jira UE-81798
#rb ben.marsh

#ROBOMERGE-SOURCE: CL 11655119 in //UE4/Release-4.25/... via CL 11655234
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11655284 by anthony bills in Main branch]
 2020-02-27 10:47:20 -05:00
ben marsh
0f201db161 Add support for UAT script projects using foreign engine builds, and for game projects to output binaries under their own project directory. 
* UAT will now read each *.Automation.csproj file to determine the output path, and load from there rather than just loading anything under Engine\Binaries\AutomationScripts.
* When compiling *.Automation.csproj files, UAT will set the $(EngineDir) directory to the current engine directory, allowing the project to resolve assembly references to the correct location.
* When generating project files, UBT will create an *.Automation.csproj.props file next to the project containing the path to the engine directory, allowing the assembly to be compiled correctly from Visual Studio.

#rb none
#jira UE-77934

#ROBOMERGE-SOURCE: CL 11601626 in //UE4/Release-4.25/... via CL 11601635
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11601659 by ben marsh in Main branch]
 2020-02-25 09:26:12 -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
Ben Marsh
0e6aa011b3 Copying //UE4/Dev-Build @ CL 11166028 to Dev-Main (//UE4/Dev-Main) 
#rb none
#rnx

[CL 11166227 by Ben Marsh in Main branch]
 2020-01-29 14:48:18 -05:00
ben marsh
03ae195b79 Updating copyrights for Engine Programs. 
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536 via CL 10870955
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v624-10872983)

[CL 10876681 by ben marsh in Dev-Build branch]
 2020-01-05 17:24:44 -05:00
Ryan Durand
9ef3748747 Updating copyrights for Engine Programs. 
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536
#ROBOMERGE-BOT: FORTNITE (Main -> Dev-EngineMerge) (v613-10869866)

[CL 10870955 by Ryan Durand in Main branch]
 2019-12-26 23:01:54 -05:00
marc audy
7aae276001 Submit of Josh Adams' restructuring of platform handling in UBT 
[FYI] Josh.Adams

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 10590881 via CL 10590882
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v610-10636431)

[CL 10785306 by marc audy in Dev-Build branch]
 2019-12-17 22:42:25 -05:00
donal maccarthy
a5df949957 Expose Target Configurations to BuildConfiguration.xml 
#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: donal.maccarthy
#ROBOMERGE-SOURCE: CL 10483331 via CL 10483352 via CL 10483359
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v610-10636431)

[CL 10778382 by donal maccarthy in Dev-Build branch]
 2019-12-17 17:30:27 -05:00
marc audy
cfce5dd9ac Submit of Josh Adams' restructuring of platform handling in UBT 
[FYI] Josh.Adams


#ROBOMERGE-SOURCE: CL 10590881
#ROBOMERGE-BOT: (v607-10590470)

[CL 10590882 by marc audy in Main branch]
 2019-12-06 09:16:21 -05:00
donal maccarthy
56899760cc Expose Target Configurations to BuildConfiguration.xml 
#ROBOMERGE-SOURCE: CL 10483331 via CL 10483352
#ROBOMERGE-BOT: (v606-10482310)

[CL 10483359 by donal maccarthy in Main branch]
 2019-12-02 10:28:29 -05:00
Joakim Lindqvist
3a8b293b1e Some command line arguments are now passed on to the target creation (visual studio version specifically). This fixes issues were overriding the visual studio version from command line would not be used in targets, resulting in errors when option like setting the compiler version were also used. 
Reported in UDN:
https://udn.unrealengine.com/questions/528859/view.html

Also fixed so that HololensTarget is actually getting configured from setting sources, including command line and BuildConfiguration.xml which I added attributes for to match how Windows targets can be configured.

#rb ben.marsh

[CL 9866335 by Joakim Lindqvist in Dev-Build branch]
 2019-10-28 04:53:02 -04:00
Mitchell Wilson
f0a83e9112 Copying //UE4/Dev-Documentation to Samples-Main (//UE4/Samples-Main) 
#rb none
#rnx

[CL 9551884 by Mitchell Wilson in Main branch]
 2019-10-11 16:59:16 -04:00
Rolando Caloca
1a30325d6f Copying //UE4/Dev-RenderPlat-Staging@9551419 to //UE4/Main 
#rb none
#rnx

[CL 9551447 by Rolando Caloca in Main branch]
 2019-10-11 15:33:31 -04:00
Nick Shin
3526d16d5e merge/copyup to parent stream - HTML5 platform extension 
#jira UEMOB-482  HTML5 platform as a plug in
#rb josh.adams
#rn

[CL 9306021 by Nick Shin in Dev-Build branch]
 2019-09-30 15:13:56 -04:00
ben marsh
3d59f3f1fc UBT: Allow filtering the platforms we generate project files for, from the BuildConfiguration.xml file. Reduces memory usage in the IDE by a bit. 
#jira


#ROBOMERGE-SOURCE: CL 9098105 via CL 9098106
#ROBOMERGE-BOT: (v443-9013191)

[CL 9100723 by ben marsh in Main branch]
 2019-09-25 14:33:33 -04:00
Ben Marsh
bbe9fecb2f Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main) 
#rb none
#rnx

[CL 9053338 by Ben Marsh in Main branch]
 2019-09-24 16:13:51 -04:00
Joakim Lindqvist
9993ee5b8c Fixed issue were using -Platforms to generate solution with a subset of platforms would break the editor finding the solution, reported in UDN https://udn.unrealengine.com/questions/523843/platform-specific-solution-rename-breaks-visualstu.html 
#rb none

[CL 8570906 by Joakim Lindqvist in Dev-Build branch]
 2019-09-09 04:34:10 -04:00
Ben Marsh
cff319c573 Fixup directory references in WorkspaceTool, and allow projects under Engine/Extras to be added to project files. 
#rb none
#rnx

[CL 8417289 by Ben Marsh in Dev-Build branch]
 2019-09-03 08:12:40 -04:00
ben marsh
d47c5a6a53 Copying //UE4/Dev-Online to Dev-Main (//UE4/Dev-Main) 
- Up to CL8320930 from DevOnline and 8311605 Merge Down from Main
- skipped some Fortnite content/plugins/code where it tried to reintegrate files that had been moved pending investigation
#rb none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: josh.markiewicz
#ROBOMERGE-SOURCE: CL 8321295 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v403-8382528)

[CL 8393012 by ben marsh in Dev-Build branch]
 2019-08-31 14:51:59 -04:00
jeff newquist
e639f21e50 Copy //UE4/Dev-Console to //UE4/Dev-RenderPlat-Staging 
#rb none

[CL 8386275 by jeff newquist in Dev-RenderPlat-Staging branch]
 2019-08-30 15:37:52 -04:00
Josh Markiewicz
d79515867d Copying //UE4/Dev-Online to Dev-Main (//UE4/Dev-Main) 
- Up to CL8320930 from DevOnline and 8311605 Merge Down from Main
- skipped some Fortnite content/plugins/code where it tried to reintegrate files that had been moved pending investigation
#rb none

[CL 8321295 by Josh Markiewicz in Main branch]
 2019-08-26 18:35:22 -04:00
DecoyRS
9333dbbcfa PR #6063: Rider Project Model generation v 1.0 (Contributed by DecoyRS) 
#rb none

[CL 8095590 by Ben Marsh in Dev-Build branch]
 2019-08-16 13:41:27 -04:00
Joakim Lindqvist
cde9463cea Removed usage of platform extensions directory which does not exist anymore, resolves issue introduced in change 8034150 
#rb none

[CL 8042438 by Joakim Lindqvist in Dev-Build branch]
 2019-08-14 16:30:36 -04:00
Joakim Lindqvist
e5ae217978 Reworked module assignment to visual project files to simplify the rule, now the first matching target starting at the module file and searching upwards in the directory structure will be used as base for which project to use. If multiple targets are on the same level the old rules of Game -> Mod -> Program - > Engine -> Platform -> Enterprise applies. 
#rb ben.marsh
#jira UE-78893

(ushell-p4-cherrypick of 8034070 by Joakim.Lindqvist)

[CL 8034150 by Joakim Lindqvist in Dev-Build branch]
 2019-08-14 11:55:58 -04:00