Commit Graph

92 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
Dmitriy Dyomin
ed69c79ff7 Device output log window, currently implemented only for Android. Hidden under editor experimental settings
#jira UEMOB-39
#codereview Jack.Porter

[CL 2710794 by Dmitriy Dyomin in Main branch]
2015-09-30 03:39:09 -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
Jack Porter
0e9a00fc11 #if WITH_ENGINE fix for CL 2698623
[CL 2698678 by Jack Porter in Main branch]
2015-09-21 04:19:53 -04:00
Jack Porter
33a51c03a7 UEMOB-32 - Support cooking various combinations of Android texture formats simultaneously
[CL 2698623 by Jack Porter in Main branch]
2015-09-21 01:23:29 -04:00
Richard Hinckley
6ceaa5aba7 Cleaning out programmer-only comments that were harvested by Doxygen.
#platformnotify Josh.Adams

[CL 2690143 by Richard Hinckley in Main branch]
2015-09-14 09:25:39 -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
Niklas Smedberg
659d4ebedb Removed log spam
#codereview josh.adams

[CL 2619267 by Niklas Smedberg in Main branch]
2015-07-13 20:53:01 -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
Josh Adams
73dd6e7cd3 - Added the non-POT error texture to Android when using PVRTC [UE-8923]
[CL 2587930 by Josh Adams in Main branch]
2015-06-15 17:48:18 -04:00
Peter Sauerbrei
ae371ac807 fixed issue with not being able to tell if a content-based project needs to be built as code within the editor
UE-11636

[CL 2533916 by Peter Sauerbrei in Main branch]
2015-05-01 14:00:34 -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
Terence Burns
08ff5fa6d1 https://jira.ol.epicgames.net/browse/UEPLAT-514
Adding Texture LOD settings to Device Profiles
- this will improve how we currently edit and override lod settings on a per device type bases.
- LOD Settings can now be set in the Device Profile Editor
- Any device profiles with no values set for LOD Settings, will use the default objects.
- These can be found in BaseDeviceProfiles.ini in the /Script/Engine.TextureLODSettings section
- Appropriate defaults set for those groups not listed.

-Other fixes
- - Incorrect with_editor check in HTML5 target platform, changed to with_engine

[CL 2481510 by Terence Burns in Main branch]
2015-03-17 09:50:32 -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
Josh Adams
a98d6d5f5c - Changed Android ES31+AEP support from a TargetPlatform to a checkbox that works with any Android TP
- Moved HighQualityLightmap support check to IOSTargetPlatform so it can check project settings for Metal support
- Fixed some issues running on an x86_64 device
- Cleaned up some unused functions in TargetPlatform
#codereview niklas.smedberg

[CL 2478853 by Josh Adams in Main branch]
2015-03-13 14:05:13 -04:00
Marc Audy
42f614c946 Fix shadowed variables
[CL 2478499 by Marc Audy in Main branch]
2015-03-13 10:01:08 -04:00
Niklas Smedberg
e2adf38960 Better fix for UnrealFrontEnd compile error
[CL 2477617 by Niklas Smedberg in Main branch]
2015-03-12 17:46:25 -04:00
Peter Sauerbrei
05a7672be1 CIS fix for UFE
#codereview niklas.smedberg

[CL 2476888 by Peter Sauerbrei in Main branch]
2015-03-12 11:16:56 -04:00
Dmitry Rekman
e7d1e64ee3 Changed calls to FProcHandle.Close() to FPlatformProcess::CloseProc().
We already had FPlatformProcess::CreateProc/CloseProc pair (which is part of larger set with WaitForProc(), TerminateProc(), GetProcReturnCode(), etc). FProcHandle::Close() made the API more confusing (and actually introduced bugs, because it did not call CloseProc() until recently).

#codereview Josh.Adams, Robert.Manuszewski, Jaroslaw.Surowiec

[CL 2476322 by Dmitry Rekman in Main branch]
2015-03-12 00:06:15 -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