Commit Graph

23 Commits

Author SHA1 Message Date
Ben Marsh
92ec2b8239 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
==========================
MAJOR FEATURES + CHANGES
==========================

Change 2718441 on 2015/10/06 by Ben.Marsh@Ben.Marsh_T3245_Stream

	Allow nodes to be added with an "explicit" frequency, meaning that they'll only be part of manually triggered builds (not CIS).

Change 2718698 on 2015/10/06 by Ben.Marsh@Ben.Marsh_T3245_Stream

	Add a type of node that can execute an arbitrary sequence of tasks, and allow constructing graphs of such nodes from an XML file.

Change 2723013 on 2015/10/09 by Ben.Marsh@Ben.Marsh_T3245_Stream

	Small utility to quickly capture a workspace, or delete files to restore the workspace to a previously captured state (and output a p4 sync list to restore it)

Change 2744521 on 2015/10/28 by Matthew.Griffin@Matthew.Griffin_G5772_BuildStream

	Adding config entries to determine which platforms/configurations are available

	Currently only written out as part of the Rocket Build process but could be done elsewhere for other types of installed build.

	A near identical singleton class is used in both C++ and C# to load the config section and check whether configuration/platform combinations are valid.

Change 2773723 on 2015/11/19 by Ben.Marsh@Ben.Marsh_T3245_Stream

	Copying UnrealGameSync into Engine/Source/Programs.

Change 2773914 on 2015/11/19 by Ben.Marsh@Ben.Marsh_T3245_Stream

	PR #1687: [GitDependencies] New feature: ignore file support (.gitdepsignore) (Contributed by nbjk667)

Change 2775317 on 2015/11/20 by Ben.Marsh@Ben.Marsh_T3245_Stream

	Add a -listtps option to UBT, which will find all the TPS files in any directory that's compiled into a target.

Change 2780832 on 2015/11/25 by Ben.Marsh@Ben.Marsh_T3245_Stream

	Allow compiling a single file in UBT. Pass -singlefile=<Path> on command line to UBT to use.

Change 2781071 on 2015/11/25 by Ben.Marsh@Ben.Marsh_T3245_Stream

	Precompile all valid engine modules for Rocket by default. Modules may set the PrecompileForTargets field to control which configurations they should be compiled for. Modules which currently fail to compile have this set to
PrecompileTargetsType.None.

	#codereview Matthew.Griffin

Change 2784469 on 2015/12/01 by Matthew.Griffin@Matthew.Griffin_G5772_BuildStream

	Added -FastPDB commandline parameter for UBT, so that we can make use of the /DEBUG:FASTLINK option in VS2015

Change 2784722 on 2015/12/01 by Matthew.Griffin@Matthew.Griffin_G5772_BuildStream

	Made -FastPDB option part of BuildConfiguration instead of checking commandline at each place it's used. Also added option to override if someone doesn't want it automatically added to their project files.

Change 2787501 on 2015/12/02 by Ben.Marsh@Ben.Marsh_T3245_Stream

	Restore change to gather VC environment directly from registry.

#lockdown Nick.Penwarden

[CL 2790002 by Ben Marsh in Main branch]
2015-12-04 09:32:58 -05:00
Chris Babcock
3e9f98d61c Merging using UE4-To-UE4-Releases-4.10
Generate proper proguard-project.txt file with optional additions from Build/Android/ProguardAdditions.txt
#jira UE-21653
#ue4
#android

[CL 2712042 by Chris Babcock in Main branch]
2015-09-30 18:10:41 -04:00
Chris Babcock
a939d907d6 Add launch image support for Android (disabled for GearVR)
#ue4
#android

[CL 2673367 by Chris Babcock in Main branch]
2015-08-28 19:34:42 -04:00
Chris Babcock
d2a2df1e36 Fixes for AdbMob multiple ad units
#ue4
#android
#codereview Robert.Jones

[CL 2642546 by Chris Babcock in Main branch]
2015-08-03 17:36:26 -04:00
Robert Jones
36cf4f99af UE-17404 - AdMob multiple ad units
- Changed code to support multiple ad units and the selecting thereof via blueprints including aditional nodes

#codereview chris.babcock
#jira ue-17404

[CL 2641722 by Robert Jones in Main branch]
2015-08-03 05:25:13 -04:00
Matt Kuhlenschmidt
5c18949db7 Fix typo
[CL 2590444 by Matt Kuhlenschmidt in Main branch]
2015-06-17 13:40:18 -04:00
Chris Babcock
b6df0fec88 Android x86_64 support - pr #914 (also adds support for ndk-r10e clang 3.6)
#ue-11650
#ue4
#android
#codereview Josh.Adams

[CL 2590354 by Chris Babcock in Main branch]
2015-06-17 12:56:56 -04:00
Robert Jones
bb7e6ddbe1 UEPLAT-7 - OBB Downloading code in Java
- Removed 'no OBB text' for AndroidTargetSettingsCustomisation banner
- Disabled UI hiding for now.
- Added functionality so select a background image for the download/verify step.

[CL 2524311 by Robert Jones in Main branch]
2015-04-24 10:31:00 -04:00
Josh Adams
e718dd6dab - Fixed up tooltips/comments for new ES31+AEP support
[CL 2505788 by Josh Adams in Main branch]
2015-04-08 16:23:03 -04:00
Josh Adams
6ce67dbb54 - Don't tie some Android editor project settings to having the Android support files
[CL 2475911 by Josh Adams in Main branch]
2015-03-11 18:43:09 -04:00
Josh Adams
2593ae3cf3 - Added some in-editor documentation/tips to clarify some of the project settings [UE-8127]
- Only allow ES31+AEP if the project settings allows it. Told user to restart editor if they change the ES31+AEP setting to fix the Launch On menu. (This is only until 4.8) [UE-6585]
- Noted that ES31 is only for Tegra K1, in the name [UE-6604]
- Hide JAVA_HOME settings on MacOS, as it would be confusing to try to find it

