Commit Graph

58 Commits

Author SHA1 Message Date
Ankit Khare
7714a97161 #UE4 #HTML5 TTP: 333781 HTML5: Change Heap size per game project
Platform ini now contains a [BuildSettings] section with HeapSize values which can be overriden per config.

#codereview Peter.Sauerbrei

[CL 2087502 by Ankit Khare in Main branch]
2014-05-29 17:32:36 -04:00
Ryan Gerleve
410e10ae69 Update proguard-project.txt for AdMob on Android according to SDK recommendations
#github https://github.com/EpicGames/UnrealEngine/pull/183 Malfate
#codereview jj.hoesing

[CL 2085701 by Ryan Gerleve in Main branch]
2014-05-29 17:13:10 -04:00
Robert Manuszewski
fd39e788ca Shortening Cook sandbox path from Game\\Saved\\Sandboxes\\Cooked-Platform to Game\\Saved\\Cooked\\Platform
[CL 2082933 by Robert Manuszewski in Main branch]
2014-05-29 16:43:14 -04:00
Daniel Lamb
70c1dbdd00 Integrate 2082055 4.2 -> Main
Fix for google play projects which don't have google play enabled initializing google play..
#codereview Peter.Sauerbrei
#codereview JJ.Hoesing

//depot/UE4-Releases/4.2/Engine/...

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

[CL 2082297 by Daniel Lamb in Main branch]
2014-05-22 15:49:58 -04:00
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
Peter Sauerbrei
fa21b9915b Merging
//depot/UE4-TappyChicken/Engine/Build/...

to //depot/UE4/Engine/Build/...

[CL 2081896 by Peter Sauerbrei in Main branch]
2014-05-22 09:08:10 -04:00
Ryan Gerleve
b266e888c8 Implement QueryAchievements for Google Play on Android
This fixes TPP 336286, which involves some achievement issues in TappyChicken. Somewhat hacky, probably worth cleaning up in the future :)

#codereview daniel.lamb, jj.hoesing

[CL 2081230 by Ryan Gerleve in Main branch]
2014-05-21 18:18:08 -04:00
Robert Manuszewski
9a5669565a UAT: Reverting recent changes that skipped AutomationToolLauncher
#codereview gil.gribb

[CL 2075455 by Robert Manuszewski in Main branch]
2014-05-16 09:22:18 -04:00
Robert Manuszewski
bb7c2cca75 Runuat.bat more command line parsing fixes (double quotes)
[CL 2074853 by Robert Manuszewski in Main branch]
2014-05-15 18:09:08 -04:00
Robert Manuszewski
a1e50b5176 Fxing Runuat.bat for real
[CL 2074716 by Robert Manuszewski in Main branch]
2014-05-15 16:53:48 -04:00
Robert Manuszewski
8572140420 Runuat.bat: fixing errors when parsing some commandlines.
[CL 2074689 by Robert Manuszewski in Main branch]
2014-05-15 16:38:51 -04:00
Robert Manuszewski
721436a983 Runuat.bat: don't use AutomationToolLauncher when running automated tests
#codereview gil.gribb

[CL 2074155 by Robert Manuszewski in Main branch]
2014-05-15 10:12:25 -04:00
Mark Satterthwaite
040ae73079 #summary Respect Xcode's compiler options & analyze feature.
#change Parse the compiler selected in Xcode & find the Xcode plugin which contains the executable to run when it isn't the default.
#change When the analyze option is enabled (either standalone or as a build setting) we need to pass through the analyze clang flag.
#change Pass in the Xcode max. parallel build tasks default to UBT as an environment variable rather than just assuming we want to use half the CPUs.
#notes This means we can use an external compiler (even a GPL one like distcc) without any direct dependency. Editor builds still use the default compiler since it isn't clear how to know which compiler is intended to be used in that case - the Xcode environment variable won't have been set.
#codereview michael.trepka, jack.porter

[CL 2072854 by Mark Satterthwaite in Main branch]
2014-05-14 09:23:11 -04:00
Daniel Lamb
ee6e1e34f3 Changed warning message for android landscape device detection so it was more correct.
[CL 2071796 by Daniel Lamb in Main branch]
2014-05-13 13:21:24 -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
7b70307ded Linux: TPS building improvements by #UE4Linux folks.
- Patches to HACD, hlslcc,mcpp and nvtess (licenses updated where appropriate).
- Support for Linux target platform in a bunch of TPS modules.
- Automate update of dependencies to an extent.
- Misc. changes (accomodate perforce and git flows, minor code bug when dealing with TPS etc).

#codereview Mike.Fricker, Ben.Marsh

[CL 2069938 by Dmitry Rekman in Main branch]
2014-05-12 08:37:47 -04:00
Dmitry Rekman
1731325f19 Improvements to building TPS on Linux.
Part of PR140 by sbc100.
- Retouched to make more compliant with our coding style.
- Made to work out of the box with both git and perforce repos.
- Commented out TPS which we need to patch first.

[CL 2069830 by Dmitry Rekman in Main branch]
2014-05-12 08:37:34 -04:00
Wes Hunt
7c174050c0 Remove DistillEngine.xml as obsolete.
#codeview:bob.tellez
Do you know if all Distill stuff can be deleted? I searched UE4 and couldn't find any external references to that class.

[CL 2067183 by Wes Hunt in Main branch]
2014-05-08 13:46:57 -04:00
Dmitry Rekman
e3105eda19 Merging the bulk of Darkside changes.
- New target platforms (LinuxNoEditor for client+server, LinuxClient for client, Linux for editor, LinuxServer for dedicated server - mirroring other platforms).
- Preliminary support for gcc in the toolchain (and some safe fixes in code).
- No more lowercasing when accessing files on Linux, tread carefully.
- Changes needed for native compilation and other minor improvements.

#codereview Josh.Adams, Michael.Liebenow, Steve.Robbs

[CL 2067133 by Dmitry Rekman in Main branch]
2014-05-08 13:01:46 -04:00
Peter Sauerbrei
49e89d7df8 fix for stub file not including the signed executable and plist file
#ue4
#ios

[CL 2064848 by Peter Sauerbrei in Main branch]
2014-05-06 16:04:39 -04:00
Peter Sauerbrei
dde179a509 Fix to make the directory before copying the plist for iOS PC toolchain
#ue4
#ios

[CL 2064429 by Peter Sauerbrei in Main branch]
2014-05-06 09:47:22 -04:00
Peter Sauerbrei
f01290f58d Fix for relative path for plist file
#ue4
#ios

[CL 2063720 by Peter Sauerbrei in Main branch]
2014-05-05 14:56:44 -04:00
UnrealBot
03c7680754 Merged snapshot for CL 2059689
[CL 2061388 in Main branch]
2014-05-01 16:32:43 -04:00
UnrealBot
824e0d41b9 Code snapshot for CL 2059689
[CL 2061388 in Main branch]
2014-05-01 16:32:41 -04:00
Daniel Lamb
07404d86de Fixed up tappychicken on the shield starting in portrait.
#codereview Josh.Adams

[CL 2061093 by Daniel Lamb in Main branch]
2014-05-01 11:23:41 -04:00