Commit Graph

23 Commits

Author SHA1 Message Date
Peter Sauerbrei
aa5a1232f1 Merging
//depot/UE4-TappyChicken/Engine/Source/...

to //depot/UE4/Engine/Source/...

[CL 2081906 by Peter Sauerbrei in Main branch]
2014-05-22 09:13:12 -04:00
Jaroslaw Palczynski
3ddc363bcc Build fix for earlier GitHub merge.
[CL 2080225 by Jaroslaw Palczynski in Main branch]
2014-05-21 07:25:13 -04:00
Michael Trepka
15024f57db Added error handling to CodeSign in iOSPlatform automation script
[CL 2071859 by Michael Trepka in Main branch]
2014-05-13 14:01:21 -04:00
John Pollard
d99028f75e Support for third party iOS framework bundled assets
* Work in progress, works with RPC utility, local mac support incoming
* Changed AdditionalPublicFrameworks from storing just string, to storing the frame work name, zip name, and bundled asset name that needs to be copied
* We also now store the module that added this framework, so we can derive the module project path, etc when we need it for when we create intermediate directories

#Codereview Josh.Adams, Peter.Sauerbrei, Michael.Noland, Gil.Gribb, Robert.Manuszewski

[CL 2068603 by John Pollard in Main branch]
2014-05-09 16:38:26 -04:00
Peter Sauerbrei
ea0c05a402 fix for IOSOnPCTestCompile node not building IPP as part of the build.
#ue4

[CL 2067303 by Peter Sauerbrei in Main branch]
2014-05-08 15:24:09 -04:00
Peter Sauerbrei
da13c9671c move Epic mobile provisions to NotForLicensees
updates to tool chain, UBT, and IPP to properly access them
#ue4
#ios

[CL 2067084 by Peter Sauerbrei in Main branch]
2014-05-08 12:06:33 -04:00
Peter Sauerbrei
acf99a5f40 Adding some missing files to the 4.2 install for iOS content-only projects on PC
#ue4
#ios

[CL 2065596 by Peter Sauerbrei in Main branch]
2014-05-07 10:34:40 -04:00
John Pollard
701f3785b1 Build/cook/run fix when "FrameworkAssets" folder doesn't exist
[CL 2060702 by John Pollard in Main branch]
2014-04-30 21:10:24 -04:00
John Pollard
5e2d1c2dea Modifications to build/cook/run pipeline to support third party frameworks on iOS
#Codereview Josh.Adams, Peter.Sauerbrei, Michael.Noland

[CL 2060181 by John Pollard in Main branch]
2014-04-30 14:09:06 -04:00
Peter Sauerbrei
59f023900a re-enable code sign on PC by default
#ue4
#ios

[CL 2057788 by Peter Sauerbrei in Main branch]
2014-04-28 11:19:36 -04:00
Peter Sauerbrei
028f94b9c2 Fix for iOS build not having the appropriate plist
#ue4
#ios

[CL 2056833 by Peter Sauerbrei in Main branch]
2014-04-25 17:06:07 -04:00
Peter Sauerbrei
b46ccaacf2 Fix for double build of iOS when trying to codesign
#ue4
#ios

[CL 2056586 by Peter Sauerbrei in Main branch]
2014-04-25 13:10:14 -04:00
Gil Gribb
c46ab3c148 build script, rework all email stuff to be hacker-style
[CL 2055579 by Gil Gribb in Main branch]
2014-04-24 12:08:28 -04:00
Ben Marsh
89f5f31f32 [INTEGRATE] Engine source and content from 4.1 branch.
[CL 2053735 by Ben Marsh in Main branch]
2014-04-23 20:10:59 -04:00
Peter Sauerbrei
a928c4fa63 #ue4
#ios
* fix for bad path slashes on Mac

[CL 2046702 by Peter Sauerbrei in Main branch]
2014-04-23 18:53:42 -04:00
Peter Sauerbrei
bca1e7e347 #ue4
#ios
* fix IPA name when archiving a content only project

[CL 2045476 by Peter Sauerbrei in Main branch]
2014-04-23 18:44:50 -04:00
Peter Sauerbrei
4ec6274cb4 #ue4
#ios
* fix for not looking for the correctly generated project name

[CL 2043674 by Peter Sauerbrei in Main branch]
2014-04-23 18:21:30 -04:00
Peter Sauerbrei
ed704939ad #ue4
* temporarily disable PC code signing while I fix the mac build to also build a signed stub

[CL 2040771 by Peter Sauerbrei in Main branch]
2014-04-23 17:45:05 -04:00
Michael Trepka
f1d88c2137 Many improvements to Xcode project generator, including fixes for project indexing, got rid of separate build and run iOS targets and code cleanup.
[CL 2039933 by Michael Trepka in Main branch]
2014-04-23 17:32:01 -04:00
Peter Sauerbrei
ccae636582 #ue4
#ios
* fixed problem with non-development configs with PC IPAs

[CL 2039761 by Peter Sauerbrei in Main branch]
2014-04-23 17:29:34 -04:00
Peter Sauerbrei
af21784258 #ue4
* fix for paths with spaces in them when using IPP

[CL 2039104 by Peter Sauerbrei in Main branch]
2014-04-23 17:24:02 -04:00
UnrealBot
db494a6e69 Engine source (Main branch up to CL 2037954) 2014-04-02 18:09:23 -04:00
Tim Sweeney
324683ce78 Engine source (Main branch up to CL 2026164) 2014-03-14 14:13:41 -04:00