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
80,283 Commits 23 Branches 254 Tags
9ce659f0e1754328121e245e3545867fe3db5496
Commit Graph

67 Commits

Author SHA1 Message Date
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
Joakim Lindqvist
c5c259570b Excluding target.cs files from the module source, fixes issue were target source gets assigned to a project multiple times (which in some cases results in it being assigned to a otherwise empty project) 
Resolves issue with games having a program with the same overlapping name.

#rb ben.marsh

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

[CL 8034100 by Joakim Lindqvist in Dev-Build branch]
 2019-08-14 11:53:23 -04:00
Josh Adams
2eb5796bba - Revamped the Platform Extension plugin support to go back to just passing one directory to ReadPluginsFromDirectory now that the directory swap allows it 
#rb ben.marsh

[CL 7954514 by Josh Adams in Dev-Build branch]
 2019-08-12 17:59:42 -04:00
Ben Marsh
2aff13a3b8 Add functionality to allow querying the available targets for a project from the editor, and use it to allow packaging client and server targets from the "Package Project" menu. 
#rb none

[CL 7950582 by Ben Marsh in Dev-Build branch]
 2019-08-12 11:21:45 -04:00
Joakim Lindqvist
86931fb171 Fixed incorrect check for non enigne modules which broke in 7839052. 
Also changed local function to a member to fix build issue.

#rb none

[CL 7839081 by Joakim Lindqvist in Dev-Build branch]
 2019-08-07 06:08:57 -04:00
Joakim Lindqvist
bd8a5b8c20 Changed order in which modules are mapped to visual studio projects 
It is now Game -> Mod -> Program -> Engine -> Enterprise

This resolves issues were a Program in the game source root would take all the source code away from the Game project.
In this case now though the Program source is put into the Game project, it is best to have program target in a Programs folder under the game source rather then at the same level as the game targets.

#rb none
#review-7795550 ben.marsh

[CL 7839052 by Joakim Lindqvist in Dev-Build branch]
 2019-08-07 05:54:00 -04:00
Josh Adams
84150c0c8f - Changed the directory structure from /Platforms/Engine to /Engine/Platforms (and .../Project/Platforms) 
- Some fixes to get project platform files compiling
#rb ben.marsh

[CL 7294119 by Josh Adams in Dev-Build branch]
 2019-07-12 16:09:23 -04:00
cmp-
f0992d9416 PR #5942: UBT: Fix duplicate platform check (Contributed by cmp-) 
#rb none
#rnx
#jira UE-76215

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 6988229 in //UE4/Release-4.23/... via CL 6988230
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v367-6836689)

[CL 7092860 by ben marsh in Dev-Build branch]
 2019-06-19 10:47:00 -04:00
ben marsh
11f022162f Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) [at] 6944469 
#rb none
#rnx

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: rolando.caloca
#ROBOMERGE-SOURCE: CL 6944849 in //UE4/Main/...
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v367-6836689)

[CL 7089689 by ben marsh in Dev-Build branch]
 2019-06-19 08:52:32 -04:00
David Harvey
595de45445 PlatformExtensions: 
- extensions are included in the solution
 - extension automation projects are included under Automation, and built as part of AutomationTool

#rb josh.adams

[CL 6651876 by David Harvey in Dev-Build branch]
 2019-05-28 09:17:23 -04:00
Ben Marsh
7d3da16a4f UBT: Allow the project file generator to correctly handle multiple modules in programs. 
#rb none

[CL 6378395 by Ben Marsh in Dev-Build branch]
 2019-05-08 16:24:18 -04:00
Josh Adams
1e4b186150 - Big update to platforms: PlatformExtensions 
- This allows for Confidential platforms to exist outside of the engine, and insert themselves in as needed
- Directory structure is, where .... mirrors the directory structure for Engine and projects
     - /Platforms/XXX/....
- Moving to more data driven approach for ShaderPlatforms and PlatformInfo, where they can be read from DataDrivenPlatformInfo.ini files that live in the platform config folders
- Removed platform mentions from UBT, by way of changing some enums to partial classes with static members (see UnrealTargetPlatform)
- Various other UBT/UAT modifications to allow for looking in other locations for files
- THIS IS NOT A COMPLETE AND FINAL SOLUTION. WE WILL CONTINUE WORK IN DEV-BUILD BEFORE ITS READY FOR PRIMETIME
#rb ben.marsh

[CL 6271418 by Josh Adams in Dev-Build branch]
 2019-05-03 08:03:23 -04:00
Ben Marsh
4d27210c01 UBT: Remove global function for determining whether a file is under an engine directory. This is now done via a trait that is propagated through construction of individual modules. 
#rb none
#rnx
#fyi Josh.Adams

[CL 6076546 by Ben Marsh in Dev-Build branch]
 2019-04-24 08:31:23 -04:00
Ben Marsh
6cecf89d14 UBT: Expose all the options for configuring the project file generator to the BuildConfiguration.xml files. 
#rb none
#fyi Donal.MacCarthy

[CL 5708626 by Ben Marsh in Dev-Build branch]
 2019-04-03 09:11:22 -04:00
Ben Marsh
305c1e8512 UBT: Exclude any source files in a ThirdParty folder from the generated solution, not just those under Engine/Source/ThirdParty. There are a lot of large third party modules in engine plugins. 
#rb none

[CL 5618127 by Ben Marsh in Dev-Build branch]
 2019-03-27 20:04:42 -04:00
Ben Marsh
07e535411b Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build) 
#rb none
#rnx

[CL 5435186 by Ben Marsh in Dev-Build branch]
 2019-03-18 16:38:36 -04:00
Ben Marsh
03ccbeb0a1 UBT: Exclude projects with temporary targets from generated project files by default. Can be re-enabled by passing -IncludeTempTargets to GenerateProjectFiles.bat. 
#rb none
#jira UE-71318

[CL 5359427 by Ben Marsh in Dev-Build branch]
 2019-03-11 10:57:27 -04:00
ben marsh
c58bb3b972 UBT: Include other files in the project directory within the generated projects. 
#rb none
#rnx
#jira

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 5271663 in //UE4/Release-4.22/... via CL 5271664
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 5274379 by ben marsh in Dev-Build branch]
 2019-03-01 21:00:43 -05:00
Ben Marsh
0f79d0e564 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build) 
#rb none
#rnx

[CL 4979967 by Ben Marsh in Dev-Build branch]
 2019-02-12 21:08:26 -05:00
Ben Marsh
6bef1a9def UBT: Remove code to add the -Monolithic option when generating intellisense data. This only exists to prevent intellisense errors because the DLLEXPORT and DLLIMPORT macros are mismatched for the project containing all modules; we can achieve this by explicitly modifying the macros instead. 
#rb none
#rnx

[CL 4686059 by Ben Marsh in Dev-Build branch]
 2019-01-07 15:09:52 -05:00
Ben Marsh
973932605e UBT: Fix project file generator including all projects in the workspace in the solution, even if a specific project file is specified. 
#rb none
#rnx

[CL 4685376 by Ben Marsh in Dev-Build branch]
 2019-01-07 12:21:18 -05:00
Ben Marsh
7ad281502a UBT: Don't assume the default architecture for a platform is the empty string. It's not on Linux, which causes warnings when generating project files. 
#rb none
#jira UE-68019
#rnx

[CL 4682487 by Ben Marsh in Dev-Build branch]
 2019-01-04 14:51:43 -05:00