Commit Graph

42 Commits

Author SHA1 Message Date
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
Allan Bentham
25c10bf77d UEMOB-36
Add material shader quality settings.
Enables quality overrides for android and ios (ES2 flavours)

#codereview jack.porter

[CL 2705914 by Allan Bentham in Main branch]
2015-09-25 04:55:45 -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
Jaroslaw Palczynski
28fc7695a0 Missing chages for 2481343.
Some P4V problem with backing out large changelist missed some files.

#codereview Robert.Manuszewski

[CL 2481366 by Jaroslaw Palczynski in Main branch]
2015-03-17 06:17:32 -04:00
Jaroslaw Palczynski
fa31560e2d Enabled UHT to digest GENERATED_BODY instead of GENERATED_UCLASS_BODY, GENERATED_USTRUCT_BODY, GENERATED_UINTERFACE_BODY or GENERATED_IINTERFACE_BODY, changed every occurence to the new syntax and fixed every warning that have fallen out of this change.
#codereview Robert.Manuszewski

[CL 2481333 by Jaroslaw Palczynski in Main branch]
2015-03-17 05:19:11 -04:00
Marc Audy
42f614c946 Fix shadowed variables
[CL 2478499 by Marc Audy in Main branch]
2015-03-13 10:01:08 -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
35b9503326 - Fixed confusing Android SDK tooltips [UE-9155]
[CL 2432808 by Josh Adams in Main branch]
2015-02-04 20:25:59 -05:00
Ben Marsh
e789028809 [INTEGRATE] Change 2423627 by Robert.Jones@Pitbull-RJones on 2015/01/29 07:23:55
UE-8509 Android SDK Paths being saved even if the user doesn't set them
	- removed initial pull of data on start up

[CL 2425929 by Ben Marsh in Main branch]
2015-01-30 11:30:32 -05:00
Josh Adams
b66aa50cfb - Fixed default Android enums [UE-8306]
[CL 2421518 by Josh Adams in Main branch]
2015-01-27 20:33:14 -05: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
Ben Marsh
e62b9e2062 [INTEGRATE] Change 2418550 by Robert.Jones@Pitbull-RJones on 2015/01/26 08:53:09
Removing JAVA_HOME from Mac Editor builds

[CL 2419719 by Ben Marsh in Main branch]
2015-01-26 20:18:29 -05:00
Ben Marsh
24edb4f290 [INTEGRATE] Change 2418497 by Robert.Jones@Pitbull-RJones on 2015/01/26 06:46:00
UE-8075 - Devices not updating post-SDK path change
	Fixed code so that it correctly references the device detection class.
	Added a 'force update' path so that upon successful SDK path updates the devices are rechecked right away instead of waiting up to 10 seconds.
	Cleared out old devices if the SDK path is empty/doesn't contain the adb executable

	Change to UEBuildAndroid so that empty SDK paths are no longer treated as valid paths on start up allowing things like SDKPath=("") to be overridden by env vars.

[CL 2419718 by Ben Marsh in Main branch]
2015-01-26 20:18:16 -05:00
James Moran
c5b4ca076e HTML5 SDK settings are now set via the Editor.
Android SDK path backslash duplication fix.
Fix for User inis not saving array properties correctly.

#codereview Ankit.Khare, Josh.Adams

[CL 2418611 by James Moran in Main branch]
2015-01-26 10:22:57 -05:00
Robert Jones
653f45a33a Adding Java_Home support to ini files for Android building.
[CL 2415356 by Robert Jones in Main branch]
2015-01-22 11:14:12 -05:00
Josh Adams
02d7bd14b5 - No longer using curly brackets with {PROJECT_NAME} default, messes up in editor
- Fixed some tooltips
- Missed a file in changelist 2414384

#codereview peter.sauerbrei

[CL 2415309 by Josh Adams in Main branch]
2015-01-22 09:52:25 -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
Chris Babcock
3edc2a3401 Fixed Android SDKPath fallback to ANDROID_HOME environment variable
#ue4
#android
#codereview Rob.Jones,Josh.Adams

[CL 2412728 by Chris Babcock in Main branch]
2015-01-20 15:20:24 -05:00
Robert Jones
b5a273a278 SDK path editing in editor.
- Added class to hold values (AndroidSDKSettings)
- Added code to Android editor module to setup the values on load
- Changed device detection so that the thread is always started and the SDK path can be changed on the fly
- Changed Platform Target Management Module so that a single platform can be checked via UBT
- Settings can now be sourced from an ini file via temp direct reading code (auto seralisation is disabled until later changes are made)
-- Settings currently not exposed in editor

- Added Mac Environment var setting support

Unreleated
- Envars can now be passed down to process start points in tools

#codereview michael.trepka

[CL 2412194 by Robert Jones in Main branch]
2015-01-20 10:05:42 -05:00