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
176,988 Commits 23 Branches 254 Tags
a12d56ff31e5b5c8d1da02650fc088da7efe1570
Commit Graph

73 Commits

Author SHA1 Message Date
aurel cordonnier
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test 
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
 2021-10-12 21:21:22 -04:00
jack porter
9e39d468e2 Fix assertion when generating Xcode project files for a single game target 
#jira UE-129516
#rnx
#rb Dmitriy.Dyomin
[FYI] Will.Damon

#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 17781185 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v881-17767770)
#ROBOMERGE[STARSHIP]: UE5-Release-Engine-Staging Release-5.0

[CL 17781212 by jack porter in ue5-release-engine-test branch]
 2021-10-12 02:31:58 -04:00
richard wallis
3cec9abbfc Update Xcode project XCBuildConfiguration to handle unique build environments. Also implement platform process GetModulesDirectory() on macOS which allows re-launching of the correct app to also work. 
#jira UE-80706
[at]will.damon,  [at]ben.marsh,  [at]dave.hunter
#rb will.damon,  ben.marsh

#ROBOMERGE-SOURCE: CL 17332770 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v861-17282326)

[CL 17332818 by richard wallis in ue5-release-engine-test branch]
 2021-08-27 06:31:40 -04:00
jonathan adamczewski
64c210d294 AutomationTool, BuildUtilities: 
UnrealBuild -> Unreal for EngineDirectory, RootDirectory, IsEngineInstalled, UnrealBuildToolPath
Remove CommandUtils EngineDirectory, RootDirectory, IsEngineInstalled - use equvalents from UnrealBuildBase.Unreal

#jira none

#ROBOMERGE-SOURCE: CL 16648181 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v833-16641396)

[CL 16648203 by jonathan adamczewski in ue5-release-engine-test branch]
 2021-06-11 18:21:35 -04:00
jonathan adamczewski
233b7719a5 <saved by Perforce> 
#ROBOMERGE-SOURCE: CL 16642197 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v833-16641396)

[CL 16642206 by jonathan adamczewski in ue5-release-engine-test branch]
 2021-06-11 11:37:42 -04:00
jonathan adamczewski
d58996b916 UnrealBuildTool: move some path constants into BuildUtilities 
RootDirectory, EngineDirectory, UnrealBuildToolPath are now found in BuildUtilities' UnrealBuild namesapce.

The way these are computed has changed. Previously, it was assumed that the application is UnrealBuildTool, and paths were constructed relative to that assembly.

Now, the assumption is that the process is located under a "Engine/Build/DotNET" sub-path and paths are constructed relative to that.

#jira none

#ROBOMERGE-SOURCE: CL 16607440 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v828-16531559)

[CL 16607455 by jonathan adamczewski in ue5-release-engine-test branch]
 2021-06-09 12:55:13 -04:00
axel riffard
8082e17223 Refactor iOS Icons 
#jira UE-72584
#rb jack.porter
#preflight 60bef2cb0c76f90001d9e9a9

[CL 16583855 by axel riffard in ue5-main branch]
 2021-06-08 03:06:05 -04:00
aurel cordonnier
43fa62fcd8 Merge from Release-Engine-Test @ 16487383 to UE5/Main 
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16488106 by aurel cordonnier in ue5-main branch]
 2021-05-27 13:40:37 -04:00
marc audy
081dbcbaa7 Better fix for project file generation trying to generate IOS targets for modular build projects 
#jira UE-110893
#rb carl.lloyd
[FYI] Will.Damon

#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 16434660 in //UE4/Release-4.27/... via CL 16434671
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Staging) (v814-16434418)
#ROBOMERGE-CONFLICT from-shelf

[CL 16436427 by marc audy in ue5-release-engine-staging branch]
 2021-05-24 12:13:56 -04:00
Marc Audy
9c748a7390 Fix another stray space introduced by VS auto-formatting 
[CL 16288803 by Marc Audy in ue5-release-engine-staging branch]
 2021-05-11 20:58:50 -04:00
Marc Audy
6e23cf8ab1 Repair bad merge 
[CL 16287766 by Marc Audy in ue5-release-engine-staging branch]
 2021-05-11 20:27:02 -04:00
marc audy
abffb83188 Do not generate target/platform combinations where the project requires modular builds and the platform requires monolithic 
#jira UE-110893
#rb Josh.Adams, Will.Damon

#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 16270387 in //UE4/Release-4.27/... via CL 16270389
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Staging) (v799-16237190)
#ROBOMERGE-CONFLICT from-shelf

[CL 16287302 by marc audy in ue5-release-engine-staging branch]
 2021-05-11 20:15:33 -04:00
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main 
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
 2021-04-08 14:32:07 -04:00
rolando caloca
bb8b3ac23b UE5EA - Fix UE4 reference 
#rb trivial
#jira UE-111419

#ROBOMERGE-SOURCE: CL 15807542 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v783-15756269)

[CL 15813866 by rolando caloca in ue5-main branch]
 2021-03-24 20:54:44 -04:00
Josh Adams
b0e4357576 - UBT Code changes to remove 32-bit Windows support (C++ code for 32-bit still exists) 
#rb marc.audy (concept, not each file)

[CL 15265424 by Josh Adams in ue5-main branch]
 2021-01-31 15:09:58 -04:00
Marc Audy
bf80889353 UE5/Release-Engine-Staging to UE5/Main 
This represents UE4/Main up to CL# 14958402

[CL 15028197 by Marc Audy in ue5-main branch]
 2021-01-08 19:56:07 -04:00
Ben Marsh
d48f3651bb Fix incorrect argument for UE5 project in Xcode project files. 
#rb none
#jira UE-104928

[CL 14990888 by Ben Marsh in ue5-main branch]
 2021-01-05 09:38:02 -04:00
Ben Marsh
6f927647b1 Changing C# code over to using EpicGames.Core over DotNETCommon. 
#rb none
#rnx

[CL 14962096 by Ben Marsh in ue5-main branch]
 2020-12-21 23:07:37 -04:00
Ben Marsh
83f27d27e9 UBT: Mark platforms and project file generation code as not nullable aware. 
#rb none
#rnx

[CL 14960496 by Ben Marsh in ue5-main branch]
 2020-12-20 17:32:59 -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
Ben Marsh
486408b1a9 Rename UE5Editor to UnrealEditor. 
#rb none
#jira UE-97600

[CL 14292067 by Ben Marsh in ue5-main branch]
 2020-09-10 15:39:00 -04:00
Ben Marsh
be7034ec27 Rename UE4Editor to UE5Editor, and generated solution/projects from UE4 -> UE5. 
UE4Game/Client/Server targets left intact for the time being.

#rb none

[CL 14288076 by Ben Marsh in ue5-main branch]
 2020-09-10 09:10:30 -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
ben marsh
306377ee32 Fixed UBT warnings due to missing documentation comment. 
#rb none
[FYI] Jack.Porter
#jira

#ROBOMERGE-SOURCE: CL 12852440 in //UE4/Release-4.25/... via CL 12852453 via CL 12852468
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12852495 by ben marsh in Main branch]
 2020-04-16 08:06:27 -04:00