Commit Graph

54 Commits

Author SHA1 Message Date
Peter Sauerbrei
446972d460 [INTEGRATE] Chage 2082198
final changes to make Tappy Chicken for HTML5
#ue4
#html5
#tappy chicken

[CL 2082256 by Peter Sauerbrei in Main branch]
2014-05-22 15:14:51 -04:00
Bob Tellez
ab8c090a38 UE4: Removed bCompileNetworkProfiler. USE_NETWORK_PROFILER is now true whenever STATS is also true. Also, removed some platform-specific code in NetworkProfiler.cpp
[CL 2082160 by Bob Tellez in Main branch]
2014-05-22 14:04:35 -04:00
Peter Sauerbrei
4ccc5c3dc7 build fix for UEDeploy interface
#ue4

[CL 2081907 by Peter Sauerbrei in Main branch]
2014-05-22 09:13:24 -04:00
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
5711005b53 [GitHub] 78 : Extract WriteTargetInfo.
#ttp 333495
#codereview Robert.Manuszewski

[CL 2081722 by Jaroslaw Palczynski in Main branch]
2014-05-22 04:17:03 -04:00
Jaroslaw Palczynski
17d9ce9ab2 [GitHub] 131 : Improve cloning of Environments
#ttp 334941
#codereview Robert.Manuszewski

[CL 2081720 by Jaroslaw Palczynski in Main branch]
2014-05-22 04:16:41 -04:00
Robert Manuszewski
a05ad646c2 UBT: More detailed module types. ScriptPlugins can now ingore modules by their type.
[CL 2081573 by Robert Manuszewski in Main branch]
2014-05-22 01:20:24 -04:00
Jaroslaw Palczynski
7606debc6d [GitHub] 66 : Start plumbing for advanced build handling
#ttp 333302
#codereview Robert.Manuszewski

[CL 2080176 by Jaroslaw Palczynski in Main branch]
2014-05-21 06:09:37 -04:00
Robert Manuszewski
6feb9053a3 UBT: Fixing DebugGame pch and plugin intermediate paths
[CL 2080129 by Robert Manuszewski in Main branch]
2014-05-21 04:54:13 -04:00
Jeff Farris
cb131d0bf7 Fixed engine path in server builds
#codereview Ben.Marsh

[CL 2079114 by Jeff Farris in Main branch]
2014-05-20 13:14:28 -04:00
Marcus Wassmer
9e34ed0825 Hide command window popups when switching SDKS.
#codereview Dmitry.Rekman

[CL 2078989 by Marcus Wassmer in Main branch]
2014-05-20 11:13:55 -04:00
Keith Judge
86220377dd Remove Monolithic Direct3D switch, as this is now enabled by default.
[CL 2078889 by Keith Judge in Main branch]
2014-05-20 09:43:32 -04:00
Steve Robb
d3d90eafb4 #ttp 333737: UHT should not output anything differently for Rocket - resubmitted after CL# 2068336 was backed out due to UAT rebuild problems.
#change Root module path added to include paths.
#change Plugins now write intermediates to the project folder.
#change All generated #includes are now relative.
#change Updated UHTDebugging.manifest to new format.
#change Android response files now use relative include paths to prevent overly-large response files.
#remove Rocket-specific UHT execution removed.
#remove iOS header hack removed.

#codereview robert.manuszewski,ben.marsh

[CL 2077472 by Steve Robb in Main branch]
2014-05-19 06:57:00 -04:00
Steve Robb
ddad01ad2f Back out changelist 2073005
[CL 2073795 by Steve Robb in Main branch]
2014-05-14 23:07:26 -04:00
Steve Robb
cd8b6a99d2 #ttp 333737: UHT should not output anything differently for Rocket - resubmitted after CL# 2068336 was backed out due to UAT rebuild problems.
#change Root module path added to include paths.
#change Plugins now write intermediates to the project folder.
#change All generated #includes are now relative.
#change Updated UHTDebugging.manifest to new format.
#remove Rocket-specific UHT execution removed.
#remove Some bHackHeaderGenerator usage removed.
#remove iOS header hack removed.

#codereview robert.manuszewski,ben.marsh

[CL 2073005 by Steve Robb in Main branch]
2014-05-14 14:50:21 -04:00
Marcus Wassmer
7542ef656b Invalidate Current SDK install if any failures occur
#codereview Dmitry.Rekman

[CL 2072953 by Marcus Wassmer in Main branch]
2014-05-14 10:33:21 -04:00
Robert Manuszewski
94db02aa98 UBT: Proper fix for exceptions when parsing ini files that start with an empty line
[CL 2072844 by Robert Manuszewski in Main branch]
2014-05-14 09:02:56 -04:00
Ben Marsh
6e81cb70e2 Fix exception in UBT when config file starts with a blank line.
#codereview Robert.Manuszewski

[CL 2072838 by Ben Marsh in Main branch]
2014-05-14 08:57:52 -04:00
Robert Manuszewski
d0488e7915 Better project INIs support in UBT. Added project INIs to UAT project properties.
[CL 2072760 by Robert Manuszewski in Main branch]
2014-05-14 06:42:35 -04:00
Daniel Lamb
ebd6c8303d Changes for packing OBB into APK file.
- Added functionality to GameActivity to query for the asset manager and the mode we are using for OBB data
- Added UI element to toggle OBB packing into APK in the project packaging config panel
- Added code to add a command line switch to turn on packing during building
- Changed build system so that it will write out a JavaBuildConfig file so we know at runtime where to find the data
- Change the build system to copy and rename the OBB so that it is in the APK's asset directory uncompressed
- Added IFileHandle implementation to handle reading from an Asset based OBB and changed the OBB locating code so deal with looking for the OBB in the APK
Submitted on behalf of Robert Jones.
#codereview Daniel.Lamb,Robert.Jones

[CL 2071675 by Daniel Lamb in Main branch]
2014-05-13 11:40:41 -04:00
Dmitry Rekman
f3f01545e8 Nuked dead code in UBT that caused Mono warnings.
Seems like these have been merged over from Pretest and never saw any use in Main.

#codereview Steve.Robb

[CL 2069355 by Dmitry Rekman in Main branch]
2014-05-10 17:44:47 -04:00
Steve Robb
0dac41b1df Removed some bHackHeaderGenerator usage.
#codereview robert.manuszewski

[CL 2068999 by Steve Robb in Main branch]
2014-05-09 22:20:08 -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
Steve Robb
2a0aca7a62 Back out changelist 2068336
[CL 2068514 by Steve Robb in Main branch]
2014-05-09 15:12:56 -04:00
Steve Robb
1478c2cdc7 #ttp 333737: UHT should not output anything differently for Rocket
#change Root module path added to include paths.
#change Plugins now write intermediates to the project folder.
#change All generated #includes are now relative.
#change Updated UHTDebugging.manifest to new format.
#remove Rocket-specific UHT execution removed.
#remove Some bHackHeaderGenerator usage removed.
#remove iOS header hack removed.

#codereview robert.manuszewski,ben.marsh

[CL 2068336 by Steve Robb in Main branch]
2014-05-09 13:02:49 -04:00