Commit Graph

51 Commits

Author SHA1 Message Date
Justin Sargent
c82571b217 Changed the xcode scheme generation to respect binary locations for targets not under Engine.
Merging using UE4-To-UE4-LauncherDev

#codereview Michael.Trepka

[CL 2525098 by Justin Sargent in Main branch]
2015-04-24 18:12:09 -04:00
Michael Trepka
af8dfabf04 Disabled server configs in Rocket Xcode projects
[CL 2516241 by Michael Trepka in Main branch]
2015-04-17 14:43:51 -04:00
Todd Eckert
79e183780f Merging Dev->Main up to CL#2479653 using UE4-Fortnite-To-UE4.
*because of tons of changes, I will supply the changelists in the email because it was too large for this checkin*

[CL 2483008 by Todd Eckert in Main branch]
2015-03-18 10:12:32 -04:00
Ben Marsh
f1e4616bf1 Back out changelist 2478517
[CL 2478555 by Ben Marsh in Main branch]
2015-03-13 10:52:15 -04:00
Ben Marsh
51b5ffa24e Remove some more unnecessary ref keywords.
[CL 2478517 by Ben Marsh in Main branch]
2015-03-13 10:21:51 -04:00
Peter Sauerbrei
2c858adcb7 content-only tool chain changes
#codereview josh.adams

[CL 2464457 by Peter Sauerbrei in Main branch]
2015-02-27 16:10:22 -05:00
Peter Sauerbrei
0578daa661 fix for CIS build failures for IOS on mac
#ios

[CL 2415389 by Peter Sauerbrei in Main branch]
2015-01-22 11:28:25 -05:00
Peter Sauerbrei
dd68f2131d updates to generate plist as part of a build which moves all of the plist data in to the ini files
UEPLAT-114
#ios

[CL 2414979 by Peter Sauerbrei in Main branch]
2015-01-22 00:20:01 -05:00
Ben Marsh
19abf1f176 Include engine source in Rocket projects (but don't build anything).
[CL 2411189 by Ben Marsh in Main branch]
2015-01-19 14:35:40 -05:00
Peter Sauerbrei
808f92cc7f fix for not getting the right settings for the project when generating the xcodeproject
UE-6928
#ios

[CL 2401237 by Peter Sauerbrei in Main branch]
2015-01-08 14:33:02 -05:00
Michael Trepka
98dc0aa5fe Removed conditional inclusion of most platform files in UBT project so the same project can be used in Visual Studio and Mono Develop/Xamarin Studio, removed _Mono UBT and UAT projects, updated automation scripts to be compatible with Mono 3.10
[CL 2388812 by Michael Trepka in Main branch]
2014-12-15 15:28:22 -05:00
Peter Sauerbrei
e45dc69eea Fix for relying on game project matching game directory when generating projects for Xcode
#ios
#mac

[CL 2386123 by Peter Sauerbrei in Main branch]
2014-12-11 16:44:39 -05:00
Ben Marsh
149375b14b Update copyright notices to 2015.
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Michael Trepka
2aa5645bdb Fixed a problem with Server targets missing from Xcode project
[CL 2351655 by Michael Trepka in Main branch]
2014-11-06 15:19:50 -05:00
Peter Sauerbrei
672d502a24 fix for duplicate scheme names when building IOS
UE-4506
#ios

[CL 2347354 by Peter Sauerbrei in Main branch]
2014-11-03 15:47:55 -05:00
Peter Sauerbrei
78d6c9a635 addition of iOS min version and devices supported to iOS Project Settings
UE-3315, UEPLAT-183, UEPLAT-28
#ios

[CL 2340220 by Peter Sauerbrei in Main branch]
2014-10-24 15:31:48 -04:00
Peter Sauerbrei
f2f6d93462 remove some debug code
#ubt

[CL 2321598 by Peter Sauerbrei in Main branch]
2014-10-07 14:24:02 -04:00
Peter Sauerbrei
03ce6ea602 fix for renamed projects not properly naming the xcode schemes
consolidation of IPA name code
TTP343209
#ue4

[CL 2317869 by Peter Sauerbrei in Main branch]
2014-10-02 17:14:09 -04:00
Peter Sauerbrei
8332025ef3 fix for plist trying to be generated from PC
#ue4

[CL 2302901 by Peter Sauerbrei in Main branch]
2014-09-18 15:12:55 -04:00
Michael Trepka
5443ffe63b Fixed issue with code signing in Xcode 6. Generating project files will now create all necessary intermediate Info.plist files for iOS targets so Xcode has the info it needs immediately after opening a project. Also fixed paths to Info.plist files for clients and programs.
#codereview Peter.Sauerbrei, Josh.Adams

[CL 2300018 by Michael Trepka in Main branch]
2014-09-16 16:16:49 -04:00
Bob Tellez
5f3cf61c7d UE4: Moved some Mac/IOS platform specific functions to the UEToolChain interface so branches without Mac code can still run UBT.
#codereview Michael.Trepka,Dmitry.Rekman

[CL 2283868 by Bob Tellez in Main branch]
2014-09-03 21:56:29 -04:00
Robert Manuszewski
e6072fb050 UnrealBuildTool: Added UnrealHeaderTool version checking when checking if it's up to date.
#change UBT will check for API version of all UnrealHeaderTool binaries to detect partial syncs
#change Added BuildHostPlatform class for runtime platform abstraction

[CL 2245408 by Robert Manuszewski in Main branch]
2014-08-06 07:05:15 -04:00
Michael Trepka
3d331e7b6c Fixed a problem with default target arguments in UE4 Xcode project generated with intellisense enabled (issue introduced by CL #2237527)
[CL 2238572 by Michael Trepka in Main branch]
2014-07-31 13:46:00 -04:00
Michael Trepka
571db5da64 Fixed Xcode projects generated for games with different name than target (for example when you create a project from the Vault in the Launcher and use custom name)
[CL 2237527 by Michael Trepka in Main branch]
2014-07-30 17:35:07 -04:00
Peter Sauerbrei
deb07f0b44 fixes to XcodeProjectFileGenerator to add workspace folder
TTP337507
#ue4
#ios

[CL 2215099 by Peter Sauerbrei in Main branch]
2014-07-14 17:50:52 -04:00