#codereview peter.sauerbrei,robert.jones

[CL 2420419 by Josh Adams in Main branch]
2015-01-27 10:57:03 -05:00
Josh Adams
9cf8c67c77 - Generate AndroidManifest.xml from ProjectSettings
- Moved some Android settings to ProjectSettings, re-enabled SDK settings
- Removed SigningConfig.xml, and moved those settings into project settings
- Added concept of NotForLicensees and NoRedist engine and project config settings
- Removed BaseInternalGame.ini, replaced with NotForLicensees/BaseGame.ini
- Moved User*.ini to end of .ini hierarchy
- Added support for CLASS_GlobalUserConfig, so their settings will be saved to <AppData>/.../User*.ini (useful for SDK paths, etc)
- Enabled AndroidPlatformEditor module on Mac
- Changed Mac Build.sh to allow for Android on the commandline (just pass through if it's not an Xcode platform name)
- Iterative Android packaging now looks at just the important .ini sections, NOT entire .ini files

#codereview jamie.dale,james.moran,michael.trepka,robert.jones,chris.babcock

[CL 2413870 by Josh Adams in Main branch]
2015-01-21 11:17:55 -05:00
Jaroslaw Palczynski
adecd4aaad UHT: Allows defining multiple UCLASSes in one header file.
[CL 2412156 by Jaroslaw Palczynski in Main branch]
2015-01-20 09:33:54 -05:00
Josh Adams
fd3d1c2a1a [Important BUNs in here]
- Enabled ES31 for GitHub/P4 users (currently only works on a Tegra K1 with recent system software)
- Always use separate APKs - this means that all APKs will have -armv7-es2 (or whatever) in their name. This may affect scripts, etc people have written
- Fixed a bug when using multiple java libraries (for users who add their own libs)
- Properly collapse Android devices into a single device with multiple variants. LaunchOn will now choose the best format based on the connected device. If you want to override the format, you will need to use the ProjectLauncher
- Added Android serial number to the device type, in case you have multiple devices of the same type (also fixes [UE-3770])
#codereview niklas.smedberg,chris.babcock

[CL 2385821 by Josh Adams in Main branch]
2014-12-11 13:44:41 -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
Jamie Dale
f440490671 Converted the property editor to use FText
The display name, filter string, and tooltips for the property editor (and associated detail customizations) are now stored as FText rather than FString. This allows us to remove SLATE_TEXT_ARGUMENT from the detail customization widgets.

[CL 2372595 by Jamie Dale in Main branch]
2014-12-01 11:19:41 -05:00
Terence Burns
3766264ae8 In-App Purchase changes.
Android fixes for workflow and threading issues.
Receipt is now returned as part of the IAP product information in blueprints
IAP workflow in blueprints now use an IAP request object as opposed to just a string.
Changes to the IOS workflow to accommodate receipts in product responses.
Android game activity has been updated to receive onActivityChanged messages. Needed for routing activity changes to android IAP.
A lot of threading fixes
Fixes for certain google events not calling the appropriate delegates.
Play store license key property added to runtime settings.

[CL 2364717 by Terence Burns in Main branch]
2014-11-19 05:18:19 -05:00
Peter Sauerbrei
2bb49fb11b Mac build fix
#mac

[CL 2351764 by Peter Sauerbrei in Main branch]
2014-11-06 15:24:06 -05:00
Wes Hunt
31e2bb00ac Removed a bunch of stuff from Slate standard include, created SlateBasics.h
* Moved Slate.h into SlateBasics.h and began shifting less commonly used headers into SlateExtras.h.
* Slate.h now simply includes SlateBasics.h and SlateExtras.h.
* Slate.h includes a deprecated warning now to indicate that SlateBasics.h + specific includes should be used instead.
* Moved dozens of inlined functions using Slate widgets into .cpp files to avoid header dependencies.
* All code samples now include SlateBasics.h and SlateExtras.h so future shifts will not break most those projects, but not trigger the deprecation warning of including Slate.h.
#BUN

[CL 2329610 by Wes Hunt in Main branch]
2014-10-14 22:50:06 -04:00
Chris Babcock
66f4e50964 Changed default Android depth buffer precision to 24 and added Android platform setting to choose preference.
#Android
#TTP 334728

[CL 2120147 by Chris Babcock in Main branch]
2014-06-27 17:59:00 -04:00
JJ Hoesing
8f73feb1a6 Added AdMob support for Android.
- In Edit/Project Settings/Android, set an AdMob Ad ID and then show and hide ads via blueprints.

[CL 2057848 by JJ Hoesing in Main branch]
2014-04-28 12:19:40 -04:00
Ryan Gerleve
122667ec99 #UE4
- Add Google Play support on Android
- Add editor settings for Google Play - enabled/disabled, and the app id for the games service
- Hack in Google Play leaderboards, including blueprint support, proper online subsystem implementation will come in the future
- These leaderboards work in TappyChicken

#codereview josh.adams, jj.hoesing, michael.noland

[CL 2050175 by Ryan Gerleve in Main branch]
2014-04-23 19:40:10 -04:00
Tim Sweeney
324683ce78 Engine source (Main branch up to CL 2026164) 2014-03-14 14:13:41 -04:00