Files
UnrealEngineUWP/Engine/Source/Developer/iOS/IOSPlatformEditor/Private/IOSTargetSettingsCustomization.cpp

1483 lines
54 KiB
C++
Raw Normal View History

// Copyright 1998-2016 Epic Games, Inc. All Rights Reserved.
#include "IOSPlatformEditorPrivatePCH.h"
#include "SWidgetSwitcher.h"
#include "IDetailPropertyRow.h"
#include "IOSTargetSettingsCustomization.h"
#include "DetailLayoutBuilder.h"
#include "DetailCategoryBuilder.h"
#include "PropertyEditing.h"
#include "DesktopPlatformModule.h"
#include "MainFrame.h"
#include "ScopedTransaction.h"
#include "SExternalImageReference.h"
#include "SHyperlinkLaunchURL.h"
#include "SPlatformSetupMessage.h"
#include "PlatformIconInfo.h"
#include "SourceControlHelpers.h"
#include "ManifestUpdateHelper.h"
#include "SNotificationList.h"
#include "NotificationManager.h"
#include "TargetPlatform.h"
#include "GameProjectGenerationModule.h"
#include "SHyperlink.h"
#include "SProvisionListRow.h"
#include "SCertificateListRow.h"
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
#include "EngineBuildSettings.h"
#define LOCTEXT_NAMESPACE "IOSTargetSettings"
Copying //UE4/Dev-Platform to //UE4/Dev-Main (Source: //UE4/Dev-Platform @ 3046626) #rb none #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2948322 on 2016/04/19 by Nick.Shin update libwebsockets to v1.7.4 part 4 of 4 - doing this in stages for tracking purposes #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2970016 on 2016/05/07 by Nick.Shin undo all of the following upgrades: - zlib - openssl - libcurl - libwebsockets and reset webrtc #jira UE-30298 - Fortnite and Orion crash on login Change 3020547 on 2016/06/20 by Jeff.Campeau Support for applocal deployment of binaries -applocaldir added to UAT to specify a per project directory to gather packages for applocal deployment Added ApplocalPrerequisitesDirectory property to packaging settings to set -applocaldir for packages built from the editor. Change 3020552 on 2016/06/20 by Jeff.Campeau Add switch to disable debug symbol cache creation Change 3020567 on 2016/06/20 by Jeff.Campeau constexpr enabled for Xbox One Change 3020568 on 2016/06/20 by Jeff.Campeau Separate setting for debug #jira UEPLAT-1348 Change 3020628 on 2016/06/20 by Jeff.Campeau Use global view instead of relying on current thread (fixes issues if pump message is called from a different thread). Change 3020629 on 2016/06/20 by Jeff.Campeau Use Slate tick to drive message processing during blocking loads (improves PLM). Change 3020633 on 2016/06/20 by Jeff.Campeau Fix Xbox One toolchain pathing to work for environment variables with and without trailing slashes. Pass requested XDK edition to VCVars batch file (fixes issues in building with a newer XDK installed SxS than the engine is configured for). Change 3020873 on 2016/06/21 by Lee.Clark PS4 - Fix missing audio when using A3D. Change 3021225 on 2016/06/21 by Keith.Judge Optimized away a bunch of GetVertexShader() calls in FSplineMeshVertexFactoryShaderParameters::SetMesh(). Saves about 0.9ms across a 100ms capture. Change 3021286 on 2016/06/21 by Dmitry.Rekman Linux: symbolication for memory profiler. - Also repaired/improved finding function name from debug info and overall callstack parsing. #tests Ran Linux editor and TestPAL, crashed multiple times Change 3021512 on 2016/06/21 by Mark.Satterthwaite Compile fixes for new clang version. Change 3021521 on 2016/06/21 by Mark.Satterthwaite Duplicate Fortnite CL #3013418: Don't release Metal buffers directly into the buffer pool, instead defer this until the command-buffer is known to have finished. This prevents the CPU from trying to modify the buffer while the GPU is still reading it if the GPU has fallen so far behind the CPU and therefore eliminates one possible cause of invalid access on the GPU. Change 3021528 on 2016/06/21 by Mark.Satterthwaite Make the Metal buffer pool cull after 30 frames - this will better match Apple's GART which unwires unused allocations after 1sec of idle, making them as expensive to use allocating a new buffer. Change 3021595 on 2016/06/21 by Mark.Satterthwaite Consolidate the way in which optional Metal features are exposed across macOS, iOS & tvOS devices & expose all the available features, unifying more of the code across all three platforms. - Implement Metal Depth-16 and stencil-texture-view support where available. - Use counting queries in Metal when available and expected (i.e. Metal_SM4+ or Metal_MRT+). - On latest iOS devices running Metal export support for GRHISupportsBaseVertexIndex & GRHISupportsFirstInstance when available. - On latest iOS devices running Metal export support for indirect buffer draw and dispatch calls. - Specify Metal layered rendering like any other and change the code so that there aren't preprocessor defines in the code. This lets the Metal MRT path assert if anyone ever tries to issue a layered draw call as its only supported on Mac. - Add support to Metal for setting UAVs from a uniform buffer. - Remove unused GlobalUniform header from MetalRHI. - Remove unnecessary FrameCount delay from Metal resource free lists. Change 3021702 on 2016/06/21 by Mark.Satterthwaite Fix mis-use of FreeListMutex instead of PoolMutex in MetalContext. Change 3022152 on 2016/06/21 by Nick.Shin Back out revision 5 from //UE4/Dev-Platform/Engine/Source/Runtime/NetworkFileSystem/Private/NetworkFileServerHttp.cpp forgot to un-do this when the giant revert (CL: #2970016) was done #jira UE-22166 HTML5 Cook on the fly will launch and then close browser Change 3022409 on 2016/06/21 by Dmitry.Rekman Fixed inability to run Setup.sh on Ubuntu 14.04 (UE-29289). - Contains PR #2258 (contributed by wshearn). Change 3022541 on 2016/06/22 by Lee.Clark PS4 - Make sure the render target masks are set correctly for disabled render targets. Fixes a validation check for shaders expecting to write to NULL render targets. Change 3022973 on 2016/06/22 by Michael.Trepka Fixed a problem in MacToolChain where both BuildConfiguration.bGeneratedSYMFile and BuildConfiguration.bUsePDBFiles set to false would not disable dSYM generation. Change 3023106 on 2016/06/22 by Dmitry.Rekman Linux: enable code to catch memory stomps during async loading. - Changed FLinuxPlatformMemory::BinnedAllocFrom/FreeToOS() to use mmap()/munmap(). Updated platform function signature accordingly. #tests Ran OrionServer on Linux (and OrionClient on Windows as a zero probe), tested also with running Linux editor with binned malloc. Change 3023256 on 2016/06/22 by Mark.Satterthwaite Fix compile errors from latest Metal changes that broke iOS. Change 3023268 on 2016/06/22 by Mark.Satterthwaite Use the Linux mmap/munmap/mprotect code to implement BinnedAllocFromOS/BinnedFreeToOS/PageProtect on Apple platforms as they are all equivalent. Change 3023651 on 2016/06/22 by Mark.Satterthwaite Make Metal SM5 the default for 10.11.5 or later, this time most of the features should be working on AMD & Nvidia, though tiled-reflections and distance-field AO/Shadows must still be forcibly disabled on Intel. Change 3023777 on 2016/06/22 by Brent.Pease + Update config for Android and iOS Change 3023781 on 2016/06/22 by Chris.Babcock Use mmap/munmap for Android BinnedAllocFromOS #ue4 #android Change 3023947 on 2016/06/22 by Mark.Satterthwaite Added a command-line switch for Mac "-RedirectNSLog" that will capture the output of NSLog using an NSPipe and write it into our log instead when not running under the debugger, thereby capturing output from underlying libraries that would otherwise be lost when outside a debugger. Change 3024434 on 2016/06/23 by Lee.Clark PS4 - Remove Delta Color Compression support Change 3024735 on 2016/06/23 by Mark.Satterthwaite Changes to MetalStatistics module initialisation. Change 3024741 on 2016/06/23 by Mark.Satterthwaite Change the way we test for Metal GPU support to avoid instantiating any MTLDevice's until MetalRHI is loaded so we can properly instantiate optional modules. Change 3025477 on 2016/06/23 by Brent.Pease + Added UnrealPluginLanguage.cs based on AndroidPluginLanguage.cs + Change UEDeployAndroid.cs to use UnrealPluginLanguage Change 3026085 on 2016/06/23 by Jeff.Campeau Separate Xbox One target settings for editor only values Move values that need to be loaded by the editor into the default inis (editor won't load target specific inis) Eliminate circular dependency on Xbox One settings (causing settings to either not load or memory corruption on shutdown) Clean up cached ini sections for UBT/UAT Change 3026093 on 2016/06/23 by Jeff.Campeau Cleanup unused files Change 3026745 on 2016/06/24 by Mark.Satterthwaite + Implemented rudimentary runtime debugging of MetalRHI with several different levels of complexity controlled by the new console-variable "rhi.Metal.RuntimeDebugLevel". + The MetalStateCache must also correctly set the render-pass descriptor when the previous render-target load action was 'Clear' as we will need to switch render targets or we'll mistakenly clear again. + Queries must not reset the MetalStateCache when they overflow the available buffer space, they simply break the encoder. - By default "rhi.Metal.RuntimeDebugLevel" is off & it is compiled out for Shipping - when enabled each higher level collects more data or changes the MetalRHI behaviour to make a command-buffer failure mode debuggable at the expense of performance. In order for this to work the number of command-buffers that may be allocated from the command-queue is also controllable via a console-variable "rhi.Metal.CommandQueueSize" which must be set prior to startup. Change 3026831 on 2016/06/24 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3026940 on 2016/06/24 by Brent.Pease PR #2458: added GetGameBundleId blueprint function (Contributed by derekvanvliet) Change 3027396 on 2016/06/24 by Brent.Pease Add BuildGraph.csproj to get Xamarin .sln builds working again Change 3029211 on 2016/06/27 by Michael.Trepka Added a setting (on by default) to make the game window preserve its content's aspect ratio while being resized by user Change 3029518 on 2016/06/27 by Josh.Adams Rollback //UE4/Dev-Platform/Engine/Build/BatchFiles/Mac/xcodeunlock.sh to revision 1 Change 3030385 on 2016/06/28 by Keith.Judge Fix XB1 deployment issues with AppXManifest for Paragon. Change 3030416 on 2016/06/28 by Lee.Clark PS4 - Fix Mediaplayer IsPlaying Change 3030922 on 2016/06/28 by Keith.Judge XB1 - Add pass through _RenderThread resource creation functions to D3D11.x RHI. Stops the render/RHI threads from stalling so much. Change 3030948 on 2016/06/28 by Jeff.Campeau Revert to using constant chunk indexes instead of polling the OS. (OS API has a bug that will not be fixed.) Change 3031016 on 2016/06/28 by Brent.Pease UEPLAT-1244 - Archive dSYM file UEPLAT-1359 - Support creating dSYM bundle Changes: + Added ios settings flag for dsym bundle + Added ios setting for creating xcode archive + xcode archive is now only put in the mac host or build machine's ~/Library/Developer/Xcode/Archives folder, it is not copied into the -archive folder like the ipa is Change 3031352 on 2016/06/28 by Bob.Tellez Added tps file for xcodeunlock Change 3031604 on 2016/06/28 by Mark.Satterthwaite Add an additional cast to flush-to-zero in the Metal shader translator bounds-checking code to avoid an internal GPU compiler error. Change 3031879 on 2016/06/28 by Brent.Pease + PhysX libraries for bitcode support on tvOS. Change 3032374 on 2016/06/29 by Keith.Judge Enable Oodle Handler Component on Xbox One Change 3032407 on 2016/06/29 by Keith.Judge Xbox One - Disable UpdateBufferStats when STATS is 0. Small perf gain. Change 3032432 on 2016/06/29 by Keith.Judge XB1 CPU Perf - Make CreateVertexDeclaration_RenderThread much faster by implementing a pass through to the RHI function rather than stalling the RHI thread. Change 3033474 on 2016/06/29 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3033603 on 2016/06/29 by Brent.Pease + Support UnrealPluginLanguage for IOS and TVOS builds + Allow ios/tvos UPL files an opportunity to modify a package's info.plist file Change 3034004 on 2016/06/30 by Lee.Clark PS4 - Use SDK 3.508.101 Change 3034007 on 2016/06/30 by Lee.Clark PS4 - VRTracker now uses SCE_VR_TRACKER_ROBUSTNESS_LEVEL_HIGH Change 3034173 on 2016/06/30 by Lee.Clark PS4 - Make sure depth target is null when eliminating fast clears. Fixes a GNM Validation failure Change 3034498 on 2016/06/30 by Jeff.Campeau Use MSBuild version 14 when generating project files. Change 3034943 on 2016/06/30 by Mark.Satterthwaite For Metal modify the MTLVertexDescriptor when calls to SetStreamSource provide different strides than the initial vertex-declaration which then requires compiling a different MTLRenderPipelineState. This silences errors reported by the Metal debug layer where the larger stride would see the shader read beyond the end of the buffer, but the smaller stride provided by SetStreamSource would work correctly. This may eliminate some more causes of Page-Fault GPU restarts. Change 3035416 on 2016/07/01 by Lee.Clark PS4 - Replace export vertex shader check with a CFLAG Change 3036093 on 2016/07/01 by Brent.Pease + Fix dSYM bundle path on Windows ios builds + Search for DeltaCopy directory if its not found from the user settings + Do not build an XCArchive file when building for ios on non-mac platforms Change 3036726 on 2016/07/02 by Brent.Pease + Add missing tvOS bitcode library Change 3037455 on 2016/07/05 by Lee.Clark PS4 - Default SmoothFrameRate to false Change 3037470 on 2016/07/05 by Keith.Judge Xbox One - Allow framerate smoothing, but default to off for consistency with PS4. Change 3038322 on 2016/07/05 by Jeremiah.Waldron Fix for asset packages with Unicode characters in their name not being loaded on Android. Fixing AndroidString's WIDECHAR* Strstr(WIDECHAR*, WIDECHAR*) function - Using an implementation of wcsstr, with a fix integrated for the incorrect implementation in Android ndk master branch, instead of converting the incoming WIDECHAR strings to ANSI strings just to be able to use strstr on them. The previous method was prone to causing the FString's Find and Contains functions to return false positives because when we convert wide to ansi, any character over the value of 255 is just set to '?' This in turn caused any package path strings with one of those characters in it to fail to load since they would be interpreted as having a question mark in their path, which is an invalid path character. #jira UE-18643 #android Change 3038693 on 2016/07/05 by Mark.Satterthwaite Change the way we store debug info for Metal shaders - the KeepDebugInfo flag now does precisely that, storing the shader code into the Metal header along with the path it was generated from. That means if KeepDebugInfo is enabled and Optimise is disabled then we can still access the shader code from within the Metal tools. On iOS/tvOS the shader code will be runtime compiled so that it shows up in the tooling but on Macs it will prefer to load the optimised version and simply unpack the shader code to the path from which it was compiled. This only works if we change the Metal shader compiler to emit temporary Metal files to the OS temporary directory so that the tools can read the file directly. Change 3039880 on 2016/07/06 by Mark.Satterthwaite Implement point-light shadow caching for RHI's that support specifying the render target layer from the vertex shader in lieu of geometry shaders. This requires changing FScreenVSForGS to TScreenVSForGS so that there can be a vertex-shader-layer variant (only compiled on RHI's that use it) whose output matches FCopyShadowMapsCubePS input. This alternative rendering path also requires adding the instance count to DrawRectangle so that we can render to all faces of the cubemap from a single draw call. Change 3040407 on 2016/07/06 by Michael.Trepka Added View->Enter Full Screen menu item for games on Mac Change 3040550 on 2016/07/06 by Mark.Satterthwaite Intel Metal compiler requires bool expressions be cast to 'int' rather than 'uint'. Change 3041098 on 2016/07/07 by Peter.Sauerbrei initial changes to get IOS builds from PC in launcher release of engine Change 3041310 on 2016/07/07 by Keith.Judge Xbox One - Optimize away GetDesc() and checks for D3D11_USAGE_DYNAMIC deep in the state cache as it's impossible for any buffer to have that flag set. Change 3041327 on 2016/07/07 by Keith.Judge Xbox One - Remove pointless memory barrier call in D3D11Query Change 3041352 on 2016/07/07 by Keith.Judge Xbox One - Add _RenderThread version of UpdateTexture2D() that just passes through to the RHI one. Saves a fairly significant chunk of time on the render/RHI thread when this is called a lot. Change 3041419 on 2016/07/07 by Jeff.Campeau Xbox One toolchain fix for VS2015 Update 3 Change 3041635 on 2016/07/07 by Jeff.Campeau Don't change game render resolution in response to WM_SIZE messages when in fullscreen (the game will restore the correct video mode when the window is restored). #jira OR-15578 Change 3041735 on 2016/07/07 by Peter.Sauerbrei re-enabled the build parameters for launcher release builds in IOS Change 3041783 on 2016/07/07 by Joe.Graf Changed bAutpApplyFailed to bAutoApplyFailed (typo) Change 3041784 on 2016/07/07 by Joe.Graf Fixed missing %s from a log message in UResavePackagesCommandlet Change 3042434 on 2016/07/08 by Lee.Clark PS4 - Fix compilation failure when Unsafe Command Buffers are enabled. Change 3042658 on 2016/07/08 by Lee.Clark PS4 - Use SDK 3.508.201 Change 3042970 on 2016/07/08 by Josh.Adams Redoing CL in 3040890 in Dev-Platform Change 3043243 on 2016/07/08 by Chris.Babcock clamped allowed slot range for gameplay debugger's categories copy of CL# 3040313 from //UE4/Dev-Framework #jira UE-32866 Change 3043500 on 2016/07/08 by Mark.Satterthwaite Downgrade "-Wdelete-non-virtual-dtor " to a warning again for Xcode 8 on iOS/tvOS to match macOS. Change 3044628 on 2016/07/11 by Mark.Satterthwaite Disable ShaderCache by default - it was implemented prior to RHI-thread/parallel-execution so it isn't thread-safe and can't be enabled by default on Mac now that Metal supports these features. #jira UE-32989 Change 3044948 on 2016/07/11 by Dmitry.Rekman Fix editor crash (happened on Linux, but not really specific to it) (UE-32973) - We can pass flags with shadows enabled when rendering asset thumbnails; thus disable shadows always when r.ShadowQuality is 0. (Redoing CL 3029574 by Bob). - Also fix mismatched 'noperspective' qualifier that caused NVidia drivers to refuse to link GL shaders. #jira UE-32973 Change 3045322 on 2016/07/11 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3046028 on 2016/07/12 by Lee.Clark PS4 - Check for correct SDK installation Allow use of 7th core when Morpheus is enabled Change 3046339 on 2016/07/12 by Peter.Sauerbrei fix for incorrect error message when iPhone Plus icon is the correct size [CL 3046645 by Josh Adams in Main branch]
2016-07-12 15:06:08 -04:00
DEFINE_LOG_CATEGORY_STATIC(LogIOSTargetSettings, Log, All);
bool SProvisionListRow::bInitialized = false;
FCheckBoxStyle SProvisionListRow::ProvisionCheckBoxStyle;
Copying //UE4/Dev-Platform to //UE4/Main (Source: //UE4/Dev-Platform @ 3008177) ========================== MAJOR FEATURES + CHANGES ========================== Change 2948322 on 2016/04/19 by Nick.Shin update libwebsockets to v1.7.4 part 4 of 4 - doing this in stages for tracking purposes #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2970016 on 2016/05/07 by Nick.Shin undo all of the following upgrades: - zlib - openssl - libcurl - libwebsockets and reset webrtc #jira UE-30298 - Fortnite and Orion crash on login #lockdown josh.adams Change 2970373 on 2016/05/09 by Lee.Clark PS4 - Fix NumInstances not getting reset after DrawIndirect calls Change 2972873 on 2016/05/10 by Michael.Trepka Correct initial position for SlateViewer windows on Mac Change 2974363 on 2016/05/11 by Mark.Satterthwaite Fix invoking buils using distcc from UFE - the command-line executed to access the number of parallel tasks was incorrect. Change 2975921 on 2016/05/12 by Michael.Trepka Removed unused AdjustWindowRegion declaration from LinuxWindow.h #codereview Dmitry.Rekman Change 2977002 on 2016/05/13 by Michael.Trepka Make sure dSYM generation action in UBT on Mac does not start before the source dylib is ready #codereview Ben.Marsh Change 2977337 on 2016/05/13 by Brent.Pease UE-27805 - Adding special characters into the BundleDisplayName or BundleName causes packaging error + Prevent illegal characters from being entered in the packaging UI + Report an error from iPhonePackager if a illegal bundle id is specified + Convert special characters to XML equivalents - Correctly check for the presence of iTunes 12 when packaging iOS games on Windows - Improve ios certificate and provision message in package settings UI #codereview peter.sauerbrei Change 2977509 on 2016/05/13 by Brent.Pease + Fix mac compile error Change 2978036 on 2016/05/14 by Mark.Satterthwaite One-line tweak that resolves incorrect rendering of the colour LUT because float imprecision allows -ve values to be passed into a call to pow which then generates NaN. #jira UE-30777 Change 2978037 on 2016/05/14 by Mark.Satterthwaite Fix a heap-use-after-free bug spotted by AddressSanitizer - you can't assume that the UObject system will be available in ShutdownModule() - on OS X it may have been killed a long time ago. Change 2978333 on 2016/05/16 by Lee.Clark Fix packaging of non-code projects when plugins are enabled #codereview Peter.Sauerbrei Change 2978780 on 2016/05/16 by Mark.Satterthwaite Reduce temporary allocations required to set uniform parameters in Metal. Change 2979680 on 2016/05/16 by Nick.Shin editor's HTML5 platform settings was missing due to the emscripten SDK move should have been included with CL: #2946251 Change 2979681 on 2016/05/16 by Nick.Shin cleaned up websocket processing for HTML5 #jira UE-13657 - HTML5 plugin OnRawRecieve overflow Change 2979701 on 2016/05/16 by Brent.Pease UE-28421 - Message box cannot be closed after accessing the home screen on iOS + Implement a timeout when waiting for a reply after sending background/foreground/suspend events from the main thread to the game thread. This solves the immediate problem presented in the jira bug report, however, there are deeper issues with the consequences of blocking the game thread that are not addressed. Perhaps structuring the game thread loop to know about modal dialogs so that it can receive these events even when a modal dialog is up could be a better longer term solution Change 2980766 on 2016/05/17 by Jeremiah.Waldron Adding Android build support for HarfBuzz - using a combination of android-cmake (from https://github.com/taka-no-me/android-cmake) to create the build files and Visual Studio 2015 to compile them - Adding Debug and RelWithDebInfo compiled binaries to harfbuzz-1.2.4/Android/<arch>/<config> Tested armv7 with TextShapingTest project on a GalaxyNote3 and text showed up correctly #jira UE-28586 #codereview chris.babcock Change 2980953 on 2016/05/17 by Jeremiah.Waldron Changing HarfBuzz build script and libs to use Release instead of RelWithDebInfo #jira UE-28586 Change 2981039 on 2016/05/17 by Jeff.Campeau ICMP support disabled for Xbox One and basic address processing wrappers provided (needed for Oodle support) Change 2981054 on 2016/05/17 by Jeff.Campeau Enable Live OSS for Orion on Xbox One Change 2981553 on 2016/05/18 by Jeff.Campeau Enable Oodle for Xbox One Change 2981555 on 2016/05/18 by Jeff.Campeau Scalability settings for Xbox One Change 2981774 on 2016/05/18 by Keith.Judge Xbox One - Duplicating Movie Player fix from 4.12. Change 2981789 on 2016/05/18 by Keith.Judge Xbox One - Duplicate fast semantics rendertarget unbind/clear/rebind fix from 4.12. Change 2981802 on 2016/05/18 by Keith.Judge Xbox One - Duplicate of distance field AO/Shadow fixes from 4.12. Change 2981875 on 2016/05/18 by Keith.Judge Xbox One - Dynamic VB/IB refactor. Duplicated from 4.12. Change 2981900 on 2016/05/18 by Keith.Judge Xbox One - D3D11Query refactor. Duplicated from 4.12 Change 2981945 on 2016/05/18 by Nick.Shin filled out response headers for HTML5 platform #jira UE-26047 - HTML5 HTTP Response Headers not implemented Change 2981981 on 2016/05/18 by Lee.Clark PS4 - Fix COTF not updating files #codereview Daniel.Lamb Change 2982246 on 2016/05/18 by Michael.Trepka Fixed Mono compile errors in UT build scripts Change 2983869 on 2016/05/19 by Mark.Satterthwaite Explicitly retain/release all the MTLTexture objects in FMetalSurface without the assumptions about them being the same object - the recent stencil & SRV related changes make those assumptions invalid and could lead to over-releasing some textures. #jira UE-29557 Change 2983871 on 2016/05/19 by Mark.Satterthwaite Pool Metal texture update buffers to reduce churn. Change 2983892 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2972885: Enable Metal resource lifetime delay on all platforms, not just iOS to try and address intermittent invalid resource errors. Change 2983898 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2982825: Correctly wait for the dispatch semaphore when clearing the Metal resource free lists. Change 2983911 on 2016/05/19 by Mark.Satterthwaite Change Metal SubmitCommandsHint to use an enum of flags rather than boolean variables to control behaviour so that its clearer to the reader what is going to happen. Change 2983916 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2974765: Workaround for UE-30069 - on Nvidia Macs we are breaking the GMux swap the second time we run the engine and it isn't clear why, so instead explicitly select the Metal device ourselves and don't allow the OS to swap the GPU driving the display. This will potentially reduce performance a little if the discrete GPU isn't already driving the display but until we know how we are clobbering the GMux/driver it is all we can do. This only applies to 10.11.5 with the default OS X drivers where there is more than one GPU in the system, earlier versions of OS X and the Nvidia WebDrivers are unaffected. Change 2984874 on 2016/05/20 by Keith.Judge Xbox One - Re-enable shader DXBC intermediate bytecode stripping, except for geometry and hull shaders where there's a possibility of runtime recompilation in certain combinations. Saves ~2MB in TM-ShaderModels, will save more in larger maps. #jira UEPLAT-1295 Change 2985446 on 2016/05/20 by Mark.Satterthwaite Remove the non-functional -metaldebug option from MetalRHI. Change 2985827 on 2016/05/20 by Nick.Shin call EndSession() onbeforeunload() note: API CHANGE - HTML5JavaScripteFx.{js,h} - UE_MakeHTTPDataRequest() #jira UE-22285 - Session End events are not generated for HTML5 Change 2986013 on 2016/05/20 by Jeremiah.Waldron PR #2387: In-App Purchases - parameters needed for Receipt Validation (Contributed by gameDNAstudio) Also touches IOS because of added RawPrice member in FInAppPurchaseProductInfo Pulled from Release-4.12 CL #jira UE-30782 #codereview chris.babcock, Peter.Sauerbrei Change 2986057 on 2016/05/20 by Mark.Satterthwaite Further changes to ensure that UE-30710 really is fixed while also not live-leaking memory in MetalRHI. Change 2986059 on 2016/05/20 by Mark.Satterthwaite Move the Metal uniform buffers into the same resource pool as all the other buffers and add stats for how many buffers are in the pool, how much memory is in use, free and wasted (due to aligned-buffer sizes). Change 2986060 on 2016/05/20 by Mark.Satterthwaite Disable tiled-reflections on Nvidia & Intel Metal until they sort out the sample command on cube-arrays ignoring the lod level. Change 2986063 on 2016/05/20 by Mark.Satterthwaite Missing change from previous CL. Change 2986066 on 2016/05/20 by Mark.Satterthwaite More Metal stats tracking the number & memory size of id<MTLBuffer>'s allocated/released each frame. Change 2986455 on 2016/05/23 by Keith.Judge Xbox One - Fix precompile promise in shader compiler to not stop subsequent defines from being parsed by D3DCompiler. Change 2986886 on 2016/05/23 by Mark.Satterthwaite Duplicate 4.12 CL #2986880: Fix UE-31124 due to bad array iteration logic - amazing that this hadn't been seen earlier. Change 2986955 on 2016/05/23 by Brent.Pease + Do not error out if "[PROJECT_NAME]" is in the bundle ID #codereview peter.sauerbrei Change 2987304 on 2016/05/23 by Chris.Babcock Remove old Android platforms #ue4 #android #codeview Josh.Adams Change 2987571 on 2016/05/23 by Mark.Satterthwaite Duplicate CL #2967998: Integrate - MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) #jira UE-31111 Change 2987591 on 2016/05/23 by Mark.Satterthwaite Remove usage of MTLRender/ComputeEncoder setSamplerState/s calls that take Min & Max Lod overrides - they currently don't work as expected on some GPU drivers and as we don't use them anywhere and I can't see that we will removing them costs us nothing and fixes tiled reflections on Nvidia with Metal SM5. Change 2987679 on 2016/05/23 by Mark.Satterthwaite Re-enable tiled reflections on Nvidia by default now that they work. Change 2987799 on 2016/05/24 by Mark.Satterthwaite Add a shader compile option "r.Shaders.ZeroInitialise" that we can turn on to force explicit zero-initialisation of local & temporary variables in hlslcc - so far only implemented for Metal. The default behaviour remains to omit zero-initialisation but the option is helpful to eliminate or track down uninitialised access in shaders that are causing real bugs (e.g. POM material relying on zero-initialised loop counters causing hangs/bad rendering on Mac). Change 2989395 on 2016/05/25 by Lee.Clark PS4 - Fix shader output / render target format mismatch for sparse MRT. Change 2990003 on 2016/05/25 by Jeremiah.Waldron When creating our own ConfigCacheIni in GetConfigCacheIni_APL, do not assume that the Engine ini was requested. Instead use the baseIniName passed to the function. Change 2990393 on 2016/05/25 by Mark.Satterthwaite Back out changelist 2961310 - causes more problems than it solves. DistanceField rendering will still work on Intel Metal SM5 and may work on AMD but will be broken on Nvidia due to a bad access within the compute shader - there's no bounds checking in Metal... Change 2990516 on 2016/05/25 by Brent.Pease + UEPLAT-1294 - Support for local notifications + UEPLAT-1254 - Add BP event for device orientation change + Added a new class based on UGameInstance for mobile device callbacks + Ensured IOSAppDelegate.cpp follows convention for lambda functions Change 2991361 on 2016/05/26 by Jeremiah.Waldron Move InAppPurchase class to StoreHelper.java so GooglePlay and Amazon store helpers can use it Change 2992450 on 2016/05/27 by Mark.Satterthwaite Optional r.Shaders.BoundsChecking flag to control whether shader platforms should manually enforce buffer access bounds - HLSL returns zero or ignores invalid reads & writes but Metal leaves the behaviour undefined and some drivers then fail. By default this is off and its whatever the native platform behaviour is, enabling it will cost some amount of performance as the shader translator inserts additional instructions to try and match D3D as accurately as possible. This is required to fix GPU restart errors on some Metal drivers when using SM5 rendering features including DistanceField shaders. Change 2993027 on 2016/05/27 by Mark.Satterthwaite Fix typo for new CFLAG_BoundsChecking enumeration value. Change 2993594 on 2016/05/27 by Mark.Satterthwaite Build fix - check not assert... Change 2993595 on 2016/05/27 by Mark.Satterthwaite Fix typo from Xcode hang... Change 2993614 on 2016/05/28 by Mark.Satterthwaite At least for now enable shader zero-initialisation and bounds-checking on Mac to ensure that Metal shaders are compiled with semantics that approximate those HLSL assumes. This may cost some performance but will avoid a few GPU restarts on some vendor drivers. Change 2993747 on 2016/05/28 by Mark.Satterthwaite Separate texture & buffer references in the Metal backend as they bind to separate arrays in the runtime to avoid giving the side-table buffer an innaccessible binding index. Also the side-table doesn't need to be emitted if no buffer SRV or UAV is used. Change 2994256 on 2016/05/31 by Lee.Clark PS4 - Fix unitialized Head Position from HMD tracker when tracking fails. Fixes a problem with A3D audio not working. #codereview Chad.Taylor,Aaron.McLeran Change 2994281 on 2016/05/31 by Rolando.Caloca DP - Allow hlslcc to process type casts containing the 'const' keyword - it isn't strictly complete as it will simply omit the type qualifier from the cast in the AST but it is sufficient for FortniteFoliage_MasterMaterial to compile. #codereview Mark.Satterthwaite, Dmitry.Rekman #jira UE-31411 Change 2994467 on 2016/05/31 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 2994493 on 2016/05/31 by Daniel.Lamb Fixed issue with DDC commandlet not caching things from the startup packages list. Change 2994644 on 2016/05/31 by Mark.Satterthwaite Updated hlslcc Mac binaries with fix for UE-31411 which RCO accepted and submitted + script for building parsers on POSIX OSes hooked up to an Xcode scheme in the project. Change 2996074 on 2016/06/01 by Lee.Clark PS4 - Fix GS mode not getting disabled when using parallel contexts. #codereview Marcus.Wassmer Change 2996129 on 2016/06/01 by Brent.Pease Manual merge of Pete's dsym generation fix (CL#2996089) from the 4.12 branch. Change 2996130 on 2016/06/01 by Jeremiah.Waldron PR #2387 part 2 (Contributed by gameDNAstudio) Adding ability to consume purchases during GooglePlay RestorePurchases This also touches IOS due to changes to base classes and function signatures #codereview chris.babcock, Peter.Sauerbrei Change 2996441 on 2016/06/01 by Jeremiah.Waldron Relates to PR #2387: Adding ability to consume purchases during GooglePlay RestorePurchases (Contributed by gameDNAstudio) Missing changes from part 2 reworked so that there is still only one RestorePurchases function which takes the product IDs and consumable flags. I reflected this in StoreHelper so no casting is necessary in GameActivity and the soon-to-be-added AmazonStoreHelper in the GameCircle plugin will still work dynamically with GameActivity since it will call StoreHelper functionality rather than a GooglePlayStoreHelper specific function. #codereview chris.babcock Change 2996514 on 2016/06/01 by Jeff.Campeau Fix merge issue from main #jira UE-31502 Change 2996740 on 2016/06/01 by Jonathan.Fitzpatrick https://jira.ol.epicgames.net/browse/UE-31446 Two PS4 source files fail during unity builds due to name conflict with handleReserveFailed. Renamed handleReserveFailed to handleReserveFailedLightweight Change 2997235 on 2016/06/01 by Jeremiah.Waldron RestorePurchases fix up in Match3 since the new Restore consumable stuff adds an additional pin to the Restore node. The IAP product in Match3 is non-consumable so just passing an empty array where necessary Change 2997241 on 2016/06/01 by Jeremiah.Waldron OnlineSubsystemGameCircle Plugin - Leaderboards - Achievements - Friends - IAP - External UI Interface - Runtime Settings in Project Settings Plugin section when plugin is enabled - Disabled by default #jira UEPLAT-105 #codereview chris.babcock Change 2997618 on 2016/06/02 by Lee.Clark #UE4Docs: Removed PS4MapFileUtil info Change 2997840 on 2016/06/02 by Jeremiah.Waldron Removing trace logging from OnlineSubsystemGameCircle_APL Change 2998754 on 2016/06/02 by Brent.Pease Change BlueprintMobileLibrary to BlueprintPlatformLibrary Change 3000762 on 2016/06/03 by Jeff.Campeau Add example rating info to ShooterGame Change 3001037 on 2016/06/04 by Brent.Pease + Add ui screens for delegate test, local notification test, and iap test + Implement delegate test Change 3001250 on 2016/06/05 by Brent.Pease + Initial pass at IAP test screen Change 3001639 on 2016/06/06 by Jeff.Campeau Fix Xbox One build issue with DX12 #codereview Zabir.Hoque Change 3002574 on 2016/06/06 by Jeremiah.Waldron Adding Android Install Location to Android platform runtime settings and manifest generation Change 3002780 on 2016/06/06 by Brent.Pease + Initial implementation of local notification test Change 3003005 on 2016/06/06 by Jeremiah.Waldron OnlineSubsystemGameCircle plugin - adding setting for Fire TV support. Using that specification in the APL to Add/Update android.hardware.touchscreen feature required attribute Change 3004392 on 2016/06/07 by Jeremiah.Waldron Fixing typo in APL comment :) Change 3005768 on 2016/06/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3005929 on 2016/06/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3006151 on 2016/06/08 by Peter.Sauerbrei fix for LocalNotifications not available on TVOS #lockdown josh.adams Change 3006183 on 2016/06/08 by Brent.Pease Manual merge CL#3000242 from Release-4.12 into Dev-Platform #lockdown josh.adams Change 3006296 on 2016/06/08 by Peter.Sauerbrei submit an updated iPhonePackager and support DLLs #lockdown josh.adams Change 3006378 on 2016/06/08 by Peter.Sauerbrei fix for API update to RestorePurchases #codereview brent.pease #lockdown josh.adams #lockdown nick.penwarden [CL 3008183 by Josh Adams in Main branch]
2016-06-09 17:45:44 -04:00
const FString gProjectNameText("[PROJECT_NAME]");
//////////////////////////////////////////////////////////////////////////
// FIOSTargetSettingsCustomization
namespace FIOSTargetSettingsCustomizationConstants
{
const FText DisabledTip = LOCTEXT("GitHubSourceRequiredToolTip", "This requires GitHub source.");
}
TSharedRef<IDetailCustomization> FIOSTargetSettingsCustomization::MakeInstance()
{
return MakeShareable(new FIOSTargetSettingsCustomization);
}
FIOSTargetSettingsCustomization::FIOSTargetSettingsCustomization()
: EngineInfoPath(FString::Printf(TEXT("%sBuild/IOS/UE4Game-Info.plist"), *FPaths::EngineDir()))
, GameInfoPath(FString::Printf(TEXT("%sBuild/IOS/Info.plist"), *FPaths::GameDir()))
, EngineGraphicsPath(FString::Printf(TEXT("%sBuild/IOS/Resources/Graphics"), *FPaths::EngineDir()))
, GameGraphicsPath(FString::Printf(TEXT("%sBuild/IOS/Resources/Graphics"), *FPaths::GameDir()))
{
new (IconNames) FPlatformIconInfo(TEXT("Icon29.png"), LOCTEXT("SettingsIcon_iPhone", "iPhone Settings Icon"), FText::GetEmpty(), 29, 29, FPlatformIconInfo::Optional);// also iOS6 spotlight search
new (IconNames) FPlatformIconInfo(TEXT("Icon29@2x.png"), LOCTEXT("SettingsIcon_iPhoneRetina", "iPhone Retina Settings Icon"), FText::GetEmpty(), 58, 58, FPlatformIconInfo::Optional); // also iOS6 spotlight search
new (IconNames) FPlatformIconInfo(TEXT("Icon40.png"), LOCTEXT("SpotlightIcon_iOS7", "iOS7 Spotlight Icon"), FText::GetEmpty(), 40, 40, FPlatformIconInfo::Optional);
new (IconNames) FPlatformIconInfo(TEXT("Icon40@2x.png"), LOCTEXT("SpotlightIcon_Retina_iOS7", "Retina iOS7 Spotlight Icon"), FText::GetEmpty(), 80, 80, FPlatformIconInfo::Optional);
new (IconNames) FPlatformIconInfo(TEXT("Icon50.png"), LOCTEXT("SpotlightIcon_iPad_iOS6", "iPad iOS6 Spotlight Icon"), FText::GetEmpty(), 50, 50, FPlatformIconInfo::Optional);
new (IconNames) FPlatformIconInfo(TEXT("Icon50@2x.png"), LOCTEXT("SpotlightIcon_iPadRetina_iOS6", "iPad Retina iOS6 Spotlight Icon"), FText::GetEmpty(), 100, 100, FPlatformIconInfo::Optional);
new (IconNames) FPlatformIconInfo(TEXT("Icon57.png"), LOCTEXT("AppIcon_iPhone_iOS6", "iPhone iOS6 App Icon"), FText::GetEmpty(), 57, 57, FPlatformIconInfo::Required);
new (IconNames) FPlatformIconInfo(TEXT("Icon57@2x.png"), LOCTEXT("AppIcon_iPhoneRetina_iOS6", "iPhone Retina iOS6 App Icon"), FText::GetEmpty(), 114, 114, FPlatformIconInfo::Required);
new (IconNames) FPlatformIconInfo(TEXT("Icon60@2x.png"), LOCTEXT("AppIcon_iPhoneRetina_iOS7", "iPhone Retina iOS7 App Icon"), FText::GetEmpty(), 120, 120, FPlatformIconInfo::Required);
Copying //UE4/Dev-Platform to //UE4/Dev-Main (Source: //UE4/Dev-Platform @ 3046626) #rb none #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2948322 on 2016/04/19 by Nick.Shin update libwebsockets to v1.7.4 part 4 of 4 - doing this in stages for tracking purposes #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2970016 on 2016/05/07 by Nick.Shin undo all of the following upgrades: - zlib - openssl - libcurl - libwebsockets and reset webrtc #jira UE-30298 - Fortnite and Orion crash on login Change 3020547 on 2016/06/20 by Jeff.Campeau Support for applocal deployment of binaries -applocaldir added to UAT to specify a per project directory to gather packages for applocal deployment Added ApplocalPrerequisitesDirectory property to packaging settings to set -applocaldir for packages built from the editor. Change 3020552 on 2016/06/20 by Jeff.Campeau Add switch to disable debug symbol cache creation Change 3020567 on 2016/06/20 by Jeff.Campeau constexpr enabled for Xbox One Change 3020568 on 2016/06/20 by Jeff.Campeau Separate setting for debug #jira UEPLAT-1348 Change 3020628 on 2016/06/20 by Jeff.Campeau Use global view instead of relying on current thread (fixes issues if pump message is called from a different thread). Change 3020629 on 2016/06/20 by Jeff.Campeau Use Slate tick to drive message processing during blocking loads (improves PLM). Change 3020633 on 2016/06/20 by Jeff.Campeau Fix Xbox One toolchain pathing to work for environment variables with and without trailing slashes. Pass requested XDK edition to VCVars batch file (fixes issues in building with a newer XDK installed SxS than the engine is configured for). Change 3020873 on 2016/06/21 by Lee.Clark PS4 - Fix missing audio when using A3D. Change 3021225 on 2016/06/21 by Keith.Judge Optimized away a bunch of GetVertexShader() calls in FSplineMeshVertexFactoryShaderParameters::SetMesh(). Saves about 0.9ms across a 100ms capture. Change 3021286 on 2016/06/21 by Dmitry.Rekman Linux: symbolication for memory profiler. - Also repaired/improved finding function name from debug info and overall callstack parsing. #tests Ran Linux editor and TestPAL, crashed multiple times Change 3021512 on 2016/06/21 by Mark.Satterthwaite Compile fixes for new clang version. Change 3021521 on 2016/06/21 by Mark.Satterthwaite Duplicate Fortnite CL #3013418: Don't release Metal buffers directly into the buffer pool, instead defer this until the command-buffer is known to have finished. This prevents the CPU from trying to modify the buffer while the GPU is still reading it if the GPU has fallen so far behind the CPU and therefore eliminates one possible cause of invalid access on the GPU. Change 3021528 on 2016/06/21 by Mark.Satterthwaite Make the Metal buffer pool cull after 30 frames - this will better match Apple's GART which unwires unused allocations after 1sec of idle, making them as expensive to use allocating a new buffer. Change 3021595 on 2016/06/21 by Mark.Satterthwaite Consolidate the way in which optional Metal features are exposed across macOS, iOS & tvOS devices & expose all the available features, unifying more of the code across all three platforms. - Implement Metal Depth-16 and stencil-texture-view support where available. - Use counting queries in Metal when available and expected (i.e. Metal_SM4+ or Metal_MRT+). - On latest iOS devices running Metal export support for GRHISupportsBaseVertexIndex & GRHISupportsFirstInstance when available. - On latest iOS devices running Metal export support for indirect buffer draw and dispatch calls. - Specify Metal layered rendering like any other and change the code so that there aren't preprocessor defines in the code. This lets the Metal MRT path assert if anyone ever tries to issue a layered draw call as its only supported on Mac. - Add support to Metal for setting UAVs from a uniform buffer. - Remove unused GlobalUniform header from MetalRHI. - Remove unnecessary FrameCount delay from Metal resource free lists. Change 3021702 on 2016/06/21 by Mark.Satterthwaite Fix mis-use of FreeListMutex instead of PoolMutex in MetalContext. Change 3022152 on 2016/06/21 by Nick.Shin Back out revision 5 from //UE4/Dev-Platform/Engine/Source/Runtime/NetworkFileSystem/Private/NetworkFileServerHttp.cpp forgot to un-do this when the giant revert (CL: #2970016) was done #jira UE-22166 HTML5 Cook on the fly will launch and then close browser Change 3022409 on 2016/06/21 by Dmitry.Rekman Fixed inability to run Setup.sh on Ubuntu 14.04 (UE-29289). - Contains PR #2258 (contributed by wshearn). Change 3022541 on 2016/06/22 by Lee.Clark PS4 - Make sure the render target masks are set correctly for disabled render targets. Fixes a validation check for shaders expecting to write to NULL render targets. Change 3022973 on 2016/06/22 by Michael.Trepka Fixed a problem in MacToolChain where both BuildConfiguration.bGeneratedSYMFile and BuildConfiguration.bUsePDBFiles set to false would not disable dSYM generation. Change 3023106 on 2016/06/22 by Dmitry.Rekman Linux: enable code to catch memory stomps during async loading. - Changed FLinuxPlatformMemory::BinnedAllocFrom/FreeToOS() to use mmap()/munmap(). Updated platform function signature accordingly. #tests Ran OrionServer on Linux (and OrionClient on Windows as a zero probe), tested also with running Linux editor with binned malloc. Change 3023256 on 2016/06/22 by Mark.Satterthwaite Fix compile errors from latest Metal changes that broke iOS. Change 3023268 on 2016/06/22 by Mark.Satterthwaite Use the Linux mmap/munmap/mprotect code to implement BinnedAllocFromOS/BinnedFreeToOS/PageProtect on Apple platforms as they are all equivalent. Change 3023651 on 2016/06/22 by Mark.Satterthwaite Make Metal SM5 the default for 10.11.5 or later, this time most of the features should be working on AMD & Nvidia, though tiled-reflections and distance-field AO/Shadows must still be forcibly disabled on Intel. Change 3023777 on 2016/06/22 by Brent.Pease + Update config for Android and iOS Change 3023781 on 2016/06/22 by Chris.Babcock Use mmap/munmap for Android BinnedAllocFromOS #ue4 #android Change 3023947 on 2016/06/22 by Mark.Satterthwaite Added a command-line switch for Mac "-RedirectNSLog" that will capture the output of NSLog using an NSPipe and write it into our log instead when not running under the debugger, thereby capturing output from underlying libraries that would otherwise be lost when outside a debugger. Change 3024434 on 2016/06/23 by Lee.Clark PS4 - Remove Delta Color Compression support Change 3024735 on 2016/06/23 by Mark.Satterthwaite Changes to MetalStatistics module initialisation. Change 3024741 on 2016/06/23 by Mark.Satterthwaite Change the way we test for Metal GPU support to avoid instantiating any MTLDevice's until MetalRHI is loaded so we can properly instantiate optional modules. Change 3025477 on 2016/06/23 by Brent.Pease + Added UnrealPluginLanguage.cs based on AndroidPluginLanguage.cs + Change UEDeployAndroid.cs to use UnrealPluginLanguage Change 3026085 on 2016/06/23 by Jeff.Campeau Separate Xbox One target settings for editor only values Move values that need to be loaded by the editor into the default inis (editor won't load target specific inis) Eliminate circular dependency on Xbox One settings (causing settings to either not load or memory corruption on shutdown) Clean up cached ini sections for UBT/UAT Change 3026093 on 2016/06/23 by Jeff.Campeau Cleanup unused files Change 3026745 on 2016/06/24 by Mark.Satterthwaite + Implemented rudimentary runtime debugging of MetalRHI with several different levels of complexity controlled by the new console-variable "rhi.Metal.RuntimeDebugLevel". + The MetalStateCache must also correctly set the render-pass descriptor when the previous render-target load action was 'Clear' as we will need to switch render targets or we'll mistakenly clear again. + Queries must not reset the MetalStateCache when they overflow the available buffer space, they simply break the encoder. - By default "rhi.Metal.RuntimeDebugLevel" is off & it is compiled out for Shipping - when enabled each higher level collects more data or changes the MetalRHI behaviour to make a command-buffer failure mode debuggable at the expense of performance. In order for this to work the number of command-buffers that may be allocated from the command-queue is also controllable via a console-variable "rhi.Metal.CommandQueueSize" which must be set prior to startup. Change 3026831 on 2016/06/24 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3026940 on 2016/06/24 by Brent.Pease PR #2458: added GetGameBundleId blueprint function (Contributed by derekvanvliet) Change 3027396 on 2016/06/24 by Brent.Pease Add BuildGraph.csproj to get Xamarin .sln builds working again Change 3029211 on 2016/06/27 by Michael.Trepka Added a setting (on by default) to make the game window preserve its content's aspect ratio while being resized by user Change 3029518 on 2016/06/27 by Josh.Adams Rollback //UE4/Dev-Platform/Engine/Build/BatchFiles/Mac/xcodeunlock.sh to revision 1 Change 3030385 on 2016/06/28 by Keith.Judge Fix XB1 deployment issues with AppXManifest for Paragon. Change 3030416 on 2016/06/28 by Lee.Clark PS4 - Fix Mediaplayer IsPlaying Change 3030922 on 2016/06/28 by Keith.Judge XB1 - Add pass through _RenderThread resource creation functions to D3D11.x RHI. Stops the render/RHI threads from stalling so much. Change 3030948 on 2016/06/28 by Jeff.Campeau Revert to using constant chunk indexes instead of polling the OS. (OS API has a bug that will not be fixed.) Change 3031016 on 2016/06/28 by Brent.Pease UEPLAT-1244 - Archive dSYM file UEPLAT-1359 - Support creating dSYM bundle Changes: + Added ios settings flag for dsym bundle + Added ios setting for creating xcode archive + xcode archive is now only put in the mac host or build machine's ~/Library/Developer/Xcode/Archives folder, it is not copied into the -archive folder like the ipa is Change 3031352 on 2016/06/28 by Bob.Tellez Added tps file for xcodeunlock Change 3031604 on 2016/06/28 by Mark.Satterthwaite Add an additional cast to flush-to-zero in the Metal shader translator bounds-checking code to avoid an internal GPU compiler error. Change 3031879 on 2016/06/28 by Brent.Pease + PhysX libraries for bitcode support on tvOS. Change 3032374 on 2016/06/29 by Keith.Judge Enable Oodle Handler Component on Xbox One Change 3032407 on 2016/06/29 by Keith.Judge Xbox One - Disable UpdateBufferStats when STATS is 0. Small perf gain. Change 3032432 on 2016/06/29 by Keith.Judge XB1 CPU Perf - Make CreateVertexDeclaration_RenderThread much faster by implementing a pass through to the RHI function rather than stalling the RHI thread. Change 3033474 on 2016/06/29 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3033603 on 2016/06/29 by Brent.Pease + Support UnrealPluginLanguage for IOS and TVOS builds + Allow ios/tvos UPL files an opportunity to modify a package's info.plist file Change 3034004 on 2016/06/30 by Lee.Clark PS4 - Use SDK 3.508.101 Change 3034007 on 2016/06/30 by Lee.Clark PS4 - VRTracker now uses SCE_VR_TRACKER_ROBUSTNESS_LEVEL_HIGH Change 3034173 on 2016/06/30 by Lee.Clark PS4 - Make sure depth target is null when eliminating fast clears. Fixes a GNM Validation failure Change 3034498 on 2016/06/30 by Jeff.Campeau Use MSBuild version 14 when generating project files. Change 3034943 on 2016/06/30 by Mark.Satterthwaite For Metal modify the MTLVertexDescriptor when calls to SetStreamSource provide different strides than the initial vertex-declaration which then requires compiling a different MTLRenderPipelineState. This silences errors reported by the Metal debug layer where the larger stride would see the shader read beyond the end of the buffer, but the smaller stride provided by SetStreamSource would work correctly. This may eliminate some more causes of Page-Fault GPU restarts. Change 3035416 on 2016/07/01 by Lee.Clark PS4 - Replace export vertex shader check with a CFLAG Change 3036093 on 2016/07/01 by Brent.Pease + Fix dSYM bundle path on Windows ios builds + Search for DeltaCopy directory if its not found from the user settings + Do not build an XCArchive file when building for ios on non-mac platforms Change 3036726 on 2016/07/02 by Brent.Pease + Add missing tvOS bitcode library Change 3037455 on 2016/07/05 by Lee.Clark PS4 - Default SmoothFrameRate to false Change 3037470 on 2016/07/05 by Keith.Judge Xbox One - Allow framerate smoothing, but default to off for consistency with PS4. Change 3038322 on 2016/07/05 by Jeremiah.Waldron Fix for asset packages with Unicode characters in their name not being loaded on Android. Fixing AndroidString's WIDECHAR* Strstr(WIDECHAR*, WIDECHAR*) function - Using an implementation of wcsstr, with a fix integrated for the incorrect implementation in Android ndk master branch, instead of converting the incoming WIDECHAR strings to ANSI strings just to be able to use strstr on them. The previous method was prone to causing the FString's Find and Contains functions to return false positives because when we convert wide to ansi, any character over the value of 255 is just set to '?' This in turn caused any package path strings with one of those characters in it to fail to load since they would be interpreted as having a question mark in their path, which is an invalid path character. #jira UE-18643 #android Change 3038693 on 2016/07/05 by Mark.Satterthwaite Change the way we store debug info for Metal shaders - the KeepDebugInfo flag now does precisely that, storing the shader code into the Metal header along with the path it was generated from. That means if KeepDebugInfo is enabled and Optimise is disabled then we can still access the shader code from within the Metal tools. On iOS/tvOS the shader code will be runtime compiled so that it shows up in the tooling but on Macs it will prefer to load the optimised version and simply unpack the shader code to the path from which it was compiled. This only works if we change the Metal shader compiler to emit temporary Metal files to the OS temporary directory so that the tools can read the file directly. Change 3039880 on 2016/07/06 by Mark.Satterthwaite Implement point-light shadow caching for RHI's that support specifying the render target layer from the vertex shader in lieu of geometry shaders. This requires changing FScreenVSForGS to TScreenVSForGS so that there can be a vertex-shader-layer variant (only compiled on RHI's that use it) whose output matches FCopyShadowMapsCubePS input. This alternative rendering path also requires adding the instance count to DrawRectangle so that we can render to all faces of the cubemap from a single draw call. Change 3040407 on 2016/07/06 by Michael.Trepka Added View->Enter Full Screen menu item for games on Mac Change 3040550 on 2016/07/06 by Mark.Satterthwaite Intel Metal compiler requires bool expressions be cast to 'int' rather than 'uint'. Change 3041098 on 2016/07/07 by Peter.Sauerbrei initial changes to get IOS builds from PC in launcher release of engine Change 3041310 on 2016/07/07 by Keith.Judge Xbox One - Optimize away GetDesc() and checks for D3D11_USAGE_DYNAMIC deep in the state cache as it's impossible for any buffer to have that flag set. Change 3041327 on 2016/07/07 by Keith.Judge Xbox One - Remove pointless memory barrier call in D3D11Query Change 3041352 on 2016/07/07 by Keith.Judge Xbox One - Add _RenderThread version of UpdateTexture2D() that just passes through to the RHI one. Saves a fairly significant chunk of time on the render/RHI thread when this is called a lot. Change 3041419 on 2016/07/07 by Jeff.Campeau Xbox One toolchain fix for VS2015 Update 3 Change 3041635 on 2016/07/07 by Jeff.Campeau Don't change game render resolution in response to WM_SIZE messages when in fullscreen (the game will restore the correct video mode when the window is restored). #jira OR-15578 Change 3041735 on 2016/07/07 by Peter.Sauerbrei re-enabled the build parameters for launcher release builds in IOS Change 3041783 on 2016/07/07 by Joe.Graf Changed bAutpApplyFailed to bAutoApplyFailed (typo) Change 3041784 on 2016/07/07 by Joe.Graf Fixed missing %s from a log message in UResavePackagesCommandlet Change 3042434 on 2016/07/08 by Lee.Clark PS4 - Fix compilation failure when Unsafe Command Buffers are enabled. Change 3042658 on 2016/07/08 by Lee.Clark PS4 - Use SDK 3.508.201 Change 3042970 on 2016/07/08 by Josh.Adams Redoing CL in 3040890 in Dev-Platform Change 3043243 on 2016/07/08 by Chris.Babcock clamped allowed slot range for gameplay debugger's categories copy of CL# 3040313 from //UE4/Dev-Framework #jira UE-32866 Change 3043500 on 2016/07/08 by Mark.Satterthwaite Downgrade "-Wdelete-non-virtual-dtor " to a warning again for Xcode 8 on iOS/tvOS to match macOS. Change 3044628 on 2016/07/11 by Mark.Satterthwaite Disable ShaderCache by default - it was implemented prior to RHI-thread/parallel-execution so it isn't thread-safe and can't be enabled by default on Mac now that Metal supports these features. #jira UE-32989 Change 3044948 on 2016/07/11 by Dmitry.Rekman Fix editor crash (happened on Linux, but not really specific to it) (UE-32973) - We can pass flags with shadows enabled when rendering asset thumbnails; thus disable shadows always when r.ShadowQuality is 0. (Redoing CL 3029574 by Bob). - Also fix mismatched 'noperspective' qualifier that caused NVidia drivers to refuse to link GL shaders. #jira UE-32973 Change 3045322 on 2016/07/11 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3046028 on 2016/07/12 by Lee.Clark PS4 - Check for correct SDK installation Allow use of 7th core when Morpheus is enabled Change 3046339 on 2016/07/12 by Peter.Sauerbrei fix for incorrect error message when iPhone Plus icon is the correct size [CL 3046645 by Josh Adams in Main branch]
2016-07-12 15:06:08 -04:00
new (IconNames)FPlatformIconInfo(TEXT("Icon60@3x.png"), LOCTEXT("AppIcon_iPhoneRetina_iOS8", "iPhone Plus Retina iOS8 App Icon"), FText::GetEmpty(), 180, 180, FPlatformIconInfo::Required);
Merging //UE4/Release-4.11 to //UE4/Main (Up to CL#2909747) #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2898120 on 2016/03/07 by Chris.Babcock Disable NvTimerQuery on Nexus 9 before Android 6.0 to fix slow frame updates #jira UE-28013 #ue4 #android Change 2898539 on 2016/03/08 by Matthew.Griffin Merging //UE4/Dev-Build to //UE4/Release-4.11 Change 2887414 on 2016/03/01 by Ben.Marsh Dump all the *.crash files produced while running commandlets, to make it easier to diagnose build system crashes cooking on Mac. Change 2898788 on 2016/03/08 by Keith.Judge Latest DX12.x integration from Microsoft. Brings XB1 up to PC level of functionality and improved perf. #jira UEPLAT-325 Change 2898836 on 2016/03/08 by Taizyd.Korambayil #jira UE-27990 Reimported River_Basin_02 Mesh with Adjacency Buffer Change 2898897 on 2016/03/08 by Sean.Gribbin #Jira UE-26550 Adding name to credits of Match 3 Change 2898938 on 2016/03/08 by Taizyd.Korambayil #jira UE-26284 Fixed Up Some Materials and BP errors Change 2898967 on 2016/03/08 by Benjamin.Hyder Updating Qa_Materials map #jira UE-24473 Change 2899032 on 2016/03/08 by Zachary.Wilson Fixing broken assets in QA-LightsStationary and eliminating log errors. Fixing mispelling and player start height in QA-LightsStationary. #jira UE-24473 Change 2899244 on 2016/03/08 by Peter.Sauerbrei addition of launch images for iPad Pro #jira UE-24793 Change 2899335 on 2016/03/08 by Richard.Hinckley #jira UE-27356 Fixing code for VR headsets so that the camera starts inside the vehicle if the user has an active HMD. Found that the C++ templates never had HMD support, so mirroring the BP templates for that functionality. Works in my testing, but a proper QA pass should be performed. Change 2899402 on 2016/03/08 by Michael.Schoell Macro instance nodes now have a hard dependency to any object class or structs their pins reference. Expanded UK2Node_MacroInstance::HasExternalDependencies to iterate over all pins and add their struct or object's class. #jira UE-27795 - Split Pins on a referenced Macro Library will crash the editor on restart Change 2899424 on 2016/03/08 by Dmitry.Rekman Fix CrossCompilerTool on Linux (UE-28056). #jira UE-28056 Change 2899445 on 2016/03/08 by Dmitry.Rekman Fix CrossCompilerTool invocation in debug scripts. #jira UE-28056 Change 2899488 on 2016/03/08 by Ryan.Vance #jira UE-28000 We can't test how many views are in the view family when initializing a view. There's no guaruntee that the family is setup yet. We'll need to move this test to the calling code. Change 2899546 on 2016/03/08 by Zachary.Wilson Updating QA-PostProcessing to match the 4.12 Main version of the map. #jira UE-24473 Change 2899553 on 2016/03/08 by Michael.Schoell Reinstancer will no longer queue BPs to be saved when compiling skeleton class dependencies and will no longer process all queued BPs to save when it is complete. #jira UE-27509 - Save on compile set to always causes a crash on compile #jira UE-27856 - "Always" Save on Compile does not save the Blueprint Change 2899558 on 2016/03/08 by Benjamin.Hyder building Lighting for QA-Materials #jira UE-24473 Change 2899597 on 2016/03/08 by Chris.Babcock Change reporting level of audio buffer decompression type logging #jira UE-28058 #ue4 #android Change 2899704 on 2016/03/08 by Benjamin.Hyder Updating Qa-Materials map #Jira UE-24473 Change 2899736 on 2016/03/08 by Benjamin.Hyder Updating TM-LPV map #Jira UE-24473 Change 2899810 on 2016/03/08 by Lauren.Ridge #jira UE-27995 UE-27987 Final UM3 UI Tweaks, + bug fix Change 2899876 on 2016/03/08 by Peter.Sauerbrei [CL 2913181 by Matthew Griffin in Main branch]
2016-03-17 11:10:14 -04:00
new (IconNames)FPlatformIconInfo(TEXT("Icon72.png"), LOCTEXT("AppIcon_iPad_iOS6", "iPad iOS6 App Icon"), FText::GetEmpty(), 72, 72, FPlatformIconInfo::Required);
new (IconNames) FPlatformIconInfo(TEXT("Icon72@2x.png"), LOCTEXT("AppIcon_iPadRetina_iOS6", "iPad Retina iOS6 App Icon"), FText::GetEmpty(), 144, 144, FPlatformIconInfo::Required);
new (IconNames) FPlatformIconInfo(TEXT("Icon76.png"), LOCTEXT("AppIcon_iPad_iOS7", "iPad iOS7 App Icon"), FText::GetEmpty(), 76, 76, FPlatformIconInfo::Required);
new (IconNames) FPlatformIconInfo(TEXT("Icon76@2x.png"), LOCTEXT("AppIcon_iPadRetina_iOS7", "iPad Retina iOS7 App Icon"), FText::GetEmpty(), 152, 152, FPlatformIconInfo::Required);
Merging //UE4/Release-4.11 to //UE4/Main (Up to CL#2909747) #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2898120 on 2016/03/07 by Chris.Babcock Disable NvTimerQuery on Nexus 9 before Android 6.0 to fix slow frame updates #jira UE-28013 #ue4 #android Change 2898539 on 2016/03/08 by Matthew.Griffin Merging //UE4/Dev-Build to //UE4/Release-4.11 Change 2887414 on 2016/03/01 by Ben.Marsh Dump all the *.crash files produced while running commandlets, to make it easier to diagnose build system crashes cooking on Mac. Change 2898788 on 2016/03/08 by Keith.Judge Latest DX12.x integration from Microsoft. Brings XB1 up to PC level of functionality and improved perf. #jira UEPLAT-325 Change 2898836 on 2016/03/08 by Taizyd.Korambayil #jira UE-27990 Reimported River_Basin_02 Mesh with Adjacency Buffer Change 2898897 on 2016/03/08 by Sean.Gribbin #Jira UE-26550 Adding name to credits of Match 3 Change 2898938 on 2016/03/08 by Taizyd.Korambayil #jira UE-26284 Fixed Up Some Materials and BP errors Change 2898967 on 2016/03/08 by Benjamin.Hyder Updating Qa_Materials map #jira UE-24473 Change 2899032 on 2016/03/08 by Zachary.Wilson Fixing broken assets in QA-LightsStationary and eliminating log errors. Fixing mispelling and player start height in QA-LightsStationary. #jira UE-24473 Change 2899244 on 2016/03/08 by Peter.Sauerbrei addition of launch images for iPad Pro #jira UE-24793 Change 2899335 on 2016/03/08 by Richard.Hinckley #jira UE-27356 Fixing code for VR headsets so that the camera starts inside the vehicle if the user has an active HMD. Found that the C++ templates never had HMD support, so mirroring the BP templates for that functionality. Works in my testing, but a proper QA pass should be performed. Change 2899402 on 2016/03/08 by Michael.Schoell Macro instance nodes now have a hard dependency to any object class or structs their pins reference. Expanded UK2Node_MacroInstance::HasExternalDependencies to iterate over all pins and add their struct or object's class. #jira UE-27795 - Split Pins on a referenced Macro Library will crash the editor on restart Change 2899424 on 2016/03/08 by Dmitry.Rekman Fix CrossCompilerTool on Linux (UE-28056). #jira UE-28056 Change 2899445 on 2016/03/08 by Dmitry.Rekman Fix CrossCompilerTool invocation in debug scripts. #jira UE-28056 Change 2899488 on 2016/03/08 by Ryan.Vance #jira UE-28000 We can't test how many views are in the view family when initializing a view. There's no guaruntee that the family is setup yet. We'll need to move this test to the calling code. Change 2899546 on 2016/03/08 by Zachary.Wilson Updating QA-PostProcessing to match the 4.12 Main version of the map. #jira UE-24473 Change 2899553 on 2016/03/08 by Michael.Schoell Reinstancer will no longer queue BPs to be saved when compiling skeleton class dependencies and will no longer process all queued BPs to save when it is complete. #jira UE-27509 - Save on compile set to always causes a crash on compile #jira UE-27856 - "Always" Save on Compile does not save the Blueprint Change 2899558 on 2016/03/08 by Benjamin.Hyder building Lighting for QA-Materials #jira UE-24473 Change 2899597 on 2016/03/08 by Chris.Babcock Change reporting level of audio buffer decompression type logging #jira UE-28058 #ue4 #android Change 2899704 on 2016/03/08 by Benjamin.Hyder Updating Qa-Materials map #Jira UE-24473 Change 2899736 on 2016/03/08 by Benjamin.Hyder Updating TM-LPV map #Jira UE-24473 Change 2899810 on 2016/03/08 by Lauren.Ridge #jira UE-27995 UE-27987 Final UM3 UI Tweaks, + bug fix Change 2899876 on 2016/03/08 by Peter.Sauerbrei [CL 2913181 by Matthew Griffin in Main branch]
2016-03-17 11:10:14 -04:00
new (IconNames)FPlatformIconInfo(TEXT("Icon83.5@2x.png"), LOCTEXT("AppIcon_iPadProRetina_iOS9", "iPad Pro Retina iOS9 App Icon"), FText::GetEmpty(), 167, 167, FPlatformIconInfo::Required);
new (LaunchImageNames) FPlatformIconInfo(TEXT("Default.png"), LOCTEXT("LaunchImage_iPhone", "Launch iPhone 4/4S"), FText::GetEmpty(), 320, 480, FPlatformIconInfo::Required);
new (LaunchImageNames) FPlatformIconInfo(TEXT("Default@2x.png"), LOCTEXT("LaunchImage_iPhoneRetina", "Launch iPhone 4/4S Retina"), FText::GetEmpty(), 640, 960, FPlatformIconInfo::Required);
new (LaunchImageNames) FPlatformIconInfo(TEXT("Default-568h@2x.png"), LOCTEXT("LaunchImage_iPhone5", "Launch iPhone 5/5S Retina"), FText::GetEmpty(), 640, 1136, FPlatformIconInfo::Required);
new (LaunchImageNames) FPlatformIconInfo(TEXT("Default-Landscape.png"), LOCTEXT("LaunchImage_iPad_Landscape", "Launch iPad in Landscape"), FText::GetEmpty(), 1024, 768, FPlatformIconInfo::Required);
new (LaunchImageNames) FPlatformIconInfo(TEXT("Default-Landscape@2x.png"), LOCTEXT("LaunchImage_iPadRetina_Landscape", "Launch iPad Retina in Landscape"), FText::GetEmpty(), 2048, 1536, FPlatformIconInfo::Required);
new (LaunchImageNames) FPlatformIconInfo(TEXT("Default-Portrait.png"), LOCTEXT("LaunchImage_iPad_Portrait", "Launch iPad in Portrait"), FText::GetEmpty(), 768, 1024, FPlatformIconInfo::Required);
new (LaunchImageNames) FPlatformIconInfo(TEXT("Default-Portrait@2x.png"), LOCTEXT("LaunchImage_iPadRetina_Portrait", "Launch iPad Retina in Portrait"), FText::GetEmpty(), 1536, 2048, FPlatformIconInfo::Required);
Merging //UE4/Release-4.11 to //UE4/Main (Up to CL#2909747) #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2898120 on 2016/03/07 by Chris.Babcock Disable NvTimerQuery on Nexus 9 before Android 6.0 to fix slow frame updates #jira UE-28013 #ue4 #android Change 2898539 on 2016/03/08 by Matthew.Griffin Merging //UE4/Dev-Build to //UE4/Release-4.11 Change 2887414 on 2016/03/01 by Ben.Marsh Dump all the *.crash files produced while running commandlets, to make it easier to diagnose build system crashes cooking on Mac. Change 2898788 on 2016/03/08 by Keith.Judge Latest DX12.x integration from Microsoft. Brings XB1 up to PC level of functionality and improved perf. #jira UEPLAT-325 Change 2898836 on 2016/03/08 by Taizyd.Korambayil #jira UE-27990 Reimported River_Basin_02 Mesh with Adjacency Buffer Change 2898897 on 2016/03/08 by Sean.Gribbin #Jira UE-26550 Adding name to credits of Match 3 Change 2898938 on 2016/03/08 by Taizyd.Korambayil #jira UE-26284 Fixed Up Some Materials and BP errors Change 2898967 on 2016/03/08 by Benjamin.Hyder Updating Qa_Materials map #jira UE-24473 Change 2899032 on 2016/03/08 by Zachary.Wilson Fixing broken assets in QA-LightsStationary and eliminating log errors. Fixing mispelling and player start height in QA-LightsStationary. #jira UE-24473 Change 2899244 on 2016/03/08 by Peter.Sauerbrei addition of launch images for iPad Pro #jira UE-24793 Change 2899335 on 2016/03/08 by Richard.Hinckley #jira UE-27356 Fixing code for VR headsets so that the camera starts inside the vehicle if the user has an active HMD. Found that the C++ templates never had HMD support, so mirroring the BP templates for that functionality. Works in my testing, but a proper QA pass should be performed. Change 2899402 on 2016/03/08 by Michael.Schoell Macro instance nodes now have a hard dependency to any object class or structs their pins reference. Expanded UK2Node_MacroInstance::HasExternalDependencies to iterate over all pins and add their struct or object's class. #jira UE-27795 - Split Pins on a referenced Macro Library will crash the editor on restart Change 2899424 on 2016/03/08 by Dmitry.Rekman Fix CrossCompilerTool on Linux (UE-28056). #jira UE-28056 Change 2899445 on 2016/03/08 by Dmitry.Rekman Fix CrossCompilerTool invocation in debug scripts. #jira UE-28056 Change 2899488 on 2016/03/08 by Ryan.Vance #jira UE-28000 We can't test how many views are in the view family when initializing a view. There's no guaruntee that the family is setup yet. We'll need to move this test to the calling code. Change 2899546 on 2016/03/08 by Zachary.Wilson Updating QA-PostProcessing to match the 4.12 Main version of the map. #jira UE-24473 Change 2899553 on 2016/03/08 by Michael.Schoell Reinstancer will no longer queue BPs to be saved when compiling skeleton class dependencies and will no longer process all queued BPs to save when it is complete. #jira UE-27509 - Save on compile set to always causes a crash on compile #jira UE-27856 - "Always" Save on Compile does not save the Blueprint Change 2899558 on 2016/03/08 by Benjamin.Hyder building Lighting for QA-Materials #jira UE-24473 Change 2899597 on 2016/03/08 by Chris.Babcock Change reporting level of audio buffer decompression type logging #jira UE-28058 #ue4 #android Change 2899704 on 2016/03/08 by Benjamin.Hyder Updating Qa-Materials map #Jira UE-24473 Change 2899736 on 2016/03/08 by Benjamin.Hyder Updating TM-LPV map #Jira UE-24473 Change 2899810 on 2016/03/08 by Lauren.Ridge #jira UE-27995 UE-27987 Final UM3 UI Tweaks, + bug fix Change 2899876 on 2016/03/08 by Peter.Sauerbrei [CL 2913181 by Matthew Griffin in Main branch]
2016-03-17 11:10:14 -04:00
new (LaunchImageNames) FPlatformIconInfo(TEXT("Default-IPhone6.png"), LOCTEXT("LaunchImage_iPhone6", "Launch iPhone 6 in Portrait"), FText::GetEmpty(), 750, 1334, FPlatformIconInfo::Required);
new (LaunchImageNames)FPlatformIconInfo(TEXT("Default-IPhone6-Landscape.png"), LOCTEXT("LaunchImage_iPhone6_Landscape", "Launch iPhone 6 in Landscape"), FText::GetEmpty(), 1334, 750, FPlatformIconInfo::Required);
new (LaunchImageNames)FPlatformIconInfo(TEXT("Default-IPhone6Plus-Landscape.png"), LOCTEXT("LaunchImage_iPhone6Plus_Landscape", "Launch iPhone 6 Plus in Landscape"), FText::GetEmpty(), 2208, 1242, FPlatformIconInfo::Required);
new (LaunchImageNames) FPlatformIconInfo(TEXT("Default-IPhone6Plus-Portrait.png"), LOCTEXT("LaunchImage_iPhone6Plus_Portrait", "Launch iPhone 6 Plus in Portrait"), FText::GetEmpty(), 1242, 2208, FPlatformIconInfo::Required);
Merging //UE4/Release-4.11 to //UE4/Main (Up to CL#2909747) #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2898120 on 2016/03/07 by Chris.Babcock Disable NvTimerQuery on Nexus 9 before Android 6.0 to fix slow frame updates #jira UE-28013 #ue4 #android Change 2898539 on 2016/03/08 by Matthew.Griffin Merging //UE4/Dev-Build to //UE4/Release-4.11 Change 2887414 on 2016/03/01 by Ben.Marsh Dump all the *.crash files produced while running commandlets, to make it easier to diagnose build system crashes cooking on Mac. Change 2898788 on 2016/03/08 by Keith.Judge Latest DX12.x integration from Microsoft. Brings XB1 up to PC level of functionality and improved perf. #jira UEPLAT-325 Change 2898836 on 2016/03/08 by Taizyd.Korambayil #jira UE-27990 Reimported River_Basin_02 Mesh with Adjacency Buffer Change 2898897 on 2016/03/08 by Sean.Gribbin #Jira UE-26550 Adding name to credits of Match 3 Change 2898938 on 2016/03/08 by Taizyd.Korambayil #jira UE-26284 Fixed Up Some Materials and BP errors Change 2898967 on 2016/03/08 by Benjamin.Hyder Updating Qa_Materials map #jira UE-24473 Change 2899032 on 2016/03/08 by Zachary.Wilson Fixing broken assets in QA-LightsStationary and eliminating log errors. Fixing mispelling and player start height in QA-LightsStationary. #jira UE-24473 Change 2899244 on 2016/03/08 by Peter.Sauerbrei addition of launch images for iPad Pro #jira UE-24793 Change 2899335 on 2016/03/08 by Richard.Hinckley #jira UE-27356 Fixing code for VR headsets so that the camera starts inside the vehicle if the user has an active HMD. Found that the C++ templates never had HMD support, so mirroring the BP templates for that functionality. Works in my testing, but a proper QA pass should be performed. Change 2899402 on 2016/03/08 by Michael.Schoell Macro instance nodes now have a hard dependency to any object class or structs their pins reference. Expanded UK2Node_MacroInstance::HasExternalDependencies to iterate over all pins and add their struct or object's class. #jira UE-27795 - Split Pins on a referenced Macro Library will crash the editor on restart Change 2899424 on 2016/03/08 by Dmitry.Rekman Fix CrossCompilerTool on Linux (UE-28056). #jira UE-28056 Change 2899445 on 2016/03/08 by Dmitry.Rekman Fix CrossCompilerTool invocation in debug scripts. #jira UE-28056 Change 2899488 on 2016/03/08 by Ryan.Vance #jira UE-28000 We can't test how many views are in the view family when initializing a view. There's no guaruntee that the family is setup yet. We'll need to move this test to the calling code. Change 2899546 on 2016/03/08 by Zachary.Wilson Updating QA-PostProcessing to match the 4.12 Main version of the map. #jira UE-24473 Change 2899553 on 2016/03/08 by Michael.Schoell Reinstancer will no longer queue BPs to be saved when compiling skeleton class dependencies and will no longer process all queued BPs to save when it is complete. #jira UE-27509 - Save on compile set to always causes a crash on compile #jira UE-27856 - "Always" Save on Compile does not save the Blueprint Change 2899558 on 2016/03/08 by Benjamin.Hyder building Lighting for QA-Materials #jira UE-24473 Change 2899597 on 2016/03/08 by Chris.Babcock Change reporting level of audio buffer decompression type logging #jira UE-28058 #ue4 #android Change 2899704 on 2016/03/08 by Benjamin.Hyder Updating Qa-Materials map #Jira UE-24473 Change 2899736 on 2016/03/08 by Benjamin.Hyder Updating TM-LPV map #Jira UE-24473 Change 2899810 on 2016/03/08 by Lauren.Ridge #jira UE-27995 UE-27987 Final UM3 UI Tweaks, + bug fix Change 2899876 on 2016/03/08 by Peter.Sauerbrei [CL 2913181 by Matthew Griffin in Main branch]
2016-03-17 11:10:14 -04:00
new (LaunchImageNames) FPlatformIconInfo(TEXT("Default-Landscape-1336.png"), LOCTEXT("LaunchImage_iPadPro_Landscape", "Launch iPad Pro in Landscape"), FText::GetEmpty(), 1336, 1024, FPlatformIconInfo::Required);
new (LaunchImageNames)FPlatformIconInfo(TEXT("Default-Portrait-1336.png"), LOCTEXT("LaunchImage_iPadPro_Portrait", "Launch iPad Pro in Portrait"), FText::GetEmpty(), 1024, 1336, FPlatformIconInfo::Required);
new (LaunchImageNames)FPlatformIconInfo(TEXT("Default-Landscape-1336@2x.png"), LOCTEXT("LaunchImage_iPadProRetina_Landscape", "Launch iPad Pro Retina in Landscape"), FText::GetEmpty(), 2732, 2048, FPlatformIconInfo::Required);
new (LaunchImageNames)FPlatformIconInfo(TEXT("Default-Portrait-1336@2x.png"), LOCTEXT("LaunchImage_iPadProRetina_Portrait", "Launch iPad Pro Retina in Portrait"), FText::GetEmpty(), 2048, 2732, FPlatformIconInfo::Required);
bShowAllProvisions = false;
bShowAllCertificates = false;
ProvisionList = MakeShareable(new TArray<ProvisionPtr>());
CertificateList = MakeShareable(new TArray<CertificatePtr>());
}
FIOSTargetSettingsCustomization::~FIOSTargetSettingsCustomization()
{
if (IPPProcess.IsValid())
{
IPPProcess = NULL;
FTicker::GetCoreTicker().RemoveTicker(TickerHandle);
}
}
void FIOSTargetSettingsCustomization::CustomizeDetails(IDetailLayoutBuilder& DetailLayout)
{
SavedLayoutBuilder = &DetailLayout;
BuildPListSection(DetailLayout);
BuildIconSection(DetailLayout);
BuildRemoteBuildingSection(DetailLayout);
FindRequiredFiles();
}
static FString OutputMessage;
static void OnOutput(FString Message)
{
OutputMessage += Message;
OutputMessage += "\n";
UE_LOG(LogTemp, Display, TEXT("%s\n"), *Message);
}
void FIOSTargetSettingsCustomization::UpdateStatus()
{
if (OutputMessage.Len() > 0)
{
CertificateList->Reset();
ProvisionList->Reset();
// Now split up the log into multiple lines
TArray<FString> LogLines;
OutputMessage.ParseIntoArray(LogLines, LINE_TERMINATOR, true);
// format of the line being read here!!
bool bCerts = false;
bManuallySelected = false;
for (int Index = 0; Index < LogLines.Num(); Index++)
{
FString& Line = LogLines[Index];
TArray<FString> Fields;
Line.ParseIntoArray(Fields, TEXT(","), true);
if (Line.Contains(TEXT("CERTIFICATE-"), ESearchCase::CaseSensitive))
{
CertificatePtr Cert = MakeShareable<FCertificate>(new FCertificate());
for (int FieldIndex = 0; FieldIndex < Fields.Num(); ++FieldIndex)
{
FString Key, Value;
Fields[FieldIndex].Split(TEXT(":"), &Key, &Value);
if (Key.Contains("Name"))
{
Cert->Name = Value;
}
else if (Key.Contains(TEXT("Validity")))
{
Cert->Status = Value;
}
else if (Key.Contains(TEXT("EndDate")))
{
FString Date, Time;
Value.Split(TEXT("T"), &Date, &Time);
Cert->Expires = Date;
}
}
CertificatePtr PrevCert = NULL;
for (int CIndex = 0; CIndex < CertificateList->Num() && !PrevCert.IsValid(); ++CIndex)
{
if ((*CertificateList)[CIndex]->Name == Cert->Name)
{
PrevCert = (*CertificateList)[CIndex];
break;
}
}
// check to see if this the one selected in the ini file
FString OutString;
SignCertificateProperty->GetValueAsFormattedString(OutString);
Cert->bManuallySelected = (OutString == Cert->Name);
bManuallySelected |= Cert->bManuallySelected;
if (!PrevCert.IsValid())
{
CertificateList->Add(Cert);
}
else
{
FDateTime time1, time2;
FDateTime::ParseIso8601(*(PrevCert->Expires), time1);
FDateTime::ParseIso8601(*(Cert->Expires), time2);
if (time2 > time1)
{
PrevCert->Expires = Cert->Expires;
Merging //UE4/Release-4.11 to //UE4/Main (Up to CL#2897738) ========================== MAJOR FEATURES + CHANGES ========================== Change 2875445 on 2016/02/22 by Matthew.Griffin Added UE4.natvis to Visual Studio Projects #jira UE-27153 Change 2875456 on 2016/02/22 by Keith.Judge Fix custom stencil shaders on Xbox One #jira UES-1387 Change 2875524 on 2016/02/22 by Robert.Manuszewski More log info when saving shader temp files fails. Increased the number of attemps when moving a file fails. #jira UE-20945 Change 2875698 on 2016/02/22 by Rolando.Caloca UE4.11 - Add new bool for RHIs (unused currently) #jira UE-24967 Change 2875897 on 2016/02/22 by Taizyd.Korambayil #jira UE-20324 Re-imported Cloth Skeletal Meshes to Fix odd Circle Highlights Change 2875922 on 2016/02/22 by Mieszko.Zielinski Fixed BP-implemented EQS generators crashing when trying to add generated value of wrong type #UE4 #jira UE-25034 #rb Lukasz.Furman Change 2875960 on 2016/02/22 by Michael.Trepka Added a way to disable right click emulation on Mac and used it in TabNavigator to fix issues with its widgets not reacting to clicking #jira UE-21895 Change 2875984 on 2016/02/22 by Michael.Schoell Split output struct pins will no longer give a warning about override pins being removed. #jira UE-27150 - Format Text nodes and split nodes reporting warning that override pins are removed. Change 2876169 on 2016/02/22 by Ben.Marsh Changes to support building UHT plugins with the binary release. * Add source code and target files for UHT to binary distribution * Fix UBT deleting build products if we're only compiling a single module. * Fix UBT exception setting up compile environment when a module doesn't have any source files set to build. * Include DLL import libraries for UHT in the build * Add support for compiling UHT modules in BuildPluginCommand. Stages an empty host project to allow UHT to load any enabled plugins. Change 2876219 on 2016/02/22 by Rolando.Caloca UE4.11 - Integration from 2874609 #jira UE-24967 PC: Update D3D12 RHI - Implement _RenderThread versions of Create, Lock and Unlock Index/Vertex Buffer. Only synchronize threads on Readback - Limit GPU starvation on CPU bound scenarios by flushing work when the GPU is idle - Change texture streaming system to correctly account for placed textures. Also fix texture sizes so they accurately represent the real size of the allocation the GPU. - Disable API shader blobs - Add the ability to easily change allocation stategy for a given pool, also add a simple linear allocator and a 'Multi-Buddy Allocator' for efficiency in different scenarios - Pool Fences to prevent creation and destruction every frame when using Async Compute - Implement _RenderThread versions of CreateShaderResourceView and CreateUnorderedAccessView Change 2876232 on 2016/02/22 by Rolando.Caloca UE4.11 - Integration from 2876173 #jira UE-24967 PC: Update D3D12 RHI - Fix ResizeBuffers() failing due to dangling references to the backbuffer if deferred deletion is used. - Reorder when pending FRHIResources are deleted. This still needs to flush all pending deletes and ignore the deferred deletion queue otherwise some items may still be left in the engine's queue. - Fix UT build error due to missing FPlatformMisc::GetGPUDriverInfo() Change 2876366 on 2016/02/22 by Douglas.Copeland Adding Skeletal Meshes for Import Test Case #jira UE-24473 Change 2876401 on 2016/02/22 by Peter.Sauerbrei fix for WindowsClient build from UFE and Project Launcher #jira UE-23897 Change 2876456 on 2016/02/22 by Ben.Marsh Use a more hierarchical directory structure for packaged builds, rather than just dumping everything in the root. Now defaults to <Share>\\PackagedBuilds\\<Branch>\\<CL>\\<ProjectName>_<Platform>_<Configuration>. Change 2876507 on 2016/02/22 by Nick.Shin use HOME (osx) and USERPROFILE (windows) on appropriate target platform #jira UE-26414 -- Mac is missing .emscripten file necessary for packaging or launching onto HTML5 Change 2876537 on 2016/02/22 by Dan.Oconnor Removed dubious fix for an old bug, no longer needed but I havn't figured out what has changed. This fixes a crash on Replace References, but does not reintroduce UE-9497 #jira UE-24891 Change 2876545 on 2016/02/22 by Chad.Taylor SteamVR camera late-update fix #jira UE-27254 Change 2876825 on 2016/02/22 by Dan.Oconnor Unfortunate edge case in lifetime of UEdGraph's schema, schema is assigned after construction so its modification is in the undo buffer, and we clear it after undoing. #jira UE-25956 Change 2876878 on 2016/02/22 by Nick.Whiting PSVR HMD Server support #jira UE-27262 [CL 2905127 by Matthew Griffin in Main branch]
2016-03-11 09:55:03 -05:00
PrevCert->Status = Cert->Status;
}
Cert = NULL;
}
}
else if (Line.Contains(TEXT("PROVISION-"), ESearchCase::CaseSensitive))
{
ProvisionPtr Prov = MakeShareable<FProvision>(new FProvision());
for (int FieldIndex = 0; FieldIndex < Fields.Num(); ++FieldIndex)
{
FString Key, Value;
Fields[FieldIndex].Split(TEXT(":"), &Key, &Value);
if (Key.Contains("File"))
{
Prov->FileName = Value;
}
else if (Key.Contains("Name"))
{
Prov->Name = Value;
}
else if (Key.Contains(TEXT("Validity")))
{
Prov->Status = Value;
}
else if (Key.Contains(TEXT("Type")))
{
Prov->bDistribution = Value.Contains(TEXT("DISTRIBUTION"));
}
}
// check to see if this the one selected in the ini file
FString OutString;
MobileProvisionProperty->GetValueAsFormattedString(OutString);
Prov->bManuallySelected = (OutString == Prov->FileName);
bManuallySelected |= Prov->bManuallySelected;
ProvisionList->Add(Prov);
}
else if (Line.Contains(TEXT("MATCHED-"), ESearchCase::CaseSensitive))
{
for (int FieldIndex = 0; FieldIndex < Fields.Num(); ++FieldIndex)
{
FString Key, Value;
Fields[FieldIndex].Split(TEXT(":"), &Key, &Value);
if (Key.Contains("File"))
{
SelectedFile = Value;
}
else if (Key.Contains("Provision"))
{
SelectedProvision = Value;
}
else if (Key.Contains(TEXT("Cert")))
{
SelectedCert = Value;
}
}
}
}
FilterLists();
}
}
void FIOSTargetSettingsCustomization::UpdateSSHStatus()
{
// updated SSH key
const UIOSRuntimeSettings* Settings = GetDefault<UIOSRuntimeSettings>();
const_cast<UIOSRuntimeSettings*>(Settings)->PostInitProperties();
}
void FIOSTargetSettingsCustomization::BuildPListSection(IDetailLayoutBuilder& DetailLayout)
{
// Info.plist category
IDetailCategoryBuilder& ProvisionCategory = DetailLayout.EditCategory(TEXT("Mobile Provision"));
IDetailCategoryBuilder& AppManifestCategory = DetailLayout.EditCategory(TEXT("Info.plist"));
IDetailCategoryBuilder& BundleCategory = DetailLayout.EditCategory(TEXT("BundleInformation"));
IDetailCategoryBuilder& OrientationCategory = DetailLayout.EditCategory(TEXT("Orientation"));
IDetailCategoryBuilder& RenderCategory = DetailLayout.EditCategory(TEXT("Rendering"));
IDetailCategoryBuilder& OSInfoCategory = DetailLayout.EditCategory(TEXT("OS Info"));
IDetailCategoryBuilder& DeviceCategory = DetailLayout.EditCategory(TEXT("Devices"));
IDetailCategoryBuilder& BuildCategory = DetailLayout.EditCategory(TEXT("Build"));
IDetailCategoryBuilder& ExtraCategory = DetailLayout.EditCategory(TEXT("Extra PList Data"));
MobileProvisionProperty = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UIOSRuntimeSettings, MobileProvision));
BuildCategory.AddProperty(MobileProvisionProperty)
.Visibility(EVisibility::Hidden);
SignCertificateProperty = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UIOSRuntimeSettings, SigningCertificate));
BuildCategory.AddProperty(SignCertificateProperty)
.Visibility(EVisibility::Hidden);
/* ProvisionCategory.AddCustomRow(TEXT("Certificate Request"), false)
.NameContent()
[
SNew(SHorizontalBox)
+ SHorizontalBox::Slot()
.Padding(FMargin(0, 1, 0, 1))
.FillWidth(1.0f)
[
SNew(STextBlock)
.Text(LOCTEXT("RequestLabel", "Certificate Request"))
.Font(DetailLayout.GetDetailFont())
]
]
.ValueContent()
[
SNew(SBox)
.HAlign(HAlign_Center)
[
SNew(SButton)
.HAlign(HAlign_Center)
.OnClicked(this, &FIOSTargetSettingsCustomization::OnCertificateRequestClicked)
[
SNew(STextBlock)
.Text(FText::FromString("Create Certificate Request and a Key Pair"))
]
]
];*/
ProvisionCategory.AddCustomRow(LOCTEXT("ProvisionLabel", "Provision"), false)
.WholeRowWidget
.MinDesiredWidth(0.f)
.MaxDesiredWidth(0.f)
.HAlign(HAlign_Fill)
[
SNew(SVerticalBox)
+ SVerticalBox::Slot()
.AutoHeight()
[
SAssignNew(ProvisionInfoSwitcher, SWidgetSwitcher)
.WidgetIndex(0)
// searching for provisions
+SWidgetSwitcher::Slot()
.HAlign(HAlign_Fill)
.VAlign(VAlign_Center)
[
SNew(SBorder)
.Padding(4)
[
SNew( STextBlock )
.Text( LOCTEXT( "ProvisionViewerFindingProvisions", "Please wait while we gather information." ) )
.AutoWrapText( true )
]
]
// importing a provision
+SWidgetSwitcher::Slot()
.HAlign(HAlign_Fill)
.VAlign(VAlign_Center)
[
SNew(SBorder)
.Padding(4)
[
SNew( STextBlock )
.Text( LOCTEXT( "ProvisionViewerImportingProvisions", "Importing Provision. Please wait..." ) )
.AutoWrapText( true )
]
]
// no provisions found or no valid provisions
+SWidgetSwitcher::Slot()
.HAlign(HAlign_Fill)
.VAlign(VAlign_Center)
[
SNew(SBorder)
.Padding(4)
[
SNew( STextBlock )
.Text( LOCTEXT( "ProvisionViewerNoValidProvisions", "No Provisions Found. Please Import a Provision." ) )
.AutoWrapText( true )
]
]
+SWidgetSwitcher::Slot()
.HAlign(HAlign_Fill)
.VAlign(VAlign_Center)
[
SNew(SVerticalBox)
+ SVerticalBox::Slot()
.Padding(FMargin(10, 10, 10, 10))
.AutoHeight()
[
SAssignNew(ProvisionListView, SListView<ProvisionPtr>)
.ItemHeight(20.0f)
.ListItemsSource(&FilteredProvisionList)
.OnGenerateRow(this, &FIOSTargetSettingsCustomization::HandleProvisionListGenerateRow)
.SelectionMode(ESelectionMode::None)
.HeaderRow
(
SNew(SHeaderRow)
+ SHeaderRow::Column("Selected")
.DefaultLabel(LOCTEXT("ProvisionListSelectColumnHeader", ""))
.FixedWidth(30.0f)
+ SHeaderRow::Column("Name")
.DefaultLabel(LOCTEXT("ProvisionListNameColumnHeader", "Provision"))
.FillWidth(1.0f)
+ SHeaderRow::Column("File")
.DefaultLabel(LOCTEXT("ProvisionListFileColumnHeader", "File"))
+ SHeaderRow::Column("Status")
.DefaultLabel(LOCTEXT("ProvisionListStatusColumnHeader", "Status"))
+ SHeaderRow::Column("Distribution")
.DefaultLabel(LOCTEXT("ProvisionListDistributionColumnHeader", "Distribution"))
.FixedWidth(75.0f)
)
]
+ SVerticalBox::Slot()
.AutoHeight()
.Padding(0.0f, 6.0f, 0.0f, 4.0f)
[
SNew(SSeparator)
.Orientation(Orient_Horizontal)
]
+ SVerticalBox::Slot()
.AutoHeight()
[
SNew(SHorizontalBox)
+ SHorizontalBox::Slot()
.AutoWidth()
[
SNew(SRichTextBlock)
Copying //UE4/Dev-Platform to //UE4/Main (Source: //UE4/Dev-Platform @ 3008177) ========================== MAJOR FEATURES + CHANGES ========================== Change 2948322 on 2016/04/19 by Nick.Shin update libwebsockets to v1.7.4 part 4 of 4 - doing this in stages for tracking purposes #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2970016 on 2016/05/07 by Nick.Shin undo all of the following upgrades: - zlib - openssl - libcurl - libwebsockets and reset webrtc #jira UE-30298 - Fortnite and Orion crash on login #lockdown josh.adams Change 2970373 on 2016/05/09 by Lee.Clark PS4 - Fix NumInstances not getting reset after DrawIndirect calls Change 2972873 on 2016/05/10 by Michael.Trepka Correct initial position for SlateViewer windows on Mac Change 2974363 on 2016/05/11 by Mark.Satterthwaite Fix invoking buils using distcc from UFE - the command-line executed to access the number of parallel tasks was incorrect. Change 2975921 on 2016/05/12 by Michael.Trepka Removed unused AdjustWindowRegion declaration from LinuxWindow.h #codereview Dmitry.Rekman Change 2977002 on 2016/05/13 by Michael.Trepka Make sure dSYM generation action in UBT on Mac does not start before the source dylib is ready #codereview Ben.Marsh Change 2977337 on 2016/05/13 by Brent.Pease UE-27805 - Adding special characters into the BundleDisplayName or BundleName causes packaging error + Prevent illegal characters from being entered in the packaging UI + Report an error from iPhonePackager if a illegal bundle id is specified + Convert special characters to XML equivalents - Correctly check for the presence of iTunes 12 when packaging iOS games on Windows - Improve ios certificate and provision message in package settings UI #codereview peter.sauerbrei Change 2977509 on 2016/05/13 by Brent.Pease + Fix mac compile error Change 2978036 on 2016/05/14 by Mark.Satterthwaite One-line tweak that resolves incorrect rendering of the colour LUT because float imprecision allows -ve values to be passed into a call to pow which then generates NaN. #jira UE-30777 Change 2978037 on 2016/05/14 by Mark.Satterthwaite Fix a heap-use-after-free bug spotted by AddressSanitizer - you can't assume that the UObject system will be available in ShutdownModule() - on OS X it may have been killed a long time ago. Change 2978333 on 2016/05/16 by Lee.Clark Fix packaging of non-code projects when plugins are enabled #codereview Peter.Sauerbrei Change 2978780 on 2016/05/16 by Mark.Satterthwaite Reduce temporary allocations required to set uniform parameters in Metal. Change 2979680 on 2016/05/16 by Nick.Shin editor's HTML5 platform settings was missing due to the emscripten SDK move should have been included with CL: #2946251 Change 2979681 on 2016/05/16 by Nick.Shin cleaned up websocket processing for HTML5 #jira UE-13657 - HTML5 plugin OnRawRecieve overflow Change 2979701 on 2016/05/16 by Brent.Pease UE-28421 - Message box cannot be closed after accessing the home screen on iOS + Implement a timeout when waiting for a reply after sending background/foreground/suspend events from the main thread to the game thread. This solves the immediate problem presented in the jira bug report, however, there are deeper issues with the consequences of blocking the game thread that are not addressed. Perhaps structuring the game thread loop to know about modal dialogs so that it can receive these events even when a modal dialog is up could be a better longer term solution Change 2980766 on 2016/05/17 by Jeremiah.Waldron Adding Android build support for HarfBuzz - using a combination of android-cmake (from https://github.com/taka-no-me/android-cmake) to create the build files and Visual Studio 2015 to compile them - Adding Debug and RelWithDebInfo compiled binaries to harfbuzz-1.2.4/Android/<arch>/<config> Tested armv7 with TextShapingTest project on a GalaxyNote3 and text showed up correctly #jira UE-28586 #codereview chris.babcock Change 2980953 on 2016/05/17 by Jeremiah.Waldron Changing HarfBuzz build script and libs to use Release instead of RelWithDebInfo #jira UE-28586 Change 2981039 on 2016/05/17 by Jeff.Campeau ICMP support disabled for Xbox One and basic address processing wrappers provided (needed for Oodle support) Change 2981054 on 2016/05/17 by Jeff.Campeau Enable Live OSS for Orion on Xbox One Change 2981553 on 2016/05/18 by Jeff.Campeau Enable Oodle for Xbox One Change 2981555 on 2016/05/18 by Jeff.Campeau Scalability settings for Xbox One Change 2981774 on 2016/05/18 by Keith.Judge Xbox One - Duplicating Movie Player fix from 4.12. Change 2981789 on 2016/05/18 by Keith.Judge Xbox One - Duplicate fast semantics rendertarget unbind/clear/rebind fix from 4.12. Change 2981802 on 2016/05/18 by Keith.Judge Xbox One - Duplicate of distance field AO/Shadow fixes from 4.12. Change 2981875 on 2016/05/18 by Keith.Judge Xbox One - Dynamic VB/IB refactor. Duplicated from 4.12. Change 2981900 on 2016/05/18 by Keith.Judge Xbox One - D3D11Query refactor. Duplicated from 4.12 Change 2981945 on 2016/05/18 by Nick.Shin filled out response headers for HTML5 platform #jira UE-26047 - HTML5 HTTP Response Headers not implemented Change 2981981 on 2016/05/18 by Lee.Clark PS4 - Fix COTF not updating files #codereview Daniel.Lamb Change 2982246 on 2016/05/18 by Michael.Trepka Fixed Mono compile errors in UT build scripts Change 2983869 on 2016/05/19 by Mark.Satterthwaite Explicitly retain/release all the MTLTexture objects in FMetalSurface without the assumptions about them being the same object - the recent stencil & SRV related changes make those assumptions invalid and could lead to over-releasing some textures. #jira UE-29557 Change 2983871 on 2016/05/19 by Mark.Satterthwaite Pool Metal texture update buffers to reduce churn. Change 2983892 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2972885: Enable Metal resource lifetime delay on all platforms, not just iOS to try and address intermittent invalid resource errors. Change 2983898 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2982825: Correctly wait for the dispatch semaphore when clearing the Metal resource free lists. Change 2983911 on 2016/05/19 by Mark.Satterthwaite Change Metal SubmitCommandsHint to use an enum of flags rather than boolean variables to control behaviour so that its clearer to the reader what is going to happen. Change 2983916 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2974765: Workaround for UE-30069 - on Nvidia Macs we are breaking the GMux swap the second time we run the engine and it isn't clear why, so instead explicitly select the Metal device ourselves and don't allow the OS to swap the GPU driving the display. This will potentially reduce performance a little if the discrete GPU isn't already driving the display but until we know how we are clobbering the GMux/driver it is all we can do. This only applies to 10.11.5 with the default OS X drivers where there is more than one GPU in the system, earlier versions of OS X and the Nvidia WebDrivers are unaffected. Change 2984874 on 2016/05/20 by Keith.Judge Xbox One - Re-enable shader DXBC intermediate bytecode stripping, except for geometry and hull shaders where there's a possibility of runtime recompilation in certain combinations. Saves ~2MB in TM-ShaderModels, will save more in larger maps. #jira UEPLAT-1295 Change 2985446 on 2016/05/20 by Mark.Satterthwaite Remove the non-functional -metaldebug option from MetalRHI. Change 2985827 on 2016/05/20 by Nick.Shin call EndSession() onbeforeunload() note: API CHANGE - HTML5JavaScripteFx.{js,h} - UE_MakeHTTPDataRequest() #jira UE-22285 - Session End events are not generated for HTML5 Change 2986013 on 2016/05/20 by Jeremiah.Waldron PR #2387: In-App Purchases - parameters needed for Receipt Validation (Contributed by gameDNAstudio) Also touches IOS because of added RawPrice member in FInAppPurchaseProductInfo Pulled from Release-4.12 CL #jira UE-30782 #codereview chris.babcock, Peter.Sauerbrei Change 2986057 on 2016/05/20 by Mark.Satterthwaite Further changes to ensure that UE-30710 really is fixed while also not live-leaking memory in MetalRHI. Change 2986059 on 2016/05/20 by Mark.Satterthwaite Move the Metal uniform buffers into the same resource pool as all the other buffers and add stats for how many buffers are in the pool, how much memory is in use, free and wasted (due to aligned-buffer sizes). Change 2986060 on 2016/05/20 by Mark.Satterthwaite Disable tiled-reflections on Nvidia & Intel Metal until they sort out the sample command on cube-arrays ignoring the lod level. Change 2986063 on 2016/05/20 by Mark.Satterthwaite Missing change from previous CL. Change 2986066 on 2016/05/20 by Mark.Satterthwaite More Metal stats tracking the number & memory size of id<MTLBuffer>'s allocated/released each frame. Change 2986455 on 2016/05/23 by Keith.Judge Xbox One - Fix precompile promise in shader compiler to not stop subsequent defines from being parsed by D3DCompiler. Change 2986886 on 2016/05/23 by Mark.Satterthwaite Duplicate 4.12 CL #2986880: Fix UE-31124 due to bad array iteration logic - amazing that this hadn't been seen earlier. Change 2986955 on 2016/05/23 by Brent.Pease + Do not error out if "[PROJECT_NAME]" is in the bundle ID #codereview peter.sauerbrei Change 2987304 on 2016/05/23 by Chris.Babcock Remove old Android platforms #ue4 #android #codeview Josh.Adams Change 2987571 on 2016/05/23 by Mark.Satterthwaite Duplicate CL #2967998: Integrate - MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) #jira UE-31111 Change 2987591 on 2016/05/23 by Mark.Satterthwaite Remove usage of MTLRender/ComputeEncoder setSamplerState/s calls that take Min & Max Lod overrides - they currently don't work as expected on some GPU drivers and as we don't use them anywhere and I can't see that we will removing them costs us nothing and fixes tiled reflections on Nvidia with Metal SM5. Change 2987679 on 2016/05/23 by Mark.Satterthwaite Re-enable tiled reflections on Nvidia by default now that they work. Change 2987799 on 2016/05/24 by Mark.Satterthwaite Add a shader compile option "r.Shaders.ZeroInitialise" that we can turn on to force explicit zero-initialisation of local & temporary variables in hlslcc - so far only implemented for Metal. The default behaviour remains to omit zero-initialisation but the option is helpful to eliminate or track down uninitialised access in shaders that are causing real bugs (e.g. POM material relying on zero-initialised loop counters causing hangs/bad rendering on Mac). Change 2989395 on 2016/05/25 by Lee.Clark PS4 - Fix shader output / render target format mismatch for sparse MRT. Change 2990003 on 2016/05/25 by Jeremiah.Waldron When creating our own ConfigCacheIni in GetConfigCacheIni_APL, do not assume that the Engine ini was requested. Instead use the baseIniName passed to the function. Change 2990393 on 2016/05/25 by Mark.Satterthwaite Back out changelist 2961310 - causes more problems than it solves. DistanceField rendering will still work on Intel Metal SM5 and may work on AMD but will be broken on Nvidia due to a bad access within the compute shader - there's no bounds checking in Metal... Change 2990516 on 2016/05/25 by Brent.Pease + UEPLAT-1294 - Support for local notifications + UEPLAT-1254 - Add BP event for device orientation change + Added a new class based on UGameInstance for mobile device callbacks + Ensured IOSAppDelegate.cpp follows convention for lambda functions Change 2991361 on 2016/05/26 by Jeremiah.Waldron Move InAppPurchase class to StoreHelper.java so GooglePlay and Amazon store helpers can use it Change 2992450 on 2016/05/27 by Mark.Satterthwaite Optional r.Shaders.BoundsChecking flag to control whether shader platforms should manually enforce buffer access bounds - HLSL returns zero or ignores invalid reads & writes but Metal leaves the behaviour undefined and some drivers then fail. By default this is off and its whatever the native platform behaviour is, enabling it will cost some amount of performance as the shader translator inserts additional instructions to try and match D3D as accurately as possible. This is required to fix GPU restart errors on some Metal drivers when using SM5 rendering features including DistanceField shaders. Change 2993027 on 2016/05/27 by Mark.Satterthwaite Fix typo for new CFLAG_BoundsChecking enumeration value. Change 2993594 on 2016/05/27 by Mark.Satterthwaite Build fix - check not assert... Change 2993595 on 2016/05/27 by Mark.Satterthwaite Fix typo from Xcode hang... Change 2993614 on 2016/05/28 by Mark.Satterthwaite At least for now enable shader zero-initialisation and bounds-checking on Mac to ensure that Metal shaders are compiled with semantics that approximate those HLSL assumes. This may cost some performance but will avoid a few GPU restarts on some vendor drivers. Change 2993747 on 2016/05/28 by Mark.Satterthwaite Separate texture & buffer references in the Metal backend as they bind to separate arrays in the runtime to avoid giving the side-table buffer an innaccessible binding index. Also the side-table doesn't need to be emitted if no buffer SRV or UAV is used. Change 2994256 on 2016/05/31 by Lee.Clark PS4 - Fix unitialized Head Position from HMD tracker when tracking fails. Fixes a problem with A3D audio not working. #codereview Chad.Taylor,Aaron.McLeran Change 2994281 on 2016/05/31 by Rolando.Caloca DP - Allow hlslcc to process type casts containing the 'const' keyword - it isn't strictly complete as it will simply omit the type qualifier from the cast in the AST but it is sufficient for FortniteFoliage_MasterMaterial to compile. #codereview Mark.Satterthwaite, Dmitry.Rekman #jira UE-31411 Change 2994467 on 2016/05/31 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 2994493 on 2016/05/31 by Daniel.Lamb Fixed issue with DDC commandlet not caching things from the startup packages list. Change 2994644 on 2016/05/31 by Mark.Satterthwaite Updated hlslcc Mac binaries with fix for UE-31411 which RCO accepted and submitted + script for building parsers on POSIX OSes hooked up to an Xcode scheme in the project. Change 2996074 on 2016/06/01 by Lee.Clark PS4 - Fix GS mode not getting disabled when using parallel contexts. #codereview Marcus.Wassmer Change 2996129 on 2016/06/01 by Brent.Pease Manual merge of Pete's dsym generation fix (CL#2996089) from the 4.12 branch. Change 2996130 on 2016/06/01 by Jeremiah.Waldron PR #2387 part 2 (Contributed by gameDNAstudio) Adding ability to consume purchases during GooglePlay RestorePurchases This also touches IOS due to changes to base classes and function signatures #codereview chris.babcock, Peter.Sauerbrei Change 2996441 on 2016/06/01 by Jeremiah.Waldron Relates to PR #2387: Adding ability to consume purchases during GooglePlay RestorePurchases (Contributed by gameDNAstudio) Missing changes from part 2 reworked so that there is still only one RestorePurchases function which takes the product IDs and consumable flags. I reflected this in StoreHelper so no casting is necessary in GameActivity and the soon-to-be-added AmazonStoreHelper in the GameCircle plugin will still work dynamically with GameActivity since it will call StoreHelper functionality rather than a GooglePlayStoreHelper specific function. #codereview chris.babcock Change 2996514 on 2016/06/01 by Jeff.Campeau Fix merge issue from main #jira UE-31502 Change 2996740 on 2016/06/01 by Jonathan.Fitzpatrick https://jira.ol.epicgames.net/browse/UE-31446 Two PS4 source files fail during unity builds due to name conflict with handleReserveFailed. Renamed handleReserveFailed to handleReserveFailedLightweight Change 2997235 on 2016/06/01 by Jeremiah.Waldron RestorePurchases fix up in Match3 since the new Restore consumable stuff adds an additional pin to the Restore node. The IAP product in Match3 is non-consumable so just passing an empty array where necessary Change 2997241 on 2016/06/01 by Jeremiah.Waldron OnlineSubsystemGameCircle Plugin - Leaderboards - Achievements - Friends - IAP - External UI Interface - Runtime Settings in Project Settings Plugin section when plugin is enabled - Disabled by default #jira UEPLAT-105 #codereview chris.babcock Change 2997618 on 2016/06/02 by Lee.Clark #UE4Docs: Removed PS4MapFileUtil info Change 2997840 on 2016/06/02 by Jeremiah.Waldron Removing trace logging from OnlineSubsystemGameCircle_APL Change 2998754 on 2016/06/02 by Brent.Pease Change BlueprintMobileLibrary to BlueprintPlatformLibrary Change 3000762 on 2016/06/03 by Jeff.Campeau Add example rating info to ShooterGame Change 3001037 on 2016/06/04 by Brent.Pease + Add ui screens for delegate test, local notification test, and iap test + Implement delegate test Change 3001250 on 2016/06/05 by Brent.Pease + Initial pass at IAP test screen Change 3001639 on 2016/06/06 by Jeff.Campeau Fix Xbox One build issue with DX12 #codereview Zabir.Hoque Change 3002574 on 2016/06/06 by Jeremiah.Waldron Adding Android Install Location to Android platform runtime settings and manifest generation Change 3002780 on 2016/06/06 by Brent.Pease + Initial implementation of local notification test Change 3003005 on 2016/06/06 by Jeremiah.Waldron OnlineSubsystemGameCircle plugin - adding setting for Fire TV support. Using that specification in the APL to Add/Update android.hardware.touchscreen feature required attribute Change 3004392 on 2016/06/07 by Jeremiah.Waldron Fixing typo in APL comment :) Change 3005768 on 2016/06/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3005929 on 2016/06/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3006151 on 2016/06/08 by Peter.Sauerbrei fix for LocalNotifications not available on TVOS #lockdown josh.adams Change 3006183 on 2016/06/08 by Brent.Pease Manual merge CL#3000242 from Release-4.12 into Dev-Platform #lockdown josh.adams Change 3006296 on 2016/06/08 by Peter.Sauerbrei submit an updated iPhonePackager and support DLLs #lockdown josh.adams Change 3006378 on 2016/06/08 by Peter.Sauerbrei fix for API update to RestorePurchases #codereview brent.pease #lockdown josh.adams #lockdown nick.penwarden [CL 3008183 by Josh Adams in Main branch]
2016-06-09 17:45:44 -04:00
.Text(LOCTEXT("ProvisionMessage", "<RichTextBlock.TextHighlight>Note</>: If no provision is selected the one in green will be used to provision the IPA."))
.TextStyle(FEditorStyle::Get(), "MessageLog")
.DecoratorStyleSet(&FEditorStyle::Get())
.AutoWrapText(true)
]
+ SHorizontalBox::Slot()
.FillWidth(1.0f)
.HAlign(HAlign_Right)
[
SNew(STextBlock)
.Text(LOCTEXT("ViewLabel", "View:"))
]
+ SHorizontalBox::Slot()
.AutoWidth()
.Padding(8.0f, 0.0f)
[
// all provisions hyper link
SNew(SHyperlink)
.OnNavigate(this, &FIOSTargetSettingsCustomization::HandleAllProvisionsHyperlinkNavigate, true)
.Text(LOCTEXT("AllProvisionsHyperLinkLabel", "All"))
.ToolTipText(LOCTEXT("AllProvisionsButtonTooltip", "View all provisions."))
]
+ SHorizontalBox::Slot()
.AutoWidth()
[
// valid provisions hyper link
SNew(SHyperlink)
.OnNavigate(this, &FIOSTargetSettingsCustomization::HandleAllProvisionsHyperlinkNavigate, false)
.Text(LOCTEXT("ValidProvisionsHyperlinkLabel", "Valid Only"))
.ToolTipText(LOCTEXT("ValidProvisionsHyperlinkTooltip", "View Valid provisions."))
]
]
]
]
+ SVerticalBox::Slot()
.AutoHeight()
[
SNew(SHorizontalBox)
+ SHorizontalBox::Slot()
.Padding(FMargin(0, 5, 0, 10))
.AutoWidth()
[
SNew(SButton)
.HAlign(HAlign_Center)
.VAlign(VAlign_Center)
.OnClicked(this, &FIOSTargetSettingsCustomization::OnInstallProvisionClicked)
.IsEnabled(this, &FIOSTargetSettingsCustomization::IsImportEnabled)
[
SNew(STextBlock)
.Text(LOCTEXT("ImportProvision", "Import Provision"))
]
]
]
];
ProvisionCategory.AddCustomRow(LOCTEXT("CertificateLabel", "Certificate"), false)
.WholeRowWidget
.MinDesiredWidth(0.f)
.MaxDesiredWidth(0.f)
.HAlign(HAlign_Fill)
[
SNew(SVerticalBox)
+ SVerticalBox::Slot()
.AutoHeight()
[
SAssignNew(CertificateInfoSwitcher, SWidgetSwitcher)
.WidgetIndex(0)
// searching for provisions
+SWidgetSwitcher::Slot()
.HAlign(HAlign_Fill)
.VAlign(VAlign_Center)
[
SNew(SBorder)
.Padding(4)
[
SNew( STextBlock )
.Text( LOCTEXT( "CertificateViewerFindingProvisions", "Please wait while we gather information." ) )
.AutoWrapText( true )
]
]
// importing certificate
+SWidgetSwitcher::Slot()
.HAlign(HAlign_Fill)
.VAlign(VAlign_Center)
[
SNew(SBorder)
.Padding(4)
[
SNew( STextBlock )
.Text( LOCTEXT( "CertificateViewerImportingCertificate", "Importing Certificate. Please wait..." ) )
.AutoWrapText( true )
]
]
// no provisions found or no valid provisions
+SWidgetSwitcher::Slot()
.HAlign(HAlign_Fill)
.VAlign(VAlign_Center)
[
SNew(SBorder)
.Padding(4)
[
SNew( STextBlock )
.Text( LOCTEXT( "CertificateViewerNoValidProvisions", "No Certificates Found. Please Import a Certificate." ) )
.AutoWrapText( true )
]
]
+SWidgetSwitcher::Slot()
.HAlign(HAlign_Fill)
.VAlign(VAlign_Center)
[
SNew(SVerticalBox)
+ SVerticalBox::Slot()
.AutoHeight()
[
SNew(SHorizontalBox)
+ SHorizontalBox::Slot()
.Padding(FMargin(10, 10, 10, 10))
.FillWidth(1.0f)
[
SAssignNew(CertificateListView, SListView<CertificatePtr>)
.ItemHeight(20.0f)
.ListItemsSource(&FilteredCertificateList)
.OnGenerateRow(this, &FIOSTargetSettingsCustomization::HandleCertificateListGenerateRow)
.SelectionMode(ESelectionMode::None)
.HeaderRow
(
SNew(SHeaderRow)
+ SHeaderRow::Column("Selected")
.DefaultLabel(LOCTEXT("CertificateListSelectColumnHeader", ""))
.FixedWidth(30.0f)
+ SHeaderRow::Column("Name")
.DefaultLabel(LOCTEXT("CertificateListNameColumnHeader", "Certificate"))
+ SHeaderRow::Column("Status")
.DefaultLabel(LOCTEXT("CertificateListStatusColumnHeader", "Status"))
.FixedWidth(75.0f)
+ SHeaderRow::Column("Expires")
.DefaultLabel(LOCTEXT("CertificateListExpiresColumnHeader", "Expires"))
.FixedWidth(75.0f)
)
]
]
+ SVerticalBox::Slot()
.AutoHeight()
.Padding(0.0f, 6.0f, 0.0f, 4.0f)
[
SNew(SSeparator)
.Orientation(Orient_Horizontal)
]
+ SVerticalBox::Slot()
.AutoHeight()
[
SNew(SHorizontalBox)
+ SHorizontalBox::Slot()
.AutoWidth()
[
SNew(SRichTextBlock)
Copying //UE4/Dev-Platform to //UE4/Main (Source: //UE4/Dev-Platform @ 3008177) ========================== MAJOR FEATURES + CHANGES ========================== Change 2948322 on 2016/04/19 by Nick.Shin update libwebsockets to v1.7.4 part 4 of 4 - doing this in stages for tracking purposes #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2970016 on 2016/05/07 by Nick.Shin undo all of the following upgrades: - zlib - openssl - libcurl - libwebsockets and reset webrtc #jira UE-30298 - Fortnite and Orion crash on login #lockdown josh.adams Change 2970373 on 2016/05/09 by Lee.Clark PS4 - Fix NumInstances not getting reset after DrawIndirect calls Change 2972873 on 2016/05/10 by Michael.Trepka Correct initial position for SlateViewer windows on Mac Change 2974363 on 2016/05/11 by Mark.Satterthwaite Fix invoking buils using distcc from UFE - the command-line executed to access the number of parallel tasks was incorrect. Change 2975921 on 2016/05/12 by Michael.Trepka Removed unused AdjustWindowRegion declaration from LinuxWindow.h #codereview Dmitry.Rekman Change 2977002 on 2016/05/13 by Michael.Trepka Make sure dSYM generation action in UBT on Mac does not start before the source dylib is ready #codereview Ben.Marsh Change 2977337 on 2016/05/13 by Brent.Pease UE-27805 - Adding special characters into the BundleDisplayName or BundleName causes packaging error + Prevent illegal characters from being entered in the packaging UI + Report an error from iPhonePackager if a illegal bundle id is specified + Convert special characters to XML equivalents - Correctly check for the presence of iTunes 12 when packaging iOS games on Windows - Improve ios certificate and provision message in package settings UI #codereview peter.sauerbrei Change 2977509 on 2016/05/13 by Brent.Pease + Fix mac compile error Change 2978036 on 2016/05/14 by Mark.Satterthwaite One-line tweak that resolves incorrect rendering of the colour LUT because float imprecision allows -ve values to be passed into a call to pow which then generates NaN. #jira UE-30777 Change 2978037 on 2016/05/14 by Mark.Satterthwaite Fix a heap-use-after-free bug spotted by AddressSanitizer - you can't assume that the UObject system will be available in ShutdownModule() - on OS X it may have been killed a long time ago. Change 2978333 on 2016/05/16 by Lee.Clark Fix packaging of non-code projects when plugins are enabled #codereview Peter.Sauerbrei Change 2978780 on 2016/05/16 by Mark.Satterthwaite Reduce temporary allocations required to set uniform parameters in Metal. Change 2979680 on 2016/05/16 by Nick.Shin editor's HTML5 platform settings was missing due to the emscripten SDK move should have been included with CL: #2946251 Change 2979681 on 2016/05/16 by Nick.Shin cleaned up websocket processing for HTML5 #jira UE-13657 - HTML5 plugin OnRawRecieve overflow Change 2979701 on 2016/05/16 by Brent.Pease UE-28421 - Message box cannot be closed after accessing the home screen on iOS + Implement a timeout when waiting for a reply after sending background/foreground/suspend events from the main thread to the game thread. This solves the immediate problem presented in the jira bug report, however, there are deeper issues with the consequences of blocking the game thread that are not addressed. Perhaps structuring the game thread loop to know about modal dialogs so that it can receive these events even when a modal dialog is up could be a better longer term solution Change 2980766 on 2016/05/17 by Jeremiah.Waldron Adding Android build support for HarfBuzz - using a combination of android-cmake (from https://github.com/taka-no-me/android-cmake) to create the build files and Visual Studio 2015 to compile them - Adding Debug and RelWithDebInfo compiled binaries to harfbuzz-1.2.4/Android/<arch>/<config> Tested armv7 with TextShapingTest project on a GalaxyNote3 and text showed up correctly #jira UE-28586 #codereview chris.babcock Change 2980953 on 2016/05/17 by Jeremiah.Waldron Changing HarfBuzz build script and libs to use Release instead of RelWithDebInfo #jira UE-28586 Change 2981039 on 2016/05/17 by Jeff.Campeau ICMP support disabled for Xbox One and basic address processing wrappers provided (needed for Oodle support) Change 2981054 on 2016/05/17 by Jeff.Campeau Enable Live OSS for Orion on Xbox One Change 2981553 on 2016/05/18 by Jeff.Campeau Enable Oodle for Xbox One Change 2981555 on 2016/05/18 by Jeff.Campeau Scalability settings for Xbox One Change 2981774 on 2016/05/18 by Keith.Judge Xbox One - Duplicating Movie Player fix from 4.12. Change 2981789 on 2016/05/18 by Keith.Judge Xbox One - Duplicate fast semantics rendertarget unbind/clear/rebind fix from 4.12. Change 2981802 on 2016/05/18 by Keith.Judge Xbox One - Duplicate of distance field AO/Shadow fixes from 4.12. Change 2981875 on 2016/05/18 by Keith.Judge Xbox One - Dynamic VB/IB refactor. Duplicated from 4.12. Change 2981900 on 2016/05/18 by Keith.Judge Xbox One - D3D11Query refactor. Duplicated from 4.12 Change 2981945 on 2016/05/18 by Nick.Shin filled out response headers for HTML5 platform #jira UE-26047 - HTML5 HTTP Response Headers not implemented Change 2981981 on 2016/05/18 by Lee.Clark PS4 - Fix COTF not updating files #codereview Daniel.Lamb Change 2982246 on 2016/05/18 by Michael.Trepka Fixed Mono compile errors in UT build scripts Change 2983869 on 2016/05/19 by Mark.Satterthwaite Explicitly retain/release all the MTLTexture objects in FMetalSurface without the assumptions about them being the same object - the recent stencil & SRV related changes make those assumptions invalid and could lead to over-releasing some textures. #jira UE-29557 Change 2983871 on 2016/05/19 by Mark.Satterthwaite Pool Metal texture update buffers to reduce churn. Change 2983892 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2972885: Enable Metal resource lifetime delay on all platforms, not just iOS to try and address intermittent invalid resource errors. Change 2983898 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2982825: Correctly wait for the dispatch semaphore when clearing the Metal resource free lists. Change 2983911 on 2016/05/19 by Mark.Satterthwaite Change Metal SubmitCommandsHint to use an enum of flags rather than boolean variables to control behaviour so that its clearer to the reader what is going to happen. Change 2983916 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2974765: Workaround for UE-30069 - on Nvidia Macs we are breaking the GMux swap the second time we run the engine and it isn't clear why, so instead explicitly select the Metal device ourselves and don't allow the OS to swap the GPU driving the display. This will potentially reduce performance a little if the discrete GPU isn't already driving the display but until we know how we are clobbering the GMux/driver it is all we can do. This only applies to 10.11.5 with the default OS X drivers where there is more than one GPU in the system, earlier versions of OS X and the Nvidia WebDrivers are unaffected. Change 2984874 on 2016/05/20 by Keith.Judge Xbox One - Re-enable shader DXBC intermediate bytecode stripping, except for geometry and hull shaders where there's a possibility of runtime recompilation in certain combinations. Saves ~2MB in TM-ShaderModels, will save more in larger maps. #jira UEPLAT-1295 Change 2985446 on 2016/05/20 by Mark.Satterthwaite Remove the non-functional -metaldebug option from MetalRHI. Change 2985827 on 2016/05/20 by Nick.Shin call EndSession() onbeforeunload() note: API CHANGE - HTML5JavaScripteFx.{js,h} - UE_MakeHTTPDataRequest() #jira UE-22285 - Session End events are not generated for HTML5 Change 2986013 on 2016/05/20 by Jeremiah.Waldron PR #2387: In-App Purchases - parameters needed for Receipt Validation (Contributed by gameDNAstudio) Also touches IOS because of added RawPrice member in FInAppPurchaseProductInfo Pulled from Release-4.12 CL #jira UE-30782 #codereview chris.babcock, Peter.Sauerbrei Change 2986057 on 2016/05/20 by Mark.Satterthwaite Further changes to ensure that UE-30710 really is fixed while also not live-leaking memory in MetalRHI. Change 2986059 on 2016/05/20 by Mark.Satterthwaite Move the Metal uniform buffers into the same resource pool as all the other buffers and add stats for how many buffers are in the pool, how much memory is in use, free and wasted (due to aligned-buffer sizes). Change 2986060 on 2016/05/20 by Mark.Satterthwaite Disable tiled-reflections on Nvidia & Intel Metal until they sort out the sample command on cube-arrays ignoring the lod level. Change 2986063 on 2016/05/20 by Mark.Satterthwaite Missing change from previous CL. Change 2986066 on 2016/05/20 by Mark.Satterthwaite More Metal stats tracking the number & memory size of id<MTLBuffer>'s allocated/released each frame. Change 2986455 on 2016/05/23 by Keith.Judge Xbox One - Fix precompile promise in shader compiler to not stop subsequent defines from being parsed by D3DCompiler. Change 2986886 on 2016/05/23 by Mark.Satterthwaite Duplicate 4.12 CL #2986880: Fix UE-31124 due to bad array iteration logic - amazing that this hadn't been seen earlier. Change 2986955 on 2016/05/23 by Brent.Pease + Do not error out if "[PROJECT_NAME]" is in the bundle ID #codereview peter.sauerbrei Change 2987304 on 2016/05/23 by Chris.Babcock Remove old Android platforms #ue4 #android #codeview Josh.Adams Change 2987571 on 2016/05/23 by Mark.Satterthwaite Duplicate CL #2967998: Integrate - MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) #jira UE-31111 Change 2987591 on 2016/05/23 by Mark.Satterthwaite Remove usage of MTLRender/ComputeEncoder setSamplerState/s calls that take Min & Max Lod overrides - they currently don't work as expected on some GPU drivers and as we don't use them anywhere and I can't see that we will removing them costs us nothing and fixes tiled reflections on Nvidia with Metal SM5. Change 2987679 on 2016/05/23 by Mark.Satterthwaite Re-enable tiled reflections on Nvidia by default now that they work. Change 2987799 on 2016/05/24 by Mark.Satterthwaite Add a shader compile option "r.Shaders.ZeroInitialise" that we can turn on to force explicit zero-initialisation of local & temporary variables in hlslcc - so far only implemented for Metal. The default behaviour remains to omit zero-initialisation but the option is helpful to eliminate or track down uninitialised access in shaders that are causing real bugs (e.g. POM material relying on zero-initialised loop counters causing hangs/bad rendering on Mac). Change 2989395 on 2016/05/25 by Lee.Clark PS4 - Fix shader output / render target format mismatch for sparse MRT. Change 2990003 on 2016/05/25 by Jeremiah.Waldron When creating our own ConfigCacheIni in GetConfigCacheIni_APL, do not assume that the Engine ini was requested. Instead use the baseIniName passed to the function. Change 2990393 on 2016/05/25 by Mark.Satterthwaite Back out changelist 2961310 - causes more problems than it solves. DistanceField rendering will still work on Intel Metal SM5 and may work on AMD but will be broken on Nvidia due to a bad access within the compute shader - there's no bounds checking in Metal... Change 2990516 on 2016/05/25 by Brent.Pease + UEPLAT-1294 - Support for local notifications + UEPLAT-1254 - Add BP event for device orientation change + Added a new class based on UGameInstance for mobile device callbacks + Ensured IOSAppDelegate.cpp follows convention for lambda functions Change 2991361 on 2016/05/26 by Jeremiah.Waldron Move InAppPurchase class to StoreHelper.java so GooglePlay and Amazon store helpers can use it Change 2992450 on 2016/05/27 by Mark.Satterthwaite Optional r.Shaders.BoundsChecking flag to control whether shader platforms should manually enforce buffer access bounds - HLSL returns zero or ignores invalid reads & writes but Metal leaves the behaviour undefined and some drivers then fail. By default this is off and its whatever the native platform behaviour is, enabling it will cost some amount of performance as the shader translator inserts additional instructions to try and match D3D as accurately as possible. This is required to fix GPU restart errors on some Metal drivers when using SM5 rendering features including DistanceField shaders. Change 2993027 on 2016/05/27 by Mark.Satterthwaite Fix typo for new CFLAG_BoundsChecking enumeration value. Change 2993594 on 2016/05/27 by Mark.Satterthwaite Build fix - check not assert... Change 2993595 on 2016/05/27 by Mark.Satterthwaite Fix typo from Xcode hang... Change 2993614 on 2016/05/28 by Mark.Satterthwaite At least for now enable shader zero-initialisation and bounds-checking on Mac to ensure that Metal shaders are compiled with semantics that approximate those HLSL assumes. This may cost some performance but will avoid a few GPU restarts on some vendor drivers. Change 2993747 on 2016/05/28 by Mark.Satterthwaite Separate texture & buffer references in the Metal backend as they bind to separate arrays in the runtime to avoid giving the side-table buffer an innaccessible binding index. Also the side-table doesn't need to be emitted if no buffer SRV or UAV is used. Change 2994256 on 2016/05/31 by Lee.Clark PS4 - Fix unitialized Head Position from HMD tracker when tracking fails. Fixes a problem with A3D audio not working. #codereview Chad.Taylor,Aaron.McLeran Change 2994281 on 2016/05/31 by Rolando.Caloca DP - Allow hlslcc to process type casts containing the 'const' keyword - it isn't strictly complete as it will simply omit the type qualifier from the cast in the AST but it is sufficient for FortniteFoliage_MasterMaterial to compile. #codereview Mark.Satterthwaite, Dmitry.Rekman #jira UE-31411 Change 2994467 on 2016/05/31 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 2994493 on 2016/05/31 by Daniel.Lamb Fixed issue with DDC commandlet not caching things from the startup packages list. Change 2994644 on 2016/05/31 by Mark.Satterthwaite Updated hlslcc Mac binaries with fix for UE-31411 which RCO accepted and submitted + script for building parsers on POSIX OSes hooked up to an Xcode scheme in the project. Change 2996074 on 2016/06/01 by Lee.Clark PS4 - Fix GS mode not getting disabled when using parallel contexts. #codereview Marcus.Wassmer Change 2996129 on 2016/06/01 by Brent.Pease Manual merge of Pete's dsym generation fix (CL#2996089) from the 4.12 branch. Change 2996130 on 2016/06/01 by Jeremiah.Waldron PR #2387 part 2 (Contributed by gameDNAstudio) Adding ability to consume purchases during GooglePlay RestorePurchases This also touches IOS due to changes to base classes and function signatures #codereview chris.babcock, Peter.Sauerbrei Change 2996441 on 2016/06/01 by Jeremiah.Waldron Relates to PR #2387: Adding ability to consume purchases during GooglePlay RestorePurchases (Contributed by gameDNAstudio) Missing changes from part 2 reworked so that there is still only one RestorePurchases function which takes the product IDs and consumable flags. I reflected this in StoreHelper so no casting is necessary in GameActivity and the soon-to-be-added AmazonStoreHelper in the GameCircle plugin will still work dynamically with GameActivity since it will call StoreHelper functionality rather than a GooglePlayStoreHelper specific function. #codereview chris.babcock Change 2996514 on 2016/06/01 by Jeff.Campeau Fix merge issue from main #jira UE-31502 Change 2996740 on 2016/06/01 by Jonathan.Fitzpatrick https://jira.ol.epicgames.net/browse/UE-31446 Two PS4 source files fail during unity builds due to name conflict with handleReserveFailed. Renamed handleReserveFailed to handleReserveFailedLightweight Change 2997235 on 2016/06/01 by Jeremiah.Waldron RestorePurchases fix up in Match3 since the new Restore consumable stuff adds an additional pin to the Restore node. The IAP product in Match3 is non-consumable so just passing an empty array where necessary Change 2997241 on 2016/06/01 by Jeremiah.Waldron OnlineSubsystemGameCircle Plugin - Leaderboards - Achievements - Friends - IAP - External UI Interface - Runtime Settings in Project Settings Plugin section when plugin is enabled - Disabled by default #jira UEPLAT-105 #codereview chris.babcock Change 2997618 on 2016/06/02 by Lee.Clark #UE4Docs: Removed PS4MapFileUtil info Change 2997840 on 2016/06/02 by Jeremiah.Waldron Removing trace logging from OnlineSubsystemGameCircle_APL Change 2998754 on 2016/06/02 by Brent.Pease Change BlueprintMobileLibrary to BlueprintPlatformLibrary Change 3000762 on 2016/06/03 by Jeff.Campeau Add example rating info to ShooterGame Change 3001037 on 2016/06/04 by Brent.Pease + Add ui screens for delegate test, local notification test, and iap test + Implement delegate test Change 3001250 on 2016/06/05 by Brent.Pease + Initial pass at IAP test screen Change 3001639 on 2016/06/06 by Jeff.Campeau Fix Xbox One build issue with DX12 #codereview Zabir.Hoque Change 3002574 on 2016/06/06 by Jeremiah.Waldron Adding Android Install Location to Android platform runtime settings and manifest generation Change 3002780 on 2016/06/06 by Brent.Pease + Initial implementation of local notification test Change 3003005 on 2016/06/06 by Jeremiah.Waldron OnlineSubsystemGameCircle plugin - adding setting for Fire TV support. Using that specification in the APL to Add/Update android.hardware.touchscreen feature required attribute Change 3004392 on 2016/06/07 by Jeremiah.Waldron Fixing typo in APL comment :) Change 3005768 on 2016/06/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3005929 on 2016/06/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3006151 on 2016/06/08 by Peter.Sauerbrei fix for LocalNotifications not available on TVOS #lockdown josh.adams Change 3006183 on 2016/06/08 by Brent.Pease Manual merge CL#3000242 from Release-4.12 into Dev-Platform #lockdown josh.adams Change 3006296 on 2016/06/08 by Peter.Sauerbrei submit an updated iPhonePackager and support DLLs #lockdown josh.adams Change 3006378 on 2016/06/08 by Peter.Sauerbrei fix for API update to RestorePurchases #codereview brent.pease #lockdown josh.adams #lockdown nick.penwarden [CL 3008183 by Josh Adams in Main branch]
2016-06-09 17:45:44 -04:00
.Text(LOCTEXT("CertificateMessage", "<RichTextBlock.TextHighlight>Note</>: If no certificate is selected then the one in green will be used to sign the IPA."))
.TextStyle(FEditorStyle::Get(), "MessageLog")
.DecoratorStyleSet(&FEditorStyle::Get())
.AutoWrapText(true)
]
+ SHorizontalBox::Slot()
.FillWidth(1.0f)
.HAlign(HAlign_Right)
[
SNew(STextBlock)
.Text(LOCTEXT("ViewLabel", "View:"))
]
+ SHorizontalBox::Slot()
.AutoWidth()
.Padding(8.0f, 0.0f)
[
// all provisions hyper link
SNew(SHyperlink)
.OnNavigate(this, &FIOSTargetSettingsCustomization::HandleAllCertificatesHyperlinkNavigate, true)
.Text(LOCTEXT("AllCertificatesHyperLinkLabel", "All"))
.ToolTipText(LOCTEXT("AllCertificatesButtonTooltip", "View all certificates."))
]
+ SHorizontalBox::Slot()
.AutoWidth()
[
// valid provisions hyper link
SNew(SHyperlink)
.OnNavigate(this, &FIOSTargetSettingsCustomization::HandleAllCertificatesHyperlinkNavigate, false)
.Text(LOCTEXT("ValidCertificatesHyperlinkLabel", "Valid Only"))
.ToolTipText(LOCTEXT("ValidCertificatesHyperlinkTooltip", "View Valid certificates."))
]
]
]
]
+ SVerticalBox::Slot()
.AutoHeight()
[
SNew(SHorizontalBox)
+ SHorizontalBox::Slot()
.Padding(FMargin(0, 5, 0, 10))
.AutoWidth()
[
SNew(SButton)
.HAlign(HAlign_Center)
.VAlign(VAlign_Center)
.OnClicked(this, &FIOSTargetSettingsCustomization::OnInstallCertificateClicked)
.IsEnabled(this, &FIOSTargetSettingsCustomization::IsImportEnabled)
[
SNew(STextBlock)
.Text(LOCTEXT("ImportCertificate", "Import Certificate"))
]
]
]
];
BundleCategory.AddCustomRow(LOCTEXT("UpgradeInfo", "Upgrade Info"), false)
.WholeRowWidget
[
SNew(SBorder)
.Padding(1)
[
SNew(SHorizontalBox)
+ SHorizontalBox::Slot()
.Padding(FMargin(10, 10, 10, 10))
.FillWidth(1.0f)
[
SNew(SRichTextBlock)
.Text(LOCTEXT("IOSUpgradeInfoMessage", "<RichTextBlock.TextHighlight>Note to users from 4.6 or earlier</>: We now <RichTextBlock.TextHighlight>GENERATE</> an Info.plist when building, so if you have customized your .plist file, you will need to put all of your changes into the below settings. Note that we don't touch the .plist file that is in your project directory, so you can use it as reference."))
.TextStyle(FEditorStyle::Get(), "MessageLog")
.DecoratorStyleSet(&FEditorStyle::Get())
.AutoWrapText(true)
// + SRichTextBlock::HyperlinkDecorator(TEXT("browser"), FSlateHyperlinkRun::FOnClick::CreateStatic(&OnBrowserLinkClicked))
]
]
];
// Show properties that are gated by the plist being present and writable
RunningIPPProcess = false;
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
#define SETUP_SOURCEONLY_PROP(PropName, Category) \
{ \
TSharedRef<IPropertyHandle> PropertyHandle = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UIOSRuntimeSettings, PropName)); \
Category.AddProperty(PropertyHandle) \
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
.IsEnabled(FEngineBuildSettings::IsSourceDistribution()) \
.ToolTip(FEngineBuildSettings::IsSourceDistribution() ? PropertyHandle->GetToolTipText() : FIOSTargetSettingsCustomizationConstants::DisabledTip); \
}
#define SETUP_PLIST_PROP(PropName, Category) \
{ \
TSharedRef<IPropertyHandle> PropertyHandle = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UIOSRuntimeSettings, PropName)); \
Category.AddProperty(PropertyHandle); \
}
#define SETUP_STATUS_PROP(PropName, Category) \
{ \
TSharedRef<IPropertyHandle> PropertyHandle = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UIOSRuntimeSettings, PropName)); \
Category.AddProperty(PropertyHandle) \
.Visibility(EVisibility::Hidden); \
Category.AddCustomRow(LOCTEXT("BundleIdentifier", "BundleIdentifier"), false) \
.NameContent() \
[ \
SNew(SHorizontalBox) \
+ SHorizontalBox::Slot() \
.Padding(FMargin(0, 1, 0, 1)) \
.FillWidth(1.0f) \
[ \
SNew(STextBlock) \
.Text(LOCTEXT("BundleIdentifierLabel", "Bundle Identifier")) \
.Font(DetailLayout.GetDetailFont()) \
]\
] \
.ValueContent() \
.MinDesiredWidth( 0.0f ) \
.MaxDesiredWidth( 0.0f ) \
[ \
SNew(SHorizontalBox) \
+ SHorizontalBox::Slot() \
.FillWidth(1.0f) \
.HAlign(HAlign_Fill) \
[ \
Copying //UE4/Dev-Platform to //UE4/Main (Source: //UE4/Dev-Platform @ 3008177) ========================== MAJOR FEATURES + CHANGES ========================== Change 2948322 on 2016/04/19 by Nick.Shin update libwebsockets to v1.7.4 part 4 of 4 - doing this in stages for tracking purposes #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2970016 on 2016/05/07 by Nick.Shin undo all of the following upgrades: - zlib - openssl - libcurl - libwebsockets and reset webrtc #jira UE-30298 - Fortnite and Orion crash on login #lockdown josh.adams Change 2970373 on 2016/05/09 by Lee.Clark PS4 - Fix NumInstances not getting reset after DrawIndirect calls Change 2972873 on 2016/05/10 by Michael.Trepka Correct initial position for SlateViewer windows on Mac Change 2974363 on 2016/05/11 by Mark.Satterthwaite Fix invoking buils using distcc from UFE - the command-line executed to access the number of parallel tasks was incorrect. Change 2975921 on 2016/05/12 by Michael.Trepka Removed unused AdjustWindowRegion declaration from LinuxWindow.h #codereview Dmitry.Rekman Change 2977002 on 2016/05/13 by Michael.Trepka Make sure dSYM generation action in UBT on Mac does not start before the source dylib is ready #codereview Ben.Marsh Change 2977337 on 2016/05/13 by Brent.Pease UE-27805 - Adding special characters into the BundleDisplayName or BundleName causes packaging error + Prevent illegal characters from being entered in the packaging UI + Report an error from iPhonePackager if a illegal bundle id is specified + Convert special characters to XML equivalents - Correctly check for the presence of iTunes 12 when packaging iOS games on Windows - Improve ios certificate and provision message in package settings UI #codereview peter.sauerbrei Change 2977509 on 2016/05/13 by Brent.Pease + Fix mac compile error Change 2978036 on 2016/05/14 by Mark.Satterthwaite One-line tweak that resolves incorrect rendering of the colour LUT because float imprecision allows -ve values to be passed into a call to pow which then generates NaN. #jira UE-30777 Change 2978037 on 2016/05/14 by Mark.Satterthwaite Fix a heap-use-after-free bug spotted by AddressSanitizer - you can't assume that the UObject system will be available in ShutdownModule() - on OS X it may have been killed a long time ago. Change 2978333 on 2016/05/16 by Lee.Clark Fix packaging of non-code projects when plugins are enabled #codereview Peter.Sauerbrei Change 2978780 on 2016/05/16 by Mark.Satterthwaite Reduce temporary allocations required to set uniform parameters in Metal. Change 2979680 on 2016/05/16 by Nick.Shin editor's HTML5 platform settings was missing due to the emscripten SDK move should have been included with CL: #2946251 Change 2979681 on 2016/05/16 by Nick.Shin cleaned up websocket processing for HTML5 #jira UE-13657 - HTML5 plugin OnRawRecieve overflow Change 2979701 on 2016/05/16 by Brent.Pease UE-28421 - Message box cannot be closed after accessing the home screen on iOS + Implement a timeout when waiting for a reply after sending background/foreground/suspend events from the main thread to the game thread. This solves the immediate problem presented in the jira bug report, however, there are deeper issues with the consequences of blocking the game thread that are not addressed. Perhaps structuring the game thread loop to know about modal dialogs so that it can receive these events even when a modal dialog is up could be a better longer term solution Change 2980766 on 2016/05/17 by Jeremiah.Waldron Adding Android build support for HarfBuzz - using a combination of android-cmake (from https://github.com/taka-no-me/android-cmake) to create the build files and Visual Studio 2015 to compile them - Adding Debug and RelWithDebInfo compiled binaries to harfbuzz-1.2.4/Android/<arch>/<config> Tested armv7 with TextShapingTest project on a GalaxyNote3 and text showed up correctly #jira UE-28586 #codereview chris.babcock Change 2980953 on 2016/05/17 by Jeremiah.Waldron Changing HarfBuzz build script and libs to use Release instead of RelWithDebInfo #jira UE-28586 Change 2981039 on 2016/05/17 by Jeff.Campeau ICMP support disabled for Xbox One and basic address processing wrappers provided (needed for Oodle support) Change 2981054 on 2016/05/17 by Jeff.Campeau Enable Live OSS for Orion on Xbox One Change 2981553 on 2016/05/18 by Jeff.Campeau Enable Oodle for Xbox One Change 2981555 on 2016/05/18 by Jeff.Campeau Scalability settings for Xbox One Change 2981774 on 2016/05/18 by Keith.Judge Xbox One - Duplicating Movie Player fix from 4.12. Change 2981789 on 2016/05/18 by Keith.Judge Xbox One - Duplicate fast semantics rendertarget unbind/clear/rebind fix from 4.12. Change 2981802 on 2016/05/18 by Keith.Judge Xbox One - Duplicate of distance field AO/Shadow fixes from 4.12. Change 2981875 on 2016/05/18 by Keith.Judge Xbox One - Dynamic VB/IB refactor. Duplicated from 4.12. Change 2981900 on 2016/05/18 by Keith.Judge Xbox One - D3D11Query refactor. Duplicated from 4.12 Change 2981945 on 2016/05/18 by Nick.Shin filled out response headers for HTML5 platform #jira UE-26047 - HTML5 HTTP Response Headers not implemented Change 2981981 on 2016/05/18 by Lee.Clark PS4 - Fix COTF not updating files #codereview Daniel.Lamb Change 2982246 on 2016/05/18 by Michael.Trepka Fixed Mono compile errors in UT build scripts Change 2983869 on 2016/05/19 by Mark.Satterthwaite Explicitly retain/release all the MTLTexture objects in FMetalSurface without the assumptions about them being the same object - the recent stencil & SRV related changes make those assumptions invalid and could lead to over-releasing some textures. #jira UE-29557 Change 2983871 on 2016/05/19 by Mark.Satterthwaite Pool Metal texture update buffers to reduce churn. Change 2983892 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2972885: Enable Metal resource lifetime delay on all platforms, not just iOS to try and address intermittent invalid resource errors. Change 2983898 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2982825: Correctly wait for the dispatch semaphore when clearing the Metal resource free lists. Change 2983911 on 2016/05/19 by Mark.Satterthwaite Change Metal SubmitCommandsHint to use an enum of flags rather than boolean variables to control behaviour so that its clearer to the reader what is going to happen. Change 2983916 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2974765: Workaround for UE-30069 - on Nvidia Macs we are breaking the GMux swap the second time we run the engine and it isn't clear why, so instead explicitly select the Metal device ourselves and don't allow the OS to swap the GPU driving the display. This will potentially reduce performance a little if the discrete GPU isn't already driving the display but until we know how we are clobbering the GMux/driver it is all we can do. This only applies to 10.11.5 with the default OS X drivers where there is more than one GPU in the system, earlier versions of OS X and the Nvidia WebDrivers are unaffected. Change 2984874 on 2016/05/20 by Keith.Judge Xbox One - Re-enable shader DXBC intermediate bytecode stripping, except for geometry and hull shaders where there's a possibility of runtime recompilation in certain combinations. Saves ~2MB in TM-ShaderModels, will save more in larger maps. #jira UEPLAT-1295 Change 2985446 on 2016/05/20 by Mark.Satterthwaite Remove the non-functional -metaldebug option from MetalRHI. Change 2985827 on 2016/05/20 by Nick.Shin call EndSession() onbeforeunload() note: API CHANGE - HTML5JavaScripteFx.{js,h} - UE_MakeHTTPDataRequest() #jira UE-22285 - Session End events are not generated for HTML5 Change 2986013 on 2016/05/20 by Jeremiah.Waldron PR #2387: In-App Purchases - parameters needed for Receipt Validation (Contributed by gameDNAstudio) Also touches IOS because of added RawPrice member in FInAppPurchaseProductInfo Pulled from Release-4.12 CL #jira UE-30782 #codereview chris.babcock, Peter.Sauerbrei Change 2986057 on 2016/05/20 by Mark.Satterthwaite Further changes to ensure that UE-30710 really is fixed while also not live-leaking memory in MetalRHI. Change 2986059 on 2016/05/20 by Mark.Satterthwaite Move the Metal uniform buffers into the same resource pool as all the other buffers and add stats for how many buffers are in the pool, how much memory is in use, free and wasted (due to aligned-buffer sizes). Change 2986060 on 2016/05/20 by Mark.Satterthwaite Disable tiled-reflections on Nvidia & Intel Metal until they sort out the sample command on cube-arrays ignoring the lod level. Change 2986063 on 2016/05/20 by Mark.Satterthwaite Missing change from previous CL. Change 2986066 on 2016/05/20 by Mark.Satterthwaite More Metal stats tracking the number & memory size of id<MTLBuffer>'s allocated/released each frame. Change 2986455 on 2016/05/23 by Keith.Judge Xbox One - Fix precompile promise in shader compiler to not stop subsequent defines from being parsed by D3DCompiler. Change 2986886 on 2016/05/23 by Mark.Satterthwaite Duplicate 4.12 CL #2986880: Fix UE-31124 due to bad array iteration logic - amazing that this hadn't been seen earlier. Change 2986955 on 2016/05/23 by Brent.Pease + Do not error out if "[PROJECT_NAME]" is in the bundle ID #codereview peter.sauerbrei Change 2987304 on 2016/05/23 by Chris.Babcock Remove old Android platforms #ue4 #android #codeview Josh.Adams Change 2987571 on 2016/05/23 by Mark.Satterthwaite Duplicate CL #2967998: Integrate - MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) #jira UE-31111 Change 2987591 on 2016/05/23 by Mark.Satterthwaite Remove usage of MTLRender/ComputeEncoder setSamplerState/s calls that take Min & Max Lod overrides - they currently don't work as expected on some GPU drivers and as we don't use them anywhere and I can't see that we will removing them costs us nothing and fixes tiled reflections on Nvidia with Metal SM5. Change 2987679 on 2016/05/23 by Mark.Satterthwaite Re-enable tiled reflections on Nvidia by default now that they work. Change 2987799 on 2016/05/24 by Mark.Satterthwaite Add a shader compile option "r.Shaders.ZeroInitialise" that we can turn on to force explicit zero-initialisation of local & temporary variables in hlslcc - so far only implemented for Metal. The default behaviour remains to omit zero-initialisation but the option is helpful to eliminate or track down uninitialised access in shaders that are causing real bugs (e.g. POM material relying on zero-initialised loop counters causing hangs/bad rendering on Mac). Change 2989395 on 2016/05/25 by Lee.Clark PS4 - Fix shader output / render target format mismatch for sparse MRT. Change 2990003 on 2016/05/25 by Jeremiah.Waldron When creating our own ConfigCacheIni in GetConfigCacheIni_APL, do not assume that the Engine ini was requested. Instead use the baseIniName passed to the function. Change 2990393 on 2016/05/25 by Mark.Satterthwaite Back out changelist 2961310 - causes more problems than it solves. DistanceField rendering will still work on Intel Metal SM5 and may work on AMD but will be broken on Nvidia due to a bad access within the compute shader - there's no bounds checking in Metal... Change 2990516 on 2016/05/25 by Brent.Pease + UEPLAT-1294 - Support for local notifications + UEPLAT-1254 - Add BP event for device orientation change + Added a new class based on UGameInstance for mobile device callbacks + Ensured IOSAppDelegate.cpp follows convention for lambda functions Change 2991361 on 2016/05/26 by Jeremiah.Waldron Move InAppPurchase class to StoreHelper.java so GooglePlay and Amazon store helpers can use it Change 2992450 on 2016/05/27 by Mark.Satterthwaite Optional r.Shaders.BoundsChecking flag to control whether shader platforms should manually enforce buffer access bounds - HLSL returns zero or ignores invalid reads & writes but Metal leaves the behaviour undefined and some drivers then fail. By default this is off and its whatever the native platform behaviour is, enabling it will cost some amount of performance as the shader translator inserts additional instructions to try and match D3D as accurately as possible. This is required to fix GPU restart errors on some Metal drivers when using SM5 rendering features including DistanceField shaders. Change 2993027 on 2016/05/27 by Mark.Satterthwaite Fix typo for new CFLAG_BoundsChecking enumeration value. Change 2993594 on 2016/05/27 by Mark.Satterthwaite Build fix - check not assert... Change 2993595 on 2016/05/27 by Mark.Satterthwaite Fix typo from Xcode hang... Change 2993614 on 2016/05/28 by Mark.Satterthwaite At least for now enable shader zero-initialisation and bounds-checking on Mac to ensure that Metal shaders are compiled with semantics that approximate those HLSL assumes. This may cost some performance but will avoid a few GPU restarts on some vendor drivers. Change 2993747 on 2016/05/28 by Mark.Satterthwaite Separate texture & buffer references in the Metal backend as they bind to separate arrays in the runtime to avoid giving the side-table buffer an innaccessible binding index. Also the side-table doesn't need to be emitted if no buffer SRV or UAV is used. Change 2994256 on 2016/05/31 by Lee.Clark PS4 - Fix unitialized Head Position from HMD tracker when tracking fails. Fixes a problem with A3D audio not working. #codereview Chad.Taylor,Aaron.McLeran Change 2994281 on 2016/05/31 by Rolando.Caloca DP - Allow hlslcc to process type casts containing the 'const' keyword - it isn't strictly complete as it will simply omit the type qualifier from the cast in the AST but it is sufficient for FortniteFoliage_MasterMaterial to compile. #codereview Mark.Satterthwaite, Dmitry.Rekman #jira UE-31411 Change 2994467 on 2016/05/31 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 2994493 on 2016/05/31 by Daniel.Lamb Fixed issue with DDC commandlet not caching things from the startup packages list. Change 2994644 on 2016/05/31 by Mark.Satterthwaite Updated hlslcc Mac binaries with fix for UE-31411 which RCO accepted and submitted + script for building parsers on POSIX OSes hooked up to an Xcode scheme in the project. Change 2996074 on 2016/06/01 by Lee.Clark PS4 - Fix GS mode not getting disabled when using parallel contexts. #codereview Marcus.Wassmer Change 2996129 on 2016/06/01 by Brent.Pease Manual merge of Pete's dsym generation fix (CL#2996089) from the 4.12 branch. Change 2996130 on 2016/06/01 by Jeremiah.Waldron PR #2387 part 2 (Contributed by gameDNAstudio) Adding ability to consume purchases during GooglePlay RestorePurchases This also touches IOS due to changes to base classes and function signatures #codereview chris.babcock, Peter.Sauerbrei Change 2996441 on 2016/06/01 by Jeremiah.Waldron Relates to PR #2387: Adding ability to consume purchases during GooglePlay RestorePurchases (Contributed by gameDNAstudio) Missing changes from part 2 reworked so that there is still only one RestorePurchases function which takes the product IDs and consumable flags. I reflected this in StoreHelper so no casting is necessary in GameActivity and the soon-to-be-added AmazonStoreHelper in the GameCircle plugin will still work dynamically with GameActivity since it will call StoreHelper functionality rather than a GooglePlayStoreHelper specific function. #codereview chris.babcock Change 2996514 on 2016/06/01 by Jeff.Campeau Fix merge issue from main #jira UE-31502 Change 2996740 on 2016/06/01 by Jonathan.Fitzpatrick https://jira.ol.epicgames.net/browse/UE-31446 Two PS4 source files fail during unity builds due to name conflict with handleReserveFailed. Renamed handleReserveFailed to handleReserveFailedLightweight Change 2997235 on 2016/06/01 by Jeremiah.Waldron RestorePurchases fix up in Match3 since the new Restore consumable stuff adds an additional pin to the Restore node. The IAP product in Match3 is non-consumable so just passing an empty array where necessary Change 2997241 on 2016/06/01 by Jeremiah.Waldron OnlineSubsystemGameCircle Plugin - Leaderboards - Achievements - Friends - IAP - External UI Interface - Runtime Settings in Project Settings Plugin section when plugin is enabled - Disabled by default #jira UEPLAT-105 #codereview chris.babcock Change 2997618 on 2016/06/02 by Lee.Clark #UE4Docs: Removed PS4MapFileUtil info Change 2997840 on 2016/06/02 by Jeremiah.Waldron Removing trace logging from OnlineSubsystemGameCircle_APL Change 2998754 on 2016/06/02 by Brent.Pease Change BlueprintMobileLibrary to BlueprintPlatformLibrary Change 3000762 on 2016/06/03 by Jeff.Campeau Add example rating info to ShooterGame Change 3001037 on 2016/06/04 by Brent.Pease + Add ui screens for delegate test, local notification test, and iap test + Implement delegate test Change 3001250 on 2016/06/05 by Brent.Pease + Initial pass at IAP test screen Change 3001639 on 2016/06/06 by Jeff.Campeau Fix Xbox One build issue with DX12 #codereview Zabir.Hoque Change 3002574 on 2016/06/06 by Jeremiah.Waldron Adding Android Install Location to Android platform runtime settings and manifest generation Change 3002780 on 2016/06/06 by Brent.Pease + Initial implementation of local notification test Change 3003005 on 2016/06/06 by Jeremiah.Waldron OnlineSubsystemGameCircle plugin - adding setting for Fire TV support. Using that specification in the APL to Add/Update android.hardware.touchscreen feature required attribute Change 3004392 on 2016/06/07 by Jeremiah.Waldron Fixing typo in APL comment :) Change 3005768 on 2016/06/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3005929 on 2016/06/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3006151 on 2016/06/08 by Peter.Sauerbrei fix for LocalNotifications not available on TVOS #lockdown josh.adams Change 3006183 on 2016/06/08 by Brent.Pease Manual merge CL#3000242 from Release-4.12 into Dev-Platform #lockdown josh.adams Change 3006296 on 2016/06/08 by Peter.Sauerbrei submit an updated iPhonePackager and support DLLs #lockdown josh.adams Change 3006378 on 2016/06/08 by Peter.Sauerbrei fix for API update to RestorePurchases #codereview brent.pease #lockdown josh.adams #lockdown nick.penwarden [CL 3008183 by Josh Adams in Main branch]
2016-06-09 17:45:44 -04:00
SAssignNew(BundleIdTextBox, SEditableTextBox) \
.IsEnabled(this, &FIOSTargetSettingsCustomization::IsImportEnabled) \
.Text(this, &FIOSTargetSettingsCustomization::GetBundleText, PropertyHandle) \
.Font(DetailLayout.GetDetailFont()) \
.SelectAllTextOnCommit( true ) \
.SelectAllTextWhenFocused( true ) \
.ClearKeyboardFocusOnCommit(false) \
.ToolTipText(PropertyHandle->GetToolTipText()) \
.OnTextCommitted(this, &FIOSTargetSettingsCustomization::OnBundleIdentifierChanged, PropertyHandle) \
Copying //UE4/Dev-Platform to //UE4/Main (Source: //UE4/Dev-Platform @ 3008177) ========================== MAJOR FEATURES + CHANGES ========================== Change 2948322 on 2016/04/19 by Nick.Shin update libwebsockets to v1.7.4 part 4 of 4 - doing this in stages for tracking purposes #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2970016 on 2016/05/07 by Nick.Shin undo all of the following upgrades: - zlib - openssl - libcurl - libwebsockets and reset webrtc #jira UE-30298 - Fortnite and Orion crash on login #lockdown josh.adams Change 2970373 on 2016/05/09 by Lee.Clark PS4 - Fix NumInstances not getting reset after DrawIndirect calls Change 2972873 on 2016/05/10 by Michael.Trepka Correct initial position for SlateViewer windows on Mac Change 2974363 on 2016/05/11 by Mark.Satterthwaite Fix invoking buils using distcc from UFE - the command-line executed to access the number of parallel tasks was incorrect. Change 2975921 on 2016/05/12 by Michael.Trepka Removed unused AdjustWindowRegion declaration from LinuxWindow.h #codereview Dmitry.Rekman Change 2977002 on 2016/05/13 by Michael.Trepka Make sure dSYM generation action in UBT on Mac does not start before the source dylib is ready #codereview Ben.Marsh Change 2977337 on 2016/05/13 by Brent.Pease UE-27805 - Adding special characters into the BundleDisplayName or BundleName causes packaging error + Prevent illegal characters from being entered in the packaging UI + Report an error from iPhonePackager if a illegal bundle id is specified + Convert special characters to XML equivalents - Correctly check for the presence of iTunes 12 when packaging iOS games on Windows - Improve ios certificate and provision message in package settings UI #codereview peter.sauerbrei Change 2977509 on 2016/05/13 by Brent.Pease + Fix mac compile error Change 2978036 on 2016/05/14 by Mark.Satterthwaite One-line tweak that resolves incorrect rendering of the colour LUT because float imprecision allows -ve values to be passed into a call to pow which then generates NaN. #jira UE-30777 Change 2978037 on 2016/05/14 by Mark.Satterthwaite Fix a heap-use-after-free bug spotted by AddressSanitizer - you can't assume that the UObject system will be available in ShutdownModule() - on OS X it may have been killed a long time ago. Change 2978333 on 2016/05/16 by Lee.Clark Fix packaging of non-code projects when plugins are enabled #codereview Peter.Sauerbrei Change 2978780 on 2016/05/16 by Mark.Satterthwaite Reduce temporary allocations required to set uniform parameters in Metal. Change 2979680 on 2016/05/16 by Nick.Shin editor's HTML5 platform settings was missing due to the emscripten SDK move should have been included with CL: #2946251 Change 2979681 on 2016/05/16 by Nick.Shin cleaned up websocket processing for HTML5 #jira UE-13657 - HTML5 plugin OnRawRecieve overflow Change 2979701 on 2016/05/16 by Brent.Pease UE-28421 - Message box cannot be closed after accessing the home screen on iOS + Implement a timeout when waiting for a reply after sending background/foreground/suspend events from the main thread to the game thread. This solves the immediate problem presented in the jira bug report, however, there are deeper issues with the consequences of blocking the game thread that are not addressed. Perhaps structuring the game thread loop to know about modal dialogs so that it can receive these events even when a modal dialog is up could be a better longer term solution Change 2980766 on 2016/05/17 by Jeremiah.Waldron Adding Android build support for HarfBuzz - using a combination of android-cmake (from https://github.com/taka-no-me/android-cmake) to create the build files and Visual Studio 2015 to compile them - Adding Debug and RelWithDebInfo compiled binaries to harfbuzz-1.2.4/Android/<arch>/<config> Tested armv7 with TextShapingTest project on a GalaxyNote3 and text showed up correctly #jira UE-28586 #codereview chris.babcock Change 2980953 on 2016/05/17 by Jeremiah.Waldron Changing HarfBuzz build script and libs to use Release instead of RelWithDebInfo #jira UE-28586 Change 2981039 on 2016/05/17 by Jeff.Campeau ICMP support disabled for Xbox One and basic address processing wrappers provided (needed for Oodle support) Change 2981054 on 2016/05/17 by Jeff.Campeau Enable Live OSS for Orion on Xbox One Change 2981553 on 2016/05/18 by Jeff.Campeau Enable Oodle for Xbox One Change 2981555 on 2016/05/18 by Jeff.Campeau Scalability settings for Xbox One Change 2981774 on 2016/05/18 by Keith.Judge Xbox One - Duplicating Movie Player fix from 4.12. Change 2981789 on 2016/05/18 by Keith.Judge Xbox One - Duplicate fast semantics rendertarget unbind/clear/rebind fix from 4.12. Change 2981802 on 2016/05/18 by Keith.Judge Xbox One - Duplicate of distance field AO/Shadow fixes from 4.12. Change 2981875 on 2016/05/18 by Keith.Judge Xbox One - Dynamic VB/IB refactor. Duplicated from 4.12. Change 2981900 on 2016/05/18 by Keith.Judge Xbox One - D3D11Query refactor. Duplicated from 4.12 Change 2981945 on 2016/05/18 by Nick.Shin filled out response headers for HTML5 platform #jira UE-26047 - HTML5 HTTP Response Headers not implemented Change 2981981 on 2016/05/18 by Lee.Clark PS4 - Fix COTF not updating files #codereview Daniel.Lamb Change 2982246 on 2016/05/18 by Michael.Trepka Fixed Mono compile errors in UT build scripts Change 2983869 on 2016/05/19 by Mark.Satterthwaite Explicitly retain/release all the MTLTexture objects in FMetalSurface without the assumptions about them being the same object - the recent stencil & SRV related changes make those assumptions invalid and could lead to over-releasing some textures. #jira UE-29557 Change 2983871 on 2016/05/19 by Mark.Satterthwaite Pool Metal texture update buffers to reduce churn. Change 2983892 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2972885: Enable Metal resource lifetime delay on all platforms, not just iOS to try and address intermittent invalid resource errors. Change 2983898 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2982825: Correctly wait for the dispatch semaphore when clearing the Metal resource free lists. Change 2983911 on 2016/05/19 by Mark.Satterthwaite Change Metal SubmitCommandsHint to use an enum of flags rather than boolean variables to control behaviour so that its clearer to the reader what is going to happen. Change 2983916 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2974765: Workaround for UE-30069 - on Nvidia Macs we are breaking the GMux swap the second time we run the engine and it isn't clear why, so instead explicitly select the Metal device ourselves and don't allow the OS to swap the GPU driving the display. This will potentially reduce performance a little if the discrete GPU isn't already driving the display but until we know how we are clobbering the GMux/driver it is all we can do. This only applies to 10.11.5 with the default OS X drivers where there is more than one GPU in the system, earlier versions of OS X and the Nvidia WebDrivers are unaffected. Change 2984874 on 2016/05/20 by Keith.Judge Xbox One - Re-enable shader DXBC intermediate bytecode stripping, except for geometry and hull shaders where there's a possibility of runtime recompilation in certain combinations. Saves ~2MB in TM-ShaderModels, will save more in larger maps. #jira UEPLAT-1295 Change 2985446 on 2016/05/20 by Mark.Satterthwaite Remove the non-functional -metaldebug option from MetalRHI. Change 2985827 on 2016/05/20 by Nick.Shin call EndSession() onbeforeunload() note: API CHANGE - HTML5JavaScripteFx.{js,h} - UE_MakeHTTPDataRequest() #jira UE-22285 - Session End events are not generated for HTML5 Change 2986013 on 2016/05/20 by Jeremiah.Waldron PR #2387: In-App Purchases - parameters needed for Receipt Validation (Contributed by gameDNAstudio) Also touches IOS because of added RawPrice member in FInAppPurchaseProductInfo Pulled from Release-4.12 CL #jira UE-30782 #codereview chris.babcock, Peter.Sauerbrei Change 2986057 on 2016/05/20 by Mark.Satterthwaite Further changes to ensure that UE-30710 really is fixed while also not live-leaking memory in MetalRHI. Change 2986059 on 2016/05/20 by Mark.Satterthwaite Move the Metal uniform buffers into the same resource pool as all the other buffers and add stats for how many buffers are in the pool, how much memory is in use, free and wasted (due to aligned-buffer sizes). Change 2986060 on 2016/05/20 by Mark.Satterthwaite Disable tiled-reflections on Nvidia & Intel Metal until they sort out the sample command on cube-arrays ignoring the lod level. Change 2986063 on 2016/05/20 by Mark.Satterthwaite Missing change from previous CL. Change 2986066 on 2016/05/20 by Mark.Satterthwaite More Metal stats tracking the number & memory size of id<MTLBuffer>'s allocated/released each frame. Change 2986455 on 2016/05/23 by Keith.Judge Xbox One - Fix precompile promise in shader compiler to not stop subsequent defines from being parsed by D3DCompiler. Change 2986886 on 2016/05/23 by Mark.Satterthwaite Duplicate 4.12 CL #2986880: Fix UE-31124 due to bad array iteration logic - amazing that this hadn't been seen earlier. Change 2986955 on 2016/05/23 by Brent.Pease + Do not error out if "[PROJECT_NAME]" is in the bundle ID #codereview peter.sauerbrei Change 2987304 on 2016/05/23 by Chris.Babcock Remove old Android platforms #ue4 #android #codeview Josh.Adams Change 2987571 on 2016/05/23 by Mark.Satterthwaite Duplicate CL #2967998: Integrate - MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) #jira UE-31111 Change 2987591 on 2016/05/23 by Mark.Satterthwaite Remove usage of MTLRender/ComputeEncoder setSamplerState/s calls that take Min & Max Lod overrides - they currently don't work as expected on some GPU drivers and as we don't use them anywhere and I can't see that we will removing them costs us nothing and fixes tiled reflections on Nvidia with Metal SM5. Change 2987679 on 2016/05/23 by Mark.Satterthwaite Re-enable tiled reflections on Nvidia by default now that they work. Change 2987799 on 2016/05/24 by Mark.Satterthwaite Add a shader compile option "r.Shaders.ZeroInitialise" that we can turn on to force explicit zero-initialisation of local & temporary variables in hlslcc - so far only implemented for Metal. The default behaviour remains to omit zero-initialisation but the option is helpful to eliminate or track down uninitialised access in shaders that are causing real bugs (e.g. POM material relying on zero-initialised loop counters causing hangs/bad rendering on Mac). Change 2989395 on 2016/05/25 by Lee.Clark PS4 - Fix shader output / render target format mismatch for sparse MRT. Change 2990003 on 2016/05/25 by Jeremiah.Waldron When creating our own ConfigCacheIni in GetConfigCacheIni_APL, do not assume that the Engine ini was requested. Instead use the baseIniName passed to the function. Change 2990393 on 2016/05/25 by Mark.Satterthwaite Back out changelist 2961310 - causes more problems than it solves. DistanceField rendering will still work on Intel Metal SM5 and may work on AMD but will be broken on Nvidia due to a bad access within the compute shader - there's no bounds checking in Metal... Change 2990516 on 2016/05/25 by Brent.Pease + UEPLAT-1294 - Support for local notifications + UEPLAT-1254 - Add BP event for device orientation change + Added a new class based on UGameInstance for mobile device callbacks + Ensured IOSAppDelegate.cpp follows convention for lambda functions Change 2991361 on 2016/05/26 by Jeremiah.Waldron Move InAppPurchase class to StoreHelper.java so GooglePlay and Amazon store helpers can use it Change 2992450 on 2016/05/27 by Mark.Satterthwaite Optional r.Shaders.BoundsChecking flag to control whether shader platforms should manually enforce buffer access bounds - HLSL returns zero or ignores invalid reads & writes but Metal leaves the behaviour undefined and some drivers then fail. By default this is off and its whatever the native platform behaviour is, enabling it will cost some amount of performance as the shader translator inserts additional instructions to try and match D3D as accurately as possible. This is required to fix GPU restart errors on some Metal drivers when using SM5 rendering features including DistanceField shaders. Change 2993027 on 2016/05/27 by Mark.Satterthwaite Fix typo for new CFLAG_BoundsChecking enumeration value. Change 2993594 on 2016/05/27 by Mark.Satterthwaite Build fix - check not assert... Change 2993595 on 2016/05/27 by Mark.Satterthwaite Fix typo from Xcode hang... Change 2993614 on 2016/05/28 by Mark.Satterthwaite At least for now enable shader zero-initialisation and bounds-checking on Mac to ensure that Metal shaders are compiled with semantics that approximate those HLSL assumes. This may cost some performance but will avoid a few GPU restarts on some vendor drivers. Change 2993747 on 2016/05/28 by Mark.Satterthwaite Separate texture & buffer references in the Metal backend as they bind to separate arrays in the runtime to avoid giving the side-table buffer an innaccessible binding index. Also the side-table doesn't need to be emitted if no buffer SRV or UAV is used. Change 2994256 on 2016/05/31 by Lee.Clark PS4 - Fix unitialized Head Position from HMD tracker when tracking fails. Fixes a problem with A3D audio not working. #codereview Chad.Taylor,Aaron.McLeran Change 2994281 on 2016/05/31 by Rolando.Caloca DP - Allow hlslcc to process type casts containing the 'const' keyword - it isn't strictly complete as it will simply omit the type qualifier from the cast in the AST but it is sufficient for FortniteFoliage_MasterMaterial to compile. #codereview Mark.Satterthwaite, Dmitry.Rekman #jira UE-31411 Change 2994467 on 2016/05/31 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 2994493 on 2016/05/31 by Daniel.Lamb Fixed issue with DDC commandlet not caching things from the startup packages list. Change 2994644 on 2016/05/31 by Mark.Satterthwaite Updated hlslcc Mac binaries with fix for UE-31411 which RCO accepted and submitted + script for building parsers on POSIX OSes hooked up to an Xcode scheme in the project. Change 2996074 on 2016/06/01 by Lee.Clark PS4 - Fix GS mode not getting disabled when using parallel contexts. #codereview Marcus.Wassmer Change 2996129 on 2016/06/01 by Brent.Pease Manual merge of Pete's dsym generation fix (CL#2996089) from the 4.12 branch. Change 2996130 on 2016/06/01 by Jeremiah.Waldron PR #2387 part 2 (Contributed by gameDNAstudio) Adding ability to consume purchases during GooglePlay RestorePurchases This also touches IOS due to changes to base classes and function signatures #codereview chris.babcock, Peter.Sauerbrei Change 2996441 on 2016/06/01 by Jeremiah.Waldron Relates to PR #2387: Adding ability to consume purchases during GooglePlay RestorePurchases (Contributed by gameDNAstudio) Missing changes from part 2 reworked so that there is still only one RestorePurchases function which takes the product IDs and consumable flags. I reflected this in StoreHelper so no casting is necessary in GameActivity and the soon-to-be-added AmazonStoreHelper in the GameCircle plugin will still work dynamically with GameActivity since it will call StoreHelper functionality rather than a GooglePlayStoreHelper specific function. #codereview chris.babcock Change 2996514 on 2016/06/01 by Jeff.Campeau Fix merge issue from main #jira UE-31502 Change 2996740 on 2016/06/01 by Jonathan.Fitzpatrick https://jira.ol.epicgames.net/browse/UE-31446 Two PS4 source files fail during unity builds due to name conflict with handleReserveFailed. Renamed handleReserveFailed to handleReserveFailedLightweight Change 2997235 on 2016/06/01 by Jeremiah.Waldron RestorePurchases fix up in Match3 since the new Restore consumable stuff adds an additional pin to the Restore node. The IAP product in Match3 is non-consumable so just passing an empty array where necessary Change 2997241 on 2016/06/01 by Jeremiah.Waldron OnlineSubsystemGameCircle Plugin - Leaderboards - Achievements - Friends - IAP - External UI Interface - Runtime Settings in Project Settings Plugin section when plugin is enabled - Disabled by default #jira UEPLAT-105 #codereview chris.babcock Change 2997618 on 2016/06/02 by Lee.Clark #UE4Docs: Removed PS4MapFileUtil info Change 2997840 on 2016/06/02 by Jeremiah.Waldron Removing trace logging from OnlineSubsystemGameCircle_APL Change 2998754 on 2016/06/02 by Brent.Pease Change BlueprintMobileLibrary to BlueprintPlatformLibrary Change 3000762 on 2016/06/03 by Jeff.Campeau Add example rating info to ShooterGame Change 3001037 on 2016/06/04 by Brent.Pease + Add ui screens for delegate test, local notification test, and iap test + Implement delegate test Change 3001250 on 2016/06/05 by Brent.Pease + Initial pass at IAP test screen Change 3001639 on 2016/06/06 by Jeff.Campeau Fix Xbox One build issue with DX12 #codereview Zabir.Hoque Change 3002574 on 2016/06/06 by Jeremiah.Waldron Adding Android Install Location to Android platform runtime settings and manifest generation Change 3002780 on 2016/06/06 by Brent.Pease + Initial implementation of local notification test Change 3003005 on 2016/06/06 by Jeremiah.Waldron OnlineSubsystemGameCircle plugin - adding setting for Fire TV support. Using that specification in the APL to Add/Update android.hardware.touchscreen feature required attribute Change 3004392 on 2016/06/07 by Jeremiah.Waldron Fixing typo in APL comment :) Change 3005768 on 2016/06/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3005929 on 2016/06/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3006151 on 2016/06/08 by Peter.Sauerbrei fix for LocalNotifications not available on TVOS #lockdown josh.adams Change 3006183 on 2016/06/08 by Brent.Pease Manual merge CL#3000242 from Release-4.12 into Dev-Platform #lockdown josh.adams Change 3006296 on 2016/06/08 by Peter.Sauerbrei submit an updated iPhonePackager and support DLLs #lockdown josh.adams Change 3006378 on 2016/06/08 by Peter.Sauerbrei fix for API update to RestorePurchases #codereview brent.pease #lockdown josh.adams #lockdown nick.penwarden [CL 3008183 by Josh Adams in Main branch]
2016-06-09 17:45:44 -04:00
.OnTextChanged(this, &FIOSTargetSettingsCustomization::OnBundleIdentifierTextChanged, ETextCommit::Default, PropertyHandle) \
] \
]; \
}
const UIOSRuntimeSettings& Settings = *GetDefault<UIOSRuntimeSettings>();
SETUP_PLIST_PROP(BundleDisplayName, BundleCategory);
SETUP_PLIST_PROP(BundleName, BundleCategory);
SETUP_STATUS_PROP(BundleIdentifier, BundleCategory);
SETUP_PLIST_PROP(VersionInfo, BundleCategory);
SETUP_PLIST_PROP(bSupportsPortraitOrientation, OrientationCategory);
SETUP_PLIST_PROP(bSupportsUpsideDownOrientation, OrientationCategory);
SETUP_PLIST_PROP(bSupportsLandscapeLeftOrientation, OrientationCategory);
SETUP_PLIST_PROP(bSupportsLandscapeRightOrientation, OrientationCategory);
SETUP_PLIST_PROP(bSupportsMetal, RenderCategory);
SETUP_PLIST_PROP(bSupportsOpenGLES2, RenderCategory);
SETUP_PLIST_PROP(bSupportsIPad, DeviceCategory);
SETUP_PLIST_PROP(bSupportsIPhone, DeviceCategory);
SETUP_PLIST_PROP(MinimumiOSVersion, OSInfoCategory);
SETUP_PLIST_PROP(AdditionalPlistData, ExtraCategory);
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
#undef SETUP_SOURCEONLY_PROP
}
void FIOSTargetSettingsCustomization::BuildRemoteBuildingSection(IDetailLayoutBuilder& DetailLayout)
{
#if PLATFORM_WINDOWS
IDetailCategoryBuilder& BuildCategory = DetailLayout.EditCategory(TEXT("Build"));
// Sub group we wish to add remote building options to.
FText RemoteBuildingGroupName = LOCTEXT("RemoteBuildingGroupName", "Remote Build Options");
IDetailGroup& RemoteBuildingGroup = BuildCategory.AddGroup(*RemoteBuildingGroupName.ToString(), RemoteBuildingGroupName, false);
// Remote Server Name Property
TSharedRef<IPropertyHandle> RemoteServerNamePropertyHandle = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UIOSRuntimeSettings, RemoteServerName));
IDetailPropertyRow& RemoteServerNamePropertyRow = RemoteBuildingGroup.AddPropertyRow(RemoteServerNamePropertyHandle);
RemoteServerNamePropertyRow
.ToolTip(LOCTEXT("RemoteServerNameToolTip", "The name or ip address of the remote mac which will be used to build IOS"))
.CustomWidget()
.NameContent()
[
SNew(SHorizontalBox)
+ SHorizontalBox::Slot()
.Padding(FMargin(0, 1, 0, 1))
.FillWidth(1.0f)
[
SNew(STextBlock)
.Text(LOCTEXT("RemoteServerNameLabel", "Remote Server Name"))
.Font(DetailLayout.GetDetailFont())
]
]
.ValueContent()
.MinDesiredWidth(150.0f)
[
SNew(SHorizontalBox)
+ SHorizontalBox::Slot()
.Padding(FMargin(0.0f, 8.0f))
[
SNew(SEditableTextBox)
.IsEnabled(this, &FIOSTargetSettingsCustomization::IsImportEnabled)
.Text(this, &FIOSTargetSettingsCustomization::GetBundleText, RemoteServerNamePropertyHandle)
.Font(DetailLayout.GetDetailFont())
.SelectAllTextOnCommit(true)
.SelectAllTextWhenFocused(true)
.ClearKeyboardFocusOnCommit(false)
.ToolTipText(RemoteServerNamePropertyHandle->GetToolTipText())
.OnTextCommitted(this, &FIOSTargetSettingsCustomization::OnRemoteServerChanged, RemoteServerNamePropertyHandle)
]
];
// Add Use RSync Property
TSharedRef<IPropertyHandle> UseRSyncPropertyHandle = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UIOSRuntimeSettings, bUseRSync));
BuildCategory.AddProperty(UseRSyncPropertyHandle)
.Visibility(EVisibility::Hidden);
// Add RSync Username Property
TSharedRef<IPropertyHandle> RSyncUsernamePropertyHandle = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UIOSRuntimeSettings, RSyncUsername));
IDetailPropertyRow& RSyncUsernamePropertyRow = RemoteBuildingGroup.AddPropertyRow(RSyncUsernamePropertyHandle);
RSyncUsernamePropertyRow
.ToolTip(LOCTEXT("RSyncUsernameToolTip", "The username of the mac user that matches the specified SSH Key."))
.CustomWidget()
.NameContent()
[
SNew(SHorizontalBox)
+ SHorizontalBox::Slot()
.Padding(FMargin(0, 1, 0, 1))
.FillWidth(1.0f)
[
SNew(STextBlock)
.Text(LOCTEXT("RSyncUserNameLabel", "RSync User Name"))
.Font(DetailLayout.GetDetailFont())
]
]
.ValueContent()
.MinDesiredWidth(150.0f)
[
SNew(SHorizontalBox)
+ SHorizontalBox::Slot()
.Padding(FMargin(0.0f, 8.0f))
[
SNew(SEditableTextBox)
.IsEnabled(this, &FIOSTargetSettingsCustomization::IsImportEnabled)
.Text(this, &FIOSTargetSettingsCustomization::GetBundleText, RSyncUsernamePropertyHandle)
.Font(DetailLayout.GetDetailFont())
.SelectAllTextOnCommit(true)
.SelectAllTextWhenFocused(true)
.ClearKeyboardFocusOnCommit(false)
.ToolTipText(RSyncUsernamePropertyHandle->GetToolTipText())
.OnTextCommitted(this, &FIOSTargetSettingsCustomization::OnRemoteServerChanged, RSyncUsernamePropertyHandle)
]
];
// Add existing SSH path label.
TSharedRef<IPropertyHandle> SSHPrivateKeyLocationPropertyHandle = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UIOSRuntimeSettings, SSHPrivateKeyLocation));
IDetailPropertyRow& SSHPrivateKeyLocationPropertyRow = RemoteBuildingGroup.AddPropertyRow(SSHPrivateKeyLocationPropertyHandle);
SSHPrivateKeyLocationPropertyRow
.ToolTip(LOCTEXT("SSHPrivateKeyLocationToolTip", "The existing location of an SSH Key found by UE4."));
// Add SSH override path
TSharedRef<IPropertyHandle> SSHPrivateKeyOverridePathPropertyHandle = DetailLayout.GetProperty(GET_MEMBER_NAME_CHECKED(UIOSRuntimeSettings, SSHPrivateKeyOverridePath));
IDetailPropertyRow& SSHPrivateKeyOverridePathPropertyRow = RemoteBuildingGroup.AddPropertyRow(SSHPrivateKeyOverridePathPropertyHandle);
SSHPrivateKeyOverridePathPropertyRow
.ToolTip(LOCTEXT("SSHPrivateKeyOverridePathToolTip", "Override the existing SSH Private Key with one from a specified location."));
const FText GenerateSSHText = LOCTEXT("GenerateSSHKey", "Generate SSH Key");
// Add a generate key button
RemoteBuildingGroup.AddWidgetRow()
.FilterString(GenerateSSHText)
.WholeRowWidget
.MinDesiredWidth(0.f)
.MaxDesiredWidth(0.f)
.HAlign(HAlign_Fill)
[
SNew(SVerticalBox)
+ SVerticalBox::Slot()
.AutoHeight()
[
SNew(SHorizontalBox)
+ SHorizontalBox::Slot()
.Padding(FMargin(0, 5, 0, 10))
.AutoWidth()
[
SNew(SButton)
.HAlign(HAlign_Center)
.VAlign(VAlign_Center)
.OnClicked(this, &FIOSTargetSettingsCustomization::OnGenerateSSHKey)
.IsEnabled(this, &FIOSTargetSettingsCustomization::IsImportEnabled)
[
SNew(STextBlock)
.Text(GenerateSSHText)
]
]
]
];
#endif
}
void FIOSTargetSettingsCustomization::BuildIconSection(IDetailLayoutBuilder& DetailLayout)
{
IDetailCategoryBuilder& RequiredIconCategory = DetailLayout.EditCategory(TEXT("Required Icons"));
IDetailCategoryBuilder& OptionalIconCategory = DetailLayout.EditCategory(TEXT("Optional Icons"));
// Add the icons
for (const FPlatformIconInfo& Info : IconNames)
{
const FVector2D IconImageMaxSize(Info.IconRequiredSize);
IDetailCategoryBuilder& IconCategory = (Info.RequiredState == FPlatformIconInfo::Required) ? RequiredIconCategory : OptionalIconCategory;
BuildImageRow(DetailLayout, IconCategory, Info, IconImageMaxSize);
}
// Add the launch images
IDetailCategoryBuilder& LaunchImageCategory = DetailLayout.EditCategory(TEXT("Launch Images"));
const FVector2D LaunchImageMaxSize(150.0f, 150.0f);
for (const FPlatformIconInfo& Info : LaunchImageNames)
{
BuildImageRow(DetailLayout, LaunchImageCategory, Info, LaunchImageMaxSize);
}
}
FReply FIOSTargetSettingsCustomization::OpenPlistFolder()
{
const FString EditPlistFolder = FPaths::ConvertRelativePathToFull(FPaths::GetPath(GameInfoPath));
FPlatformProcess::ExploreFolder(*EditPlistFolder);
return FReply::Handled();
}
void FIOSTargetSettingsCustomization::CopySetupFilesIntoProject()
{
// First copy the plist, it must get copied
FText ErrorMessage;
if (!SourceControlHelpers::CopyFileUnderSourceControl(GameInfoPath, EngineInfoPath, LOCTEXT("InfoPlist", "Info.plist"), /*out*/ ErrorMessage))
{
FNotificationInfo Info(ErrorMessage);
Info.ExpireDuration = 3.0f;
FSlateNotificationManager::Get().AddNotification(Info);
}
else
{
// Now try to copy all of the icons, etc... (these can be ignored if the file already exists)
TArray<FPlatformIconInfo> Graphics;
Graphics.Empty(IconNames.Num() + LaunchImageNames.Num());
Graphics.Append(IconNames);
Graphics.Append(LaunchImageNames);
for (const FPlatformIconInfo& Info : Graphics)
{
const FString EngineImagePath = EngineGraphicsPath / Info.IconPath;
const FString ProjectImagePath = GameGraphicsPath / Info.IconPath;
if (!FPaths::FileExists(ProjectImagePath))
{
SourceControlHelpers::CopyFileUnderSourceControl(ProjectImagePath, EngineImagePath, Info.IconName, /*out*/ ErrorMessage);
}
}
}
SavedLayoutBuilder->ForceRefreshDetails();
}
void FIOSTargetSettingsCustomization::BuildImageRow(IDetailLayoutBuilder& DetailLayout, IDetailCategoryBuilder& Category, const FPlatformIconInfo& Info, const FVector2D& MaxDisplaySize)
{
const FString AutomaticImagePath = EngineGraphicsPath / Info.IconPath;
const FString TargetImagePath = GameGraphicsPath / Info.IconPath;
Category.AddCustomRow(Info.IconName)
.NameContent()
[
SNew(SHorizontalBox)
+ SHorizontalBox::Slot()
.Padding(FMargin(0, 1, 0, 1))
.FillWidth(1.0f)
[
SNew(STextBlock)
.Text(Info.IconName)
.Font(DetailLayout.GetDetailFont())
]
]
.ValueContent()
.MaxDesiredWidth(400.0f)
.MinDesiredWidth(100.0f)
[
SNew(SHorizontalBox)
+ SHorizontalBox::Slot()
.FillWidth(1.0f)
.VAlign(VAlign_Center)
[
SNew(SExternalImageReference, AutomaticImagePath, TargetImagePath)
.FileDescription(Info.IconDescription)
.RequiredSize(Info.IconRequiredSize)
.MaxDisplaySize(MaxDisplaySize)
]
];
}
void FIOSTargetSettingsCustomization::FindRequiredFiles()
{
const UIOSRuntimeSettings& Settings = *GetDefault<UIOSRuntimeSettings>();
Copying //UE4/Dev-Platform to //UE4/Main (Source: //UE4/Dev-Platform @ 3008177) ========================== MAJOR FEATURES + CHANGES ========================== Change 2948322 on 2016/04/19 by Nick.Shin update libwebsockets to v1.7.4 part 4 of 4 - doing this in stages for tracking purposes #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2970016 on 2016/05/07 by Nick.Shin undo all of the following upgrades: - zlib - openssl - libcurl - libwebsockets and reset webrtc #jira UE-30298 - Fortnite and Orion crash on login #lockdown josh.adams Change 2970373 on 2016/05/09 by Lee.Clark PS4 - Fix NumInstances not getting reset after DrawIndirect calls Change 2972873 on 2016/05/10 by Michael.Trepka Correct initial position for SlateViewer windows on Mac Change 2974363 on 2016/05/11 by Mark.Satterthwaite Fix invoking buils using distcc from UFE - the command-line executed to access the number of parallel tasks was incorrect. Change 2975921 on 2016/05/12 by Michael.Trepka Removed unused AdjustWindowRegion declaration from LinuxWindow.h #codereview Dmitry.Rekman Change 2977002 on 2016/05/13 by Michael.Trepka Make sure dSYM generation action in UBT on Mac does not start before the source dylib is ready #codereview Ben.Marsh Change 2977337 on 2016/05/13 by Brent.Pease UE-27805 - Adding special characters into the BundleDisplayName or BundleName causes packaging error + Prevent illegal characters from being entered in the packaging UI + Report an error from iPhonePackager if a illegal bundle id is specified + Convert special characters to XML equivalents - Correctly check for the presence of iTunes 12 when packaging iOS games on Windows - Improve ios certificate and provision message in package settings UI #codereview peter.sauerbrei Change 2977509 on 2016/05/13 by Brent.Pease + Fix mac compile error Change 2978036 on 2016/05/14 by Mark.Satterthwaite One-line tweak that resolves incorrect rendering of the colour LUT because float imprecision allows -ve values to be passed into a call to pow which then generates NaN. #jira UE-30777 Change 2978037 on 2016/05/14 by Mark.Satterthwaite Fix a heap-use-after-free bug spotted by AddressSanitizer - you can't assume that the UObject system will be available in ShutdownModule() - on OS X it may have been killed a long time ago. Change 2978333 on 2016/05/16 by Lee.Clark Fix packaging of non-code projects when plugins are enabled #codereview Peter.Sauerbrei Change 2978780 on 2016/05/16 by Mark.Satterthwaite Reduce temporary allocations required to set uniform parameters in Metal. Change 2979680 on 2016/05/16 by Nick.Shin editor's HTML5 platform settings was missing due to the emscripten SDK move should have been included with CL: #2946251 Change 2979681 on 2016/05/16 by Nick.Shin cleaned up websocket processing for HTML5 #jira UE-13657 - HTML5 plugin OnRawRecieve overflow Change 2979701 on 2016/05/16 by Brent.Pease UE-28421 - Message box cannot be closed after accessing the home screen on iOS + Implement a timeout when waiting for a reply after sending background/foreground/suspend events from the main thread to the game thread. This solves the immediate problem presented in the jira bug report, however, there are deeper issues with the consequences of blocking the game thread that are not addressed. Perhaps structuring the game thread loop to know about modal dialogs so that it can receive these events even when a modal dialog is up could be a better longer term solution Change 2980766 on 2016/05/17 by Jeremiah.Waldron Adding Android build support for HarfBuzz - using a combination of android-cmake (from https://github.com/taka-no-me/android-cmake) to create the build files and Visual Studio 2015 to compile them - Adding Debug and RelWithDebInfo compiled binaries to harfbuzz-1.2.4/Android/<arch>/<config> Tested armv7 with TextShapingTest project on a GalaxyNote3 and text showed up correctly #jira UE-28586 #codereview chris.babcock Change 2980953 on 2016/05/17 by Jeremiah.Waldron Changing HarfBuzz build script and libs to use Release instead of RelWithDebInfo #jira UE-28586 Change 2981039 on 2016/05/17 by Jeff.Campeau ICMP support disabled for Xbox One and basic address processing wrappers provided (needed for Oodle support) Change 2981054 on 2016/05/17 by Jeff.Campeau Enable Live OSS for Orion on Xbox One Change 2981553 on 2016/05/18 by Jeff.Campeau Enable Oodle for Xbox One Change 2981555 on 2016/05/18 by Jeff.Campeau Scalability settings for Xbox One Change 2981774 on 2016/05/18 by Keith.Judge Xbox One - Duplicating Movie Player fix from 4.12. Change 2981789 on 2016/05/18 by Keith.Judge Xbox One - Duplicate fast semantics rendertarget unbind/clear/rebind fix from 4.12. Change 2981802 on 2016/05/18 by Keith.Judge Xbox One - Duplicate of distance field AO/Shadow fixes from 4.12. Change 2981875 on 2016/05/18 by Keith.Judge Xbox One - Dynamic VB/IB refactor. Duplicated from 4.12. Change 2981900 on 2016/05/18 by Keith.Judge Xbox One - D3D11Query refactor. Duplicated from 4.12 Change 2981945 on 2016/05/18 by Nick.Shin filled out response headers for HTML5 platform #jira UE-26047 - HTML5 HTTP Response Headers not implemented Change 2981981 on 2016/05/18 by Lee.Clark PS4 - Fix COTF not updating files #codereview Daniel.Lamb Change 2982246 on 2016/05/18 by Michael.Trepka Fixed Mono compile errors in UT build scripts Change 2983869 on 2016/05/19 by Mark.Satterthwaite Explicitly retain/release all the MTLTexture objects in FMetalSurface without the assumptions about them being the same object - the recent stencil & SRV related changes make those assumptions invalid and could lead to over-releasing some textures. #jira UE-29557 Change 2983871 on 2016/05/19 by Mark.Satterthwaite Pool Metal texture update buffers to reduce churn. Change 2983892 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2972885: Enable Metal resource lifetime delay on all platforms, not just iOS to try and address intermittent invalid resource errors. Change 2983898 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2982825: Correctly wait for the dispatch semaphore when clearing the Metal resource free lists. Change 2983911 on 2016/05/19 by Mark.Satterthwaite Change Metal SubmitCommandsHint to use an enum of flags rather than boolean variables to control behaviour so that its clearer to the reader what is going to happen. Change 2983916 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2974765: Workaround for UE-30069 - on Nvidia Macs we are breaking the GMux swap the second time we run the engine and it isn't clear why, so instead explicitly select the Metal device ourselves and don't allow the OS to swap the GPU driving the display. This will potentially reduce performance a little if the discrete GPU isn't already driving the display but until we know how we are clobbering the GMux/driver it is all we can do. This only applies to 10.11.5 with the default OS X drivers where there is more than one GPU in the system, earlier versions of OS X and the Nvidia WebDrivers are unaffected. Change 2984874 on 2016/05/20 by Keith.Judge Xbox One - Re-enable shader DXBC intermediate bytecode stripping, except for geometry and hull shaders where there's a possibility of runtime recompilation in certain combinations. Saves ~2MB in TM-ShaderModels, will save more in larger maps. #jira UEPLAT-1295 Change 2985446 on 2016/05/20 by Mark.Satterthwaite Remove the non-functional -metaldebug option from MetalRHI. Change 2985827 on 2016/05/20 by Nick.Shin call EndSession() onbeforeunload() note: API CHANGE - HTML5JavaScripteFx.{js,h} - UE_MakeHTTPDataRequest() #jira UE-22285 - Session End events are not generated for HTML5 Change 2986013 on 2016/05/20 by Jeremiah.Waldron PR #2387: In-App Purchases - parameters needed for Receipt Validation (Contributed by gameDNAstudio) Also touches IOS because of added RawPrice member in FInAppPurchaseProductInfo Pulled from Release-4.12 CL #jira UE-30782 #codereview chris.babcock, Peter.Sauerbrei Change 2986057 on 2016/05/20 by Mark.Satterthwaite Further changes to ensure that UE-30710 really is fixed while also not live-leaking memory in MetalRHI. Change 2986059 on 2016/05/20 by Mark.Satterthwaite Move the Metal uniform buffers into the same resource pool as all the other buffers and add stats for how many buffers are in the pool, how much memory is in use, free and wasted (due to aligned-buffer sizes). Change 2986060 on 2016/05/20 by Mark.Satterthwaite Disable tiled-reflections on Nvidia & Intel Metal until they sort out the sample command on cube-arrays ignoring the lod level. Change 2986063 on 2016/05/20 by Mark.Satterthwaite Missing change from previous CL. Change 2986066 on 2016/05/20 by Mark.Satterthwaite More Metal stats tracking the number & memory size of id<MTLBuffer>'s allocated/released each frame. Change 2986455 on 2016/05/23 by Keith.Judge Xbox One - Fix precompile promise in shader compiler to not stop subsequent defines from being parsed by D3DCompiler. Change 2986886 on 2016/05/23 by Mark.Satterthwaite Duplicate 4.12 CL #2986880: Fix UE-31124 due to bad array iteration logic - amazing that this hadn't been seen earlier. Change 2986955 on 2016/05/23 by Brent.Pease + Do not error out if "[PROJECT_NAME]" is in the bundle ID #codereview peter.sauerbrei Change 2987304 on 2016/05/23 by Chris.Babcock Remove old Android platforms #ue4 #android #codeview Josh.Adams Change 2987571 on 2016/05/23 by Mark.Satterthwaite Duplicate CL #2967998: Integrate - MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) #jira UE-31111 Change 2987591 on 2016/05/23 by Mark.Satterthwaite Remove usage of MTLRender/ComputeEncoder setSamplerState/s calls that take Min & Max Lod overrides - they currently don't work as expected on some GPU drivers and as we don't use them anywhere and I can't see that we will removing them costs us nothing and fixes tiled reflections on Nvidia with Metal SM5. Change 2987679 on 2016/05/23 by Mark.Satterthwaite Re-enable tiled reflections on Nvidia by default now that they work. Change 2987799 on 2016/05/24 by Mark.Satterthwaite Add a shader compile option "r.Shaders.ZeroInitialise" that we can turn on to force explicit zero-initialisation of local & temporary variables in hlslcc - so far only implemented for Metal. The default behaviour remains to omit zero-initialisation but the option is helpful to eliminate or track down uninitialised access in shaders that are causing real bugs (e.g. POM material relying on zero-initialised loop counters causing hangs/bad rendering on Mac). Change 2989395 on 2016/05/25 by Lee.Clark PS4 - Fix shader output / render target format mismatch for sparse MRT. Change 2990003 on 2016/05/25 by Jeremiah.Waldron When creating our own ConfigCacheIni in GetConfigCacheIni_APL, do not assume that the Engine ini was requested. Instead use the baseIniName passed to the function. Change 2990393 on 2016/05/25 by Mark.Satterthwaite Back out changelist 2961310 - causes more problems than it solves. DistanceField rendering will still work on Intel Metal SM5 and may work on AMD but will be broken on Nvidia due to a bad access within the compute shader - there's no bounds checking in Metal... Change 2990516 on 2016/05/25 by Brent.Pease + UEPLAT-1294 - Support for local notifications + UEPLAT-1254 - Add BP event for device orientation change + Added a new class based on UGameInstance for mobile device callbacks + Ensured IOSAppDelegate.cpp follows convention for lambda functions Change 2991361 on 2016/05/26 by Jeremiah.Waldron Move InAppPurchase class to StoreHelper.java so GooglePlay and Amazon store helpers can use it Change 2992450 on 2016/05/27 by Mark.Satterthwaite Optional r.Shaders.BoundsChecking flag to control whether shader platforms should manually enforce buffer access bounds - HLSL returns zero or ignores invalid reads & writes but Metal leaves the behaviour undefined and some drivers then fail. By default this is off and its whatever the native platform behaviour is, enabling it will cost some amount of performance as the shader translator inserts additional instructions to try and match D3D as accurately as possible. This is required to fix GPU restart errors on some Metal drivers when using SM5 rendering features including DistanceField shaders. Change 2993027 on 2016/05/27 by Mark.Satterthwaite Fix typo for new CFLAG_BoundsChecking enumeration value. Change 2993594 on 2016/05/27 by Mark.Satterthwaite Build fix - check not assert... Change 2993595 on 2016/05/27 by Mark.Satterthwaite Fix typo from Xcode hang... Change 2993614 on 2016/05/28 by Mark.Satterthwaite At least for now enable shader zero-initialisation and bounds-checking on Mac to ensure that Metal shaders are compiled with semantics that approximate those HLSL assumes. This may cost some performance but will avoid a few GPU restarts on some vendor drivers. Change 2993747 on 2016/05/28 by Mark.Satterthwaite Separate texture & buffer references in the Metal backend as they bind to separate arrays in the runtime to avoid giving the side-table buffer an innaccessible binding index. Also the side-table doesn't need to be emitted if no buffer SRV or UAV is used. Change 2994256 on 2016/05/31 by Lee.Clark PS4 - Fix unitialized Head Position from HMD tracker when tracking fails. Fixes a problem with A3D audio not working. #codereview Chad.Taylor,Aaron.McLeran Change 2994281 on 2016/05/31 by Rolando.Caloca DP - Allow hlslcc to process type casts containing the 'const' keyword - it isn't strictly complete as it will simply omit the type qualifier from the cast in the AST but it is sufficient for FortniteFoliage_MasterMaterial to compile. #codereview Mark.Satterthwaite, Dmitry.Rekman #jira UE-31411 Change 2994467 on 2016/05/31 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 2994493 on 2016/05/31 by Daniel.Lamb Fixed issue with DDC commandlet not caching things from the startup packages list. Change 2994644 on 2016/05/31 by Mark.Satterthwaite Updated hlslcc Mac binaries with fix for UE-31411 which RCO accepted and submitted + script for building parsers on POSIX OSes hooked up to an Xcode scheme in the project. Change 2996074 on 2016/06/01 by Lee.Clark PS4 - Fix GS mode not getting disabled when using parallel contexts. #codereview Marcus.Wassmer Change 2996129 on 2016/06/01 by Brent.Pease Manual merge of Pete's dsym generation fix (CL#2996089) from the 4.12 branch. Change 2996130 on 2016/06/01 by Jeremiah.Waldron PR #2387 part 2 (Contributed by gameDNAstudio) Adding ability to consume purchases during GooglePlay RestorePurchases This also touches IOS due to changes to base classes and function signatures #codereview chris.babcock, Peter.Sauerbrei Change 2996441 on 2016/06/01 by Jeremiah.Waldron Relates to PR #2387: Adding ability to consume purchases during GooglePlay RestorePurchases (Contributed by gameDNAstudio) Missing changes from part 2 reworked so that there is still only one RestorePurchases function which takes the product IDs and consumable flags. I reflected this in StoreHelper so no casting is necessary in GameActivity and the soon-to-be-added AmazonStoreHelper in the GameCircle plugin will still work dynamically with GameActivity since it will call StoreHelper functionality rather than a GooglePlayStoreHelper specific function. #codereview chris.babcock Change 2996514 on 2016/06/01 by Jeff.Campeau Fix merge issue from main #jira UE-31502 Change 2996740 on 2016/06/01 by Jonathan.Fitzpatrick https://jira.ol.epicgames.net/browse/UE-31446 Two PS4 source files fail during unity builds due to name conflict with handleReserveFailed. Renamed handleReserveFailed to handleReserveFailedLightweight Change 2997235 on 2016/06/01 by Jeremiah.Waldron RestorePurchases fix up in Match3 since the new Restore consumable stuff adds an additional pin to the Restore node. The IAP product in Match3 is non-consumable so just passing an empty array where necessary Change 2997241 on 2016/06/01 by Jeremiah.Waldron OnlineSubsystemGameCircle Plugin - Leaderboards - Achievements - Friends - IAP - External UI Interface - Runtime Settings in Project Settings Plugin section when plugin is enabled - Disabled by default #jira UEPLAT-105 #codereview chris.babcock Change 2997618 on 2016/06/02 by Lee.Clark #UE4Docs: Removed PS4MapFileUtil info Change 2997840 on 2016/06/02 by Jeremiah.Waldron Removing trace logging from OnlineSubsystemGameCircle_APL Change 2998754 on 2016/06/02 by Brent.Pease Change BlueprintMobileLibrary to BlueprintPlatformLibrary Change 3000762 on 2016/06/03 by Jeff.Campeau Add example rating info to ShooterGame Change 3001037 on 2016/06/04 by Brent.Pease + Add ui screens for delegate test, local notification test, and iap test + Implement delegate test Change 3001250 on 2016/06/05 by Brent.Pease + Initial pass at IAP test screen Change 3001639 on 2016/06/06 by Jeff.Campeau Fix Xbox One build issue with DX12 #codereview Zabir.Hoque Change 3002574 on 2016/06/06 by Jeremiah.Waldron Adding Android Install Location to Android platform runtime settings and manifest generation Change 3002780 on 2016/06/06 by Brent.Pease + Initial implementation of local notification test Change 3003005 on 2016/06/06 by Jeremiah.Waldron OnlineSubsystemGameCircle plugin - adding setting for Fire TV support. Using that specification in the APL to Add/Update android.hardware.touchscreen feature required attribute Change 3004392 on 2016/06/07 by Jeremiah.Waldron Fixing typo in APL comment :) Change 3005768 on 2016/06/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3005929 on 2016/06/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3006151 on 2016/06/08 by Peter.Sauerbrei fix for LocalNotifications not available on TVOS #lockdown josh.adams Change 3006183 on 2016/06/08 by Brent.Pease Manual merge CL#3000242 from Release-4.12 into Dev-Platform #lockdown josh.adams Change 3006296 on 2016/06/08 by Peter.Sauerbrei submit an updated iPhonePackager and support DLLs #lockdown josh.adams Change 3006378 on 2016/06/08 by Peter.Sauerbrei fix for API update to RestorePurchases #codereview brent.pease #lockdown josh.adams #lockdown nick.penwarden [CL 3008183 by Josh Adams in Main branch]
2016-06-09 17:45:44 -04:00
FString BundleIdentifier = Settings.BundleIdentifier.Replace(*gProjectNameText, FApp::GetGameName());
#if PLATFORM_MAC
FString CmdExe = TEXT("/bin/sh");
FString ScriptPath = FPaths::ConvertRelativePathToFull(FPaths::EngineDir() / TEXT("Build/BatchFiles/Mac/RunMono.sh"));
FString IPPPath = FPaths::ConvertRelativePathToFull(FPaths::EngineDir() / TEXT("Binaries/DotNet/IOS/IPhonePackager.exe"));
FString CommandLine = FString::Printf(TEXT("\"%s\" \"%s\" certificates Engine -bundlename \"%s\""), *ScriptPath, *IPPPath, *(BundleIdentifier));
#else
FString CmdExe = FPaths::ConvertRelativePathToFull(FPaths::EngineDir() / TEXT("Binaries/DotNet/IOS/IPhonePackager.exe"));
FString CommandLine = FString::Printf(TEXT("certificates Engine -bundlename \"%s\""), *(BundleIdentifier));
#endif
IPPProcess = MakeShareable(new FMonitoredProcess(CmdExe, CommandLine, true));
OutputMessage = TEXT("");
IPPProcess->OnOutput().BindStatic(&OnOutput);
IPPProcess->Launch();
TickerHandle = FTicker::GetCoreTicker().AddTicker(FTickerDelegate::CreateRaw(this, &FIOSTargetSettingsCustomization::UpdateStatusDelegate), 1.0f);
if (ProvisionInfoSwitcher.IsValid())
{
ProvisionInfoSwitcher->SetActiveWidgetIndex(0);
}
if (CertificateInfoSwitcher.IsValid())
{
CertificateInfoSwitcher->SetActiveWidgetIndex(0);
}
RunningIPPProcess = true;
}
FReply FIOSTargetSettingsCustomization::OnInstallProvisionClicked()
{
// pass the file to IPP to install
FString ProjectPath = FPaths::IsProjectFilePathSet() ? FPaths::ConvertRelativePathToFull(FPaths::GetProjectFilePath()) : FPaths::RootDir() / FApp::GetGameName() / FApp::GetGameName() + TEXT(".uproject");
FString ProvisionPath;
// get the provision by popping up the file dialog
TArray<FString> OpenFilenames;
IDesktopPlatform* DesktopPlatform = FDesktopPlatformModule::Get();
bool bOpened = false;
int32 FilterIndex = -1;
FString FileTypes = TEXT("Provision Files (*.mobileprovision)|*.mobileprovision");
if ( DesktopPlatform )
{
void* ParentWindowWindowHandle = NULL;
IMainFrameModule& MainFrameModule = FModuleManager::LoadModuleChecked<IMainFrameModule>(TEXT("MainFrame"));
const TSharedPtr<SWindow>& MainFrameParentWindow = MainFrameModule.GetParentWindow();
if ( MainFrameParentWindow.IsValid() && MainFrameParentWindow->GetNativeWindow().IsValid() )
{
ParentWindowWindowHandle = MainFrameParentWindow->GetNativeWindow()->GetOSWindowHandle();
}
bOpened = DesktopPlatform->OpenFileDialog(
ParentWindowWindowHandle,
LOCTEXT("ImportProvisionDialogTitle", "Import Provision").ToString(),
FPaths::GetProjectFilePath(),
TEXT(""),
FileTypes,
EFileDialogFlags::None,
OpenFilenames,
FilterIndex
);
}
if ( bOpened )
{
ProvisionPath = FPaths::ConvertRelativePathToFull(OpenFilenames[0]);
// see if the provision is already installed
FString DestName = FPaths::GetBaseFilename(ProvisionPath);
TCHAR Path[4096];
#if PLATFORM_MAC
FPlatformMisc::GetEnvironmentVariable(TEXT("HOME"), Path, ARRAY_COUNT(Path));
FString Destination = FString::Printf(TEXT("\"%s/Library/MobileDevice/Provisioning Profiles/%s.mobileprovision\""), Path, *DestName);
FString Destination2 = FString::Printf(TEXT("\"%s/Library/MobileDevice/Provisioning Profiles/%s.mobileprovision\""), Path, FApp::GetGameName());
#else
FPlatformMisc::GetEnvironmentVariable(TEXT("LOCALAPPDATA"), Path, ARRAY_COUNT(Path));
FString Destination = FString::Printf(TEXT("%s\\Apple Computer\\MobileDevice\\Provisioning Profiles\\%s.mobileprovision"), Path, *DestName);
FString Destination2 = FString::Printf(TEXT("%s\\Apple Computer\\MobileDevice\\Provisioning Profiles\\%s.mobileprovision"), Path, FApp::GetGameName());
#endif
if (FPaths::FileExists(Destination) || FPaths::FileExists(Destination2))
{
FString MessagePrompt = FString::Printf(TEXT("%s mobile provision file already exists. Do you want to replace this provision?"), *DestName);
if (FPlatformMisc::MessageBoxExt(EAppMsgType::OkCancel, *MessagePrompt, TEXT("File Exists")) == EAppReturnType::Cancel)
{
return FReply::Handled();
}
}
const UIOSRuntimeSettings& Settings = *GetDefault<UIOSRuntimeSettings>();
#if PLATFORM_MAC
FString CmdExe = TEXT("/bin/sh");
FString ScriptPath = FPaths::ConvertRelativePathToFull(FPaths::EngineDir() / TEXT("Build/BatchFiles/Mac/RunMono.sh"));
FString IPPPath = FPaths::ConvertRelativePathToFull(FPaths::EngineDir() / TEXT("Binaries/DotNet/IOS/IPhonePackager.exe"));
FString CommandLine = FString::Printf(TEXT("\"%s\" \"%s\" Install Engine -project \"%s\" -provision \"%s\" -bundlename \"%s\""), *ScriptPath, *IPPPath, *ProjectPath, *ProvisionPath, *(Settings.BundleIdentifier));
#else
FString CmdExe = FPaths::ConvertRelativePathToFull(FPaths::EngineDir() / TEXT("Binaries/DotNet/IOS/IPhonePackager.exe"));
FString CommandLine = FString::Printf(TEXT("Install Engine -project \"%s\" -provision \"%s\" -bundlename \"%s\""), *ProjectPath, *ProvisionPath, *(Settings.BundleIdentifier));
#endif
IPPProcess = MakeShareable(new FMonitoredProcess(CmdExe, CommandLine, true));
OutputMessage = TEXT("");
IPPProcess->OnOutput().BindStatic(&OnOutput);
IPPProcess->Launch();
TickerHandle = FTicker::GetCoreTicker().AddTicker(FTickerDelegate::CreateRaw(this, &FIOSTargetSettingsCustomization::UpdateStatusDelegate), 10.0f);
if (ProvisionInfoSwitcher.IsValid())
{
ProvisionInfoSwitcher->SetActiveWidgetIndex(1);
}
RunningIPPProcess = true;
}
return FReply::Handled();
}
FReply FIOSTargetSettingsCustomization::OnInstallCertificateClicked()
{
// pass the file to IPP to install
FString ProjectPath = FPaths::IsProjectFilePathSet() ? FPaths::ConvertRelativePathToFull(FPaths::GetProjectFilePath()) : FPaths::RootDir() / FApp::GetGameName() / FApp::GetGameName() + TEXT(".uproject");
FString CertPath;
// get the provision by popping up the file dialog
TArray<FString> OpenFilenames;
IDesktopPlatform* DesktopPlatform = FDesktopPlatformModule::Get();
bool bOpened = false;
int32 FilterIndex = -1;
FString FileTypes = TEXT("Code Signing Certificates (*.cer;*.p12)|*.cer;*p12");
if ( DesktopPlatform )
{
void* ParentWindowWindowHandle = NULL;
IMainFrameModule& MainFrameModule = FModuleManager::LoadModuleChecked<IMainFrameModule>(TEXT("MainFrame"));
const TSharedPtr<SWindow>& MainFrameParentWindow = MainFrameModule.GetParentWindow();
if ( MainFrameParentWindow.IsValid() && MainFrameParentWindow->GetNativeWindow().IsValid() )
{
ParentWindowWindowHandle = MainFrameParentWindow->GetNativeWindow()->GetOSWindowHandle();
}
bOpened = DesktopPlatform->OpenFileDialog(
ParentWindowWindowHandle,
LOCTEXT("ImportCertificateDialogTitle", "Import Certificate").ToString(),
FPaths::GetProjectFilePath(),
TEXT(""),
FileTypes,
EFileDialogFlags::None,
OpenFilenames,
FilterIndex
);
}
if ( bOpened )
{
const UIOSRuntimeSettings& Settings = *GetDefault<UIOSRuntimeSettings>();
CertPath = FPaths::ConvertRelativePathToFull(OpenFilenames[0]);
#if PLATFORM_MAC
FString CmdExe = TEXT("/bin/sh");
FString ScriptPath = FPaths::ConvertRelativePathToFull(FPaths::EngineDir() / TEXT("Build/BatchFiles/Mac/RunMono.sh"));
FString IPPPath = FPaths::ConvertRelativePathToFull(FPaths::EngineDir() / TEXT("Binaries/DotNet/IOS/IPhonePackager.exe"));
FString CommandLine = FString::Printf(TEXT("\"%s\" \"%s\" Install Engine -project \"%s\" -certificate \"%s\" -bundlename \"%s\""), *ScriptPath, *IPPPath, *ProjectPath, *CertPath, *(Settings.BundleIdentifier));
#else
FString CmdExe = FPaths::ConvertRelativePathToFull(FPaths::EngineDir() / TEXT("Binaries/DotNet/IOS/IPhonePackager.exe"));
FString CommandLine = FString::Printf(TEXT("Install Engine -project \"%s\" -certificate \"%s\" -bundlename \"%s\""), *ProjectPath, *CertPath, *(Settings.BundleIdentifier));
#endif
IPPProcess = MakeShareable(new FMonitoredProcess(CmdExe, CommandLine, true));
OutputMessage = TEXT("");
IPPProcess->OnOutput().BindStatic(&OnOutput);
IPPProcess->Launch();
TickerHandle = FTicker::GetCoreTicker().AddTicker(FTickerDelegate::CreateRaw(this, &FIOSTargetSettingsCustomization::UpdateStatusDelegate), 10.0f);
if (CertificateInfoSwitcher.IsValid())
{
CertificateInfoSwitcher->SetActiveWidgetIndex(1);
}
RunningIPPProcess = true;
}
return FReply::Handled();
}
FReply FIOSTargetSettingsCustomization::OnCertificateRequestClicked()
{
// TODO: bring up an open file dialog and then install the provision
return FReply::Handled();
}
FReply FIOSTargetSettingsCustomization::OnGenerateSSHKey()
{
// see if the key is already generated
const UIOSRuntimeSettings& Settings = *GetDefault<UIOSRuntimeSettings>();
TCHAR Path[4096];
FPlatformMisc::GetEnvironmentVariable(TEXT("APPDATA"), Path, ARRAY_COUNT(Path));
FString Destination = FString::Printf(TEXT("%s\\Unreal Engine\\UnrealBuildTool\\SSHKeys\\%s\\%s\\RemoteToolChainPrivate.key"), Path, *(Settings.RemoteServerName), *(Settings.RSyncUsername));
if (FPaths::FileExists(Destination))
{
FString MessagePrompt = FString::Printf(TEXT("An SSH Key already exists. Do you want to replace this key?"));
if (FPlatformMisc::MessageBoxExt(EAppMsgType::OkCancel, *MessagePrompt, TEXT("Key Exists")) == EAppReturnType::Cancel)
{
return FReply::Handled();
}
}
FString CmdExe = FPaths::ConvertRelativePathToFull(FPaths::EngineDir() / TEXT("Build/BatchFiles/MakeAndInstallSSHKey.bat"));
FString DeltaCopyPath = Settings.DeltaCopyInstallPath.Path;
Copying //UE4/Dev-Platform to //UE4/Dev-Main (Source: //UE4/Dev-Platform @ 3046626) #rb none #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2948322 on 2016/04/19 by Nick.Shin update libwebsockets to v1.7.4 part 4 of 4 - doing this in stages for tracking purposes #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2970016 on 2016/05/07 by Nick.Shin undo all of the following upgrades: - zlib - openssl - libcurl - libwebsockets and reset webrtc #jira UE-30298 - Fortnite and Orion crash on login Change 3020547 on 2016/06/20 by Jeff.Campeau Support for applocal deployment of binaries -applocaldir added to UAT to specify a per project directory to gather packages for applocal deployment Added ApplocalPrerequisitesDirectory property to packaging settings to set -applocaldir for packages built from the editor. Change 3020552 on 2016/06/20 by Jeff.Campeau Add switch to disable debug symbol cache creation Change 3020567 on 2016/06/20 by Jeff.Campeau constexpr enabled for Xbox One Change 3020568 on 2016/06/20 by Jeff.Campeau Separate setting for debug #jira UEPLAT-1348 Change 3020628 on 2016/06/20 by Jeff.Campeau Use global view instead of relying on current thread (fixes issues if pump message is called from a different thread). Change 3020629 on 2016/06/20 by Jeff.Campeau Use Slate tick to drive message processing during blocking loads (improves PLM). Change 3020633 on 2016/06/20 by Jeff.Campeau Fix Xbox One toolchain pathing to work for environment variables with and without trailing slashes. Pass requested XDK edition to VCVars batch file (fixes issues in building with a newer XDK installed SxS than the engine is configured for). Change 3020873 on 2016/06/21 by Lee.Clark PS4 - Fix missing audio when using A3D. Change 3021225 on 2016/06/21 by Keith.Judge Optimized away a bunch of GetVertexShader() calls in FSplineMeshVertexFactoryShaderParameters::SetMesh(). Saves about 0.9ms across a 100ms capture. Change 3021286 on 2016/06/21 by Dmitry.Rekman Linux: symbolication for memory profiler. - Also repaired/improved finding function name from debug info and overall callstack parsing. #tests Ran Linux editor and TestPAL, crashed multiple times Change 3021512 on 2016/06/21 by Mark.Satterthwaite Compile fixes for new clang version. Change 3021521 on 2016/06/21 by Mark.Satterthwaite Duplicate Fortnite CL #3013418: Don't release Metal buffers directly into the buffer pool, instead defer this until the command-buffer is known to have finished. This prevents the CPU from trying to modify the buffer while the GPU is still reading it if the GPU has fallen so far behind the CPU and therefore eliminates one possible cause of invalid access on the GPU. Change 3021528 on 2016/06/21 by Mark.Satterthwaite Make the Metal buffer pool cull after 30 frames - this will better match Apple's GART which unwires unused allocations after 1sec of idle, making them as expensive to use allocating a new buffer. Change 3021595 on 2016/06/21 by Mark.Satterthwaite Consolidate the way in which optional Metal features are exposed across macOS, iOS & tvOS devices & expose all the available features, unifying more of the code across all three platforms. - Implement Metal Depth-16 and stencil-texture-view support where available. - Use counting queries in Metal when available and expected (i.e. Metal_SM4+ or Metal_MRT+). - On latest iOS devices running Metal export support for GRHISupportsBaseVertexIndex & GRHISupportsFirstInstance when available. - On latest iOS devices running Metal export support for indirect buffer draw and dispatch calls. - Specify Metal layered rendering like any other and change the code so that there aren't preprocessor defines in the code. This lets the Metal MRT path assert if anyone ever tries to issue a layered draw call as its only supported on Mac. - Add support to Metal for setting UAVs from a uniform buffer. - Remove unused GlobalUniform header from MetalRHI. - Remove unnecessary FrameCount delay from Metal resource free lists. Change 3021702 on 2016/06/21 by Mark.Satterthwaite Fix mis-use of FreeListMutex instead of PoolMutex in MetalContext. Change 3022152 on 2016/06/21 by Nick.Shin Back out revision 5 from //UE4/Dev-Platform/Engine/Source/Runtime/NetworkFileSystem/Private/NetworkFileServerHttp.cpp forgot to un-do this when the giant revert (CL: #2970016) was done #jira UE-22166 HTML5 Cook on the fly will launch and then close browser Change 3022409 on 2016/06/21 by Dmitry.Rekman Fixed inability to run Setup.sh on Ubuntu 14.04 (UE-29289). - Contains PR #2258 (contributed by wshearn). Change 3022541 on 2016/06/22 by Lee.Clark PS4 - Make sure the render target masks are set correctly for disabled render targets. Fixes a validation check for shaders expecting to write to NULL render targets. Change 3022973 on 2016/06/22 by Michael.Trepka Fixed a problem in MacToolChain where both BuildConfiguration.bGeneratedSYMFile and BuildConfiguration.bUsePDBFiles set to false would not disable dSYM generation. Change 3023106 on 2016/06/22 by Dmitry.Rekman Linux: enable code to catch memory stomps during async loading. - Changed FLinuxPlatformMemory::BinnedAllocFrom/FreeToOS() to use mmap()/munmap(). Updated platform function signature accordingly. #tests Ran OrionServer on Linux (and OrionClient on Windows as a zero probe), tested also with running Linux editor with binned malloc. Change 3023256 on 2016/06/22 by Mark.Satterthwaite Fix compile errors from latest Metal changes that broke iOS. Change 3023268 on 2016/06/22 by Mark.Satterthwaite Use the Linux mmap/munmap/mprotect code to implement BinnedAllocFromOS/BinnedFreeToOS/PageProtect on Apple platforms as they are all equivalent. Change 3023651 on 2016/06/22 by Mark.Satterthwaite Make Metal SM5 the default for 10.11.5 or later, this time most of the features should be working on AMD & Nvidia, though tiled-reflections and distance-field AO/Shadows must still be forcibly disabled on Intel. Change 3023777 on 2016/06/22 by Brent.Pease + Update config for Android and iOS Change 3023781 on 2016/06/22 by Chris.Babcock Use mmap/munmap for Android BinnedAllocFromOS #ue4 #android Change 3023947 on 2016/06/22 by Mark.Satterthwaite Added a command-line switch for Mac "-RedirectNSLog" that will capture the output of NSLog using an NSPipe and write it into our log instead when not running under the debugger, thereby capturing output from underlying libraries that would otherwise be lost when outside a debugger. Change 3024434 on 2016/06/23 by Lee.Clark PS4 - Remove Delta Color Compression support Change 3024735 on 2016/06/23 by Mark.Satterthwaite Changes to MetalStatistics module initialisation. Change 3024741 on 2016/06/23 by Mark.Satterthwaite Change the way we test for Metal GPU support to avoid instantiating any MTLDevice's until MetalRHI is loaded so we can properly instantiate optional modules. Change 3025477 on 2016/06/23 by Brent.Pease + Added UnrealPluginLanguage.cs based on AndroidPluginLanguage.cs + Change UEDeployAndroid.cs to use UnrealPluginLanguage Change 3026085 on 2016/06/23 by Jeff.Campeau Separate Xbox One target settings for editor only values Move values that need to be loaded by the editor into the default inis (editor won't load target specific inis) Eliminate circular dependency on Xbox One settings (causing settings to either not load or memory corruption on shutdown) Clean up cached ini sections for UBT/UAT Change 3026093 on 2016/06/23 by Jeff.Campeau Cleanup unused files Change 3026745 on 2016/06/24 by Mark.Satterthwaite + Implemented rudimentary runtime debugging of MetalRHI with several different levels of complexity controlled by the new console-variable "rhi.Metal.RuntimeDebugLevel". + The MetalStateCache must also correctly set the render-pass descriptor when the previous render-target load action was 'Clear' as we will need to switch render targets or we'll mistakenly clear again. + Queries must not reset the MetalStateCache when they overflow the available buffer space, they simply break the encoder. - By default "rhi.Metal.RuntimeDebugLevel" is off & it is compiled out for Shipping - when enabled each higher level collects more data or changes the MetalRHI behaviour to make a command-buffer failure mode debuggable at the expense of performance. In order for this to work the number of command-buffers that may be allocated from the command-queue is also controllable via a console-variable "rhi.Metal.CommandQueueSize" which must be set prior to startup. Change 3026831 on 2016/06/24 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3026940 on 2016/06/24 by Brent.Pease PR #2458: added GetGameBundleId blueprint function (Contributed by derekvanvliet) Change 3027396 on 2016/06/24 by Brent.Pease Add BuildGraph.csproj to get Xamarin .sln builds working again Change 3029211 on 2016/06/27 by Michael.Trepka Added a setting (on by default) to make the game window preserve its content's aspect ratio while being resized by user Change 3029518 on 2016/06/27 by Josh.Adams Rollback //UE4/Dev-Platform/Engine/Build/BatchFiles/Mac/xcodeunlock.sh to revision 1 Change 3030385 on 2016/06/28 by Keith.Judge Fix XB1 deployment issues with AppXManifest for Paragon. Change 3030416 on 2016/06/28 by Lee.Clark PS4 - Fix Mediaplayer IsPlaying Change 3030922 on 2016/06/28 by Keith.Judge XB1 - Add pass through _RenderThread resource creation functions to D3D11.x RHI. Stops the render/RHI threads from stalling so much. Change 3030948 on 2016/06/28 by Jeff.Campeau Revert to using constant chunk indexes instead of polling the OS. (OS API has a bug that will not be fixed.) Change 3031016 on 2016/06/28 by Brent.Pease UEPLAT-1244 - Archive dSYM file UEPLAT-1359 - Support creating dSYM bundle Changes: + Added ios settings flag for dsym bundle + Added ios setting for creating xcode archive + xcode archive is now only put in the mac host or build machine's ~/Library/Developer/Xcode/Archives folder, it is not copied into the -archive folder like the ipa is Change 3031352 on 2016/06/28 by Bob.Tellez Added tps file for xcodeunlock Change 3031604 on 2016/06/28 by Mark.Satterthwaite Add an additional cast to flush-to-zero in the Metal shader translator bounds-checking code to avoid an internal GPU compiler error. Change 3031879 on 2016/06/28 by Brent.Pease + PhysX libraries for bitcode support on tvOS. Change 3032374 on 2016/06/29 by Keith.Judge Enable Oodle Handler Component on Xbox One Change 3032407 on 2016/06/29 by Keith.Judge Xbox One - Disable UpdateBufferStats when STATS is 0. Small perf gain. Change 3032432 on 2016/06/29 by Keith.Judge XB1 CPU Perf - Make CreateVertexDeclaration_RenderThread much faster by implementing a pass through to the RHI function rather than stalling the RHI thread. Change 3033474 on 2016/06/29 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3033603 on 2016/06/29 by Brent.Pease + Support UnrealPluginLanguage for IOS and TVOS builds + Allow ios/tvos UPL files an opportunity to modify a package's info.plist file Change 3034004 on 2016/06/30 by Lee.Clark PS4 - Use SDK 3.508.101 Change 3034007 on 2016/06/30 by Lee.Clark PS4 - VRTracker now uses SCE_VR_TRACKER_ROBUSTNESS_LEVEL_HIGH Change 3034173 on 2016/06/30 by Lee.Clark PS4 - Make sure depth target is null when eliminating fast clears. Fixes a GNM Validation failure Change 3034498 on 2016/06/30 by Jeff.Campeau Use MSBuild version 14 when generating project files. Change 3034943 on 2016/06/30 by Mark.Satterthwaite For Metal modify the MTLVertexDescriptor when calls to SetStreamSource provide different strides than the initial vertex-declaration which then requires compiling a different MTLRenderPipelineState. This silences errors reported by the Metal debug layer where the larger stride would see the shader read beyond the end of the buffer, but the smaller stride provided by SetStreamSource would work correctly. This may eliminate some more causes of Page-Fault GPU restarts. Change 3035416 on 2016/07/01 by Lee.Clark PS4 - Replace export vertex shader check with a CFLAG Change 3036093 on 2016/07/01 by Brent.Pease + Fix dSYM bundle path on Windows ios builds + Search for DeltaCopy directory if its not found from the user settings + Do not build an XCArchive file when building for ios on non-mac platforms Change 3036726 on 2016/07/02 by Brent.Pease + Add missing tvOS bitcode library Change 3037455 on 2016/07/05 by Lee.Clark PS4 - Default SmoothFrameRate to false Change 3037470 on 2016/07/05 by Keith.Judge Xbox One - Allow framerate smoothing, but default to off for consistency with PS4. Change 3038322 on 2016/07/05 by Jeremiah.Waldron Fix for asset packages with Unicode characters in their name not being loaded on Android. Fixing AndroidString's WIDECHAR* Strstr(WIDECHAR*, WIDECHAR*) function - Using an implementation of wcsstr, with a fix integrated for the incorrect implementation in Android ndk master branch, instead of converting the incoming WIDECHAR strings to ANSI strings just to be able to use strstr on them. The previous method was prone to causing the FString's Find and Contains functions to return false positives because when we convert wide to ansi, any character over the value of 255 is just set to '?' This in turn caused any package path strings with one of those characters in it to fail to load since they would be interpreted as having a question mark in their path, which is an invalid path character. #jira UE-18643 #android Change 3038693 on 2016/07/05 by Mark.Satterthwaite Change the way we store debug info for Metal shaders - the KeepDebugInfo flag now does precisely that, storing the shader code into the Metal header along with the path it was generated from. That means if KeepDebugInfo is enabled and Optimise is disabled then we can still access the shader code from within the Metal tools. On iOS/tvOS the shader code will be runtime compiled so that it shows up in the tooling but on Macs it will prefer to load the optimised version and simply unpack the shader code to the path from which it was compiled. This only works if we change the Metal shader compiler to emit temporary Metal files to the OS temporary directory so that the tools can read the file directly. Change 3039880 on 2016/07/06 by Mark.Satterthwaite Implement point-light shadow caching for RHI's that support specifying the render target layer from the vertex shader in lieu of geometry shaders. This requires changing FScreenVSForGS to TScreenVSForGS so that there can be a vertex-shader-layer variant (only compiled on RHI's that use it) whose output matches FCopyShadowMapsCubePS input. This alternative rendering path also requires adding the instance count to DrawRectangle so that we can render to all faces of the cubemap from a single draw call. Change 3040407 on 2016/07/06 by Michael.Trepka Added View->Enter Full Screen menu item for games on Mac Change 3040550 on 2016/07/06 by Mark.Satterthwaite Intel Metal compiler requires bool expressions be cast to 'int' rather than 'uint'. Change 3041098 on 2016/07/07 by Peter.Sauerbrei initial changes to get IOS builds from PC in launcher release of engine Change 3041310 on 2016/07/07 by Keith.Judge Xbox One - Optimize away GetDesc() and checks for D3D11_USAGE_DYNAMIC deep in the state cache as it's impossible for any buffer to have that flag set. Change 3041327 on 2016/07/07 by Keith.Judge Xbox One - Remove pointless memory barrier call in D3D11Query Change 3041352 on 2016/07/07 by Keith.Judge Xbox One - Add _RenderThread version of UpdateTexture2D() that just passes through to the RHI one. Saves a fairly significant chunk of time on the render/RHI thread when this is called a lot. Change 3041419 on 2016/07/07 by Jeff.Campeau Xbox One toolchain fix for VS2015 Update 3 Change 3041635 on 2016/07/07 by Jeff.Campeau Don't change game render resolution in response to WM_SIZE messages when in fullscreen (the game will restore the correct video mode when the window is restored). #jira OR-15578 Change 3041735 on 2016/07/07 by Peter.Sauerbrei re-enabled the build parameters for launcher release builds in IOS Change 3041783 on 2016/07/07 by Joe.Graf Changed bAutpApplyFailed to bAutoApplyFailed (typo) Change 3041784 on 2016/07/07 by Joe.Graf Fixed missing %s from a log message in UResavePackagesCommandlet Change 3042434 on 2016/07/08 by Lee.Clark PS4 - Fix compilation failure when Unsafe Command Buffers are enabled. Change 3042658 on 2016/07/08 by Lee.Clark PS4 - Use SDK 3.508.201 Change 3042970 on 2016/07/08 by Josh.Adams Redoing CL in 3040890 in Dev-Platform Change 3043243 on 2016/07/08 by Chris.Babcock clamped allowed slot range for gameplay debugger's categories copy of CL# 3040313 from //UE4/Dev-Framework #jira UE-32866 Change 3043500 on 2016/07/08 by Mark.Satterthwaite Downgrade "-Wdelete-non-virtual-dtor " to a warning again for Xcode 8 on iOS/tvOS to match macOS. Change 3044628 on 2016/07/11 by Mark.Satterthwaite Disable ShaderCache by default - it was implemented prior to RHI-thread/parallel-execution so it isn't thread-safe and can't be enabled by default on Mac now that Metal supports these features. #jira UE-32989 Change 3044948 on 2016/07/11 by Dmitry.Rekman Fix editor crash (happened on Linux, but not really specific to it) (UE-32973) - We can pass flags with shadows enabled when rendering asset thumbnails; thus disable shadows always when r.ShadowQuality is 0. (Redoing CL 3029574 by Bob). - Also fix mismatched 'noperspective' qualifier that caused NVidia drivers to refuse to link GL shaders. #jira UE-32973 Change 3045322 on 2016/07/11 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3046028 on 2016/07/12 by Lee.Clark PS4 - Check for correct SDK installation Allow use of 7th core when Morpheus is enabled Change 3046339 on 2016/07/12 by Peter.Sauerbrei fix for incorrect error message when iPhone Plus icon is the correct size [CL 3046645 by Josh Adams in Main branch]
2016-07-12 15:06:08 -04:00
if (DeltaCopyPath.IsEmpty() || !FPaths::DirectoryExists(DeltaCopyPath))
{
Copying //UE4/Dev-Platform to //UE4/Dev-Main (Source: //UE4/Dev-Platform @ 3046626) #rb none #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2948322 on 2016/04/19 by Nick.Shin update libwebsockets to v1.7.4 part 4 of 4 - doing this in stages for tracking purposes #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2970016 on 2016/05/07 by Nick.Shin undo all of the following upgrades: - zlib - openssl - libcurl - libwebsockets and reset webrtc #jira UE-30298 - Fortnite and Orion crash on login Change 3020547 on 2016/06/20 by Jeff.Campeau Support for applocal deployment of binaries -applocaldir added to UAT to specify a per project directory to gather packages for applocal deployment Added ApplocalPrerequisitesDirectory property to packaging settings to set -applocaldir for packages built from the editor. Change 3020552 on 2016/06/20 by Jeff.Campeau Add switch to disable debug symbol cache creation Change 3020567 on 2016/06/20 by Jeff.Campeau constexpr enabled for Xbox One Change 3020568 on 2016/06/20 by Jeff.Campeau Separate setting for debug #jira UEPLAT-1348 Change 3020628 on 2016/06/20 by Jeff.Campeau Use global view instead of relying on current thread (fixes issues if pump message is called from a different thread). Change 3020629 on 2016/06/20 by Jeff.Campeau Use Slate tick to drive message processing during blocking loads (improves PLM). Change 3020633 on 2016/06/20 by Jeff.Campeau Fix Xbox One toolchain pathing to work for environment variables with and without trailing slashes. Pass requested XDK edition to VCVars batch file (fixes issues in building with a newer XDK installed SxS than the engine is configured for). Change 3020873 on 2016/06/21 by Lee.Clark PS4 - Fix missing audio when using A3D. Change 3021225 on 2016/06/21 by Keith.Judge Optimized away a bunch of GetVertexShader() calls in FSplineMeshVertexFactoryShaderParameters::SetMesh(). Saves about 0.9ms across a 100ms capture. Change 3021286 on 2016/06/21 by Dmitry.Rekman Linux: symbolication for memory profiler. - Also repaired/improved finding function name from debug info and overall callstack parsing. #tests Ran Linux editor and TestPAL, crashed multiple times Change 3021512 on 2016/06/21 by Mark.Satterthwaite Compile fixes for new clang version. Change 3021521 on 2016/06/21 by Mark.Satterthwaite Duplicate Fortnite CL #3013418: Don't release Metal buffers directly into the buffer pool, instead defer this until the command-buffer is known to have finished. This prevents the CPU from trying to modify the buffer while the GPU is still reading it if the GPU has fallen so far behind the CPU and therefore eliminates one possible cause of invalid access on the GPU. Change 3021528 on 2016/06/21 by Mark.Satterthwaite Make the Metal buffer pool cull after 30 frames - this will better match Apple's GART which unwires unused allocations after 1sec of idle, making them as expensive to use allocating a new buffer. Change 3021595 on 2016/06/21 by Mark.Satterthwaite Consolidate the way in which optional Metal features are exposed across macOS, iOS & tvOS devices & expose all the available features, unifying more of the code across all three platforms. - Implement Metal Depth-16 and stencil-texture-view support where available. - Use counting queries in Metal when available and expected (i.e. Metal_SM4+ or Metal_MRT+). - On latest iOS devices running Metal export support for GRHISupportsBaseVertexIndex & GRHISupportsFirstInstance when available. - On latest iOS devices running Metal export support for indirect buffer draw and dispatch calls. - Specify Metal layered rendering like any other and change the code so that there aren't preprocessor defines in the code. This lets the Metal MRT path assert if anyone ever tries to issue a layered draw call as its only supported on Mac. - Add support to Metal for setting UAVs from a uniform buffer. - Remove unused GlobalUniform header from MetalRHI. - Remove unnecessary FrameCount delay from Metal resource free lists. Change 3021702 on 2016/06/21 by Mark.Satterthwaite Fix mis-use of FreeListMutex instead of PoolMutex in MetalContext. Change 3022152 on 2016/06/21 by Nick.Shin Back out revision 5 from //UE4/Dev-Platform/Engine/Source/Runtime/NetworkFileSystem/Private/NetworkFileServerHttp.cpp forgot to un-do this when the giant revert (CL: #2970016) was done #jira UE-22166 HTML5 Cook on the fly will launch and then close browser Change 3022409 on 2016/06/21 by Dmitry.Rekman Fixed inability to run Setup.sh on Ubuntu 14.04 (UE-29289). - Contains PR #2258 (contributed by wshearn). Change 3022541 on 2016/06/22 by Lee.Clark PS4 - Make sure the render target masks are set correctly for disabled render targets. Fixes a validation check for shaders expecting to write to NULL render targets. Change 3022973 on 2016/06/22 by Michael.Trepka Fixed a problem in MacToolChain where both BuildConfiguration.bGeneratedSYMFile and BuildConfiguration.bUsePDBFiles set to false would not disable dSYM generation. Change 3023106 on 2016/06/22 by Dmitry.Rekman Linux: enable code to catch memory stomps during async loading. - Changed FLinuxPlatformMemory::BinnedAllocFrom/FreeToOS() to use mmap()/munmap(). Updated platform function signature accordingly. #tests Ran OrionServer on Linux (and OrionClient on Windows as a zero probe), tested also with running Linux editor with binned malloc. Change 3023256 on 2016/06/22 by Mark.Satterthwaite Fix compile errors from latest Metal changes that broke iOS. Change 3023268 on 2016/06/22 by Mark.Satterthwaite Use the Linux mmap/munmap/mprotect code to implement BinnedAllocFromOS/BinnedFreeToOS/PageProtect on Apple platforms as they are all equivalent. Change 3023651 on 2016/06/22 by Mark.Satterthwaite Make Metal SM5 the default for 10.11.5 or later, this time most of the features should be working on AMD & Nvidia, though tiled-reflections and distance-field AO/Shadows must still be forcibly disabled on Intel. Change 3023777 on 2016/06/22 by Brent.Pease + Update config for Android and iOS Change 3023781 on 2016/06/22 by Chris.Babcock Use mmap/munmap for Android BinnedAllocFromOS #ue4 #android Change 3023947 on 2016/06/22 by Mark.Satterthwaite Added a command-line switch for Mac "-RedirectNSLog" that will capture the output of NSLog using an NSPipe and write it into our log instead when not running under the debugger, thereby capturing output from underlying libraries that would otherwise be lost when outside a debugger. Change 3024434 on 2016/06/23 by Lee.Clark PS4 - Remove Delta Color Compression support Change 3024735 on 2016/06/23 by Mark.Satterthwaite Changes to MetalStatistics module initialisation. Change 3024741 on 2016/06/23 by Mark.Satterthwaite Change the way we test for Metal GPU support to avoid instantiating any MTLDevice's until MetalRHI is loaded so we can properly instantiate optional modules. Change 3025477 on 2016/06/23 by Brent.Pease + Added UnrealPluginLanguage.cs based on AndroidPluginLanguage.cs + Change UEDeployAndroid.cs to use UnrealPluginLanguage Change 3026085 on 2016/06/23 by Jeff.Campeau Separate Xbox One target settings for editor only values Move values that need to be loaded by the editor into the default inis (editor won't load target specific inis) Eliminate circular dependency on Xbox One settings (causing settings to either not load or memory corruption on shutdown) Clean up cached ini sections for UBT/UAT Change 3026093 on 2016/06/23 by Jeff.Campeau Cleanup unused files Change 3026745 on 2016/06/24 by Mark.Satterthwaite + Implemented rudimentary runtime debugging of MetalRHI with several different levels of complexity controlled by the new console-variable "rhi.Metal.RuntimeDebugLevel". + The MetalStateCache must also correctly set the render-pass descriptor when the previous render-target load action was 'Clear' as we will need to switch render targets or we'll mistakenly clear again. + Queries must not reset the MetalStateCache when they overflow the available buffer space, they simply break the encoder. - By default "rhi.Metal.RuntimeDebugLevel" is off & it is compiled out for Shipping - when enabled each higher level collects more data or changes the MetalRHI behaviour to make a command-buffer failure mode debuggable at the expense of performance. In order for this to work the number of command-buffers that may be allocated from the command-queue is also controllable via a console-variable "rhi.Metal.CommandQueueSize" which must be set prior to startup. Change 3026831 on 2016/06/24 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3026940 on 2016/06/24 by Brent.Pease PR #2458: added GetGameBundleId blueprint function (Contributed by derekvanvliet) Change 3027396 on 2016/06/24 by Brent.Pease Add BuildGraph.csproj to get Xamarin .sln builds working again Change 3029211 on 2016/06/27 by Michael.Trepka Added a setting (on by default) to make the game window preserve its content's aspect ratio while being resized by user Change 3029518 on 2016/06/27 by Josh.Adams Rollback //UE4/Dev-Platform/Engine/Build/BatchFiles/Mac/xcodeunlock.sh to revision 1 Change 3030385 on 2016/06/28 by Keith.Judge Fix XB1 deployment issues with AppXManifest for Paragon. Change 3030416 on 2016/06/28 by Lee.Clark PS4 - Fix Mediaplayer IsPlaying Change 3030922 on 2016/06/28 by Keith.Judge XB1 - Add pass through _RenderThread resource creation functions to D3D11.x RHI. Stops the render/RHI threads from stalling so much. Change 3030948 on 2016/06/28 by Jeff.Campeau Revert to using constant chunk indexes instead of polling the OS. (OS API has a bug that will not be fixed.) Change 3031016 on 2016/06/28 by Brent.Pease UEPLAT-1244 - Archive dSYM file UEPLAT-1359 - Support creating dSYM bundle Changes: + Added ios settings flag for dsym bundle + Added ios setting for creating xcode archive + xcode archive is now only put in the mac host or build machine's ~/Library/Developer/Xcode/Archives folder, it is not copied into the -archive folder like the ipa is Change 3031352 on 2016/06/28 by Bob.Tellez Added tps file for xcodeunlock Change 3031604 on 2016/06/28 by Mark.Satterthwaite Add an additional cast to flush-to-zero in the Metal shader translator bounds-checking code to avoid an internal GPU compiler error. Change 3031879 on 2016/06/28 by Brent.Pease + PhysX libraries for bitcode support on tvOS. Change 3032374 on 2016/06/29 by Keith.Judge Enable Oodle Handler Component on Xbox One Change 3032407 on 2016/06/29 by Keith.Judge Xbox One - Disable UpdateBufferStats when STATS is 0. Small perf gain. Change 3032432 on 2016/06/29 by Keith.Judge XB1 CPU Perf - Make CreateVertexDeclaration_RenderThread much faster by implementing a pass through to the RHI function rather than stalling the RHI thread. Change 3033474 on 2016/06/29 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3033603 on 2016/06/29 by Brent.Pease + Support UnrealPluginLanguage for IOS and TVOS builds + Allow ios/tvos UPL files an opportunity to modify a package's info.plist file Change 3034004 on 2016/06/30 by Lee.Clark PS4 - Use SDK 3.508.101 Change 3034007 on 2016/06/30 by Lee.Clark PS4 - VRTracker now uses SCE_VR_TRACKER_ROBUSTNESS_LEVEL_HIGH Change 3034173 on 2016/06/30 by Lee.Clark PS4 - Make sure depth target is null when eliminating fast clears. Fixes a GNM Validation failure Change 3034498 on 2016/06/30 by Jeff.Campeau Use MSBuild version 14 when generating project files. Change 3034943 on 2016/06/30 by Mark.Satterthwaite For Metal modify the MTLVertexDescriptor when calls to SetStreamSource provide different strides than the initial vertex-declaration which then requires compiling a different MTLRenderPipelineState. This silences errors reported by the Metal debug layer where the larger stride would see the shader read beyond the end of the buffer, but the smaller stride provided by SetStreamSource would work correctly. This may eliminate some more causes of Page-Fault GPU restarts. Change 3035416 on 2016/07/01 by Lee.Clark PS4 - Replace export vertex shader check with a CFLAG Change 3036093 on 2016/07/01 by Brent.Pease + Fix dSYM bundle path on Windows ios builds + Search for DeltaCopy directory if its not found from the user settings + Do not build an XCArchive file when building for ios on non-mac platforms Change 3036726 on 2016/07/02 by Brent.Pease + Add missing tvOS bitcode library Change 3037455 on 2016/07/05 by Lee.Clark PS4 - Default SmoothFrameRate to false Change 3037470 on 2016/07/05 by Keith.Judge Xbox One - Allow framerate smoothing, but default to off for consistency with PS4. Change 3038322 on 2016/07/05 by Jeremiah.Waldron Fix for asset packages with Unicode characters in their name not being loaded on Android. Fixing AndroidString's WIDECHAR* Strstr(WIDECHAR*, WIDECHAR*) function - Using an implementation of wcsstr, with a fix integrated for the incorrect implementation in Android ndk master branch, instead of converting the incoming WIDECHAR strings to ANSI strings just to be able to use strstr on them. The previous method was prone to causing the FString's Find and Contains functions to return false positives because when we convert wide to ansi, any character over the value of 255 is just set to '?' This in turn caused any package path strings with one of those characters in it to fail to load since they would be interpreted as having a question mark in their path, which is an invalid path character. #jira UE-18643 #android Change 3038693 on 2016/07/05 by Mark.Satterthwaite Change the way we store debug info for Metal shaders - the KeepDebugInfo flag now does precisely that, storing the shader code into the Metal header along with the path it was generated from. That means if KeepDebugInfo is enabled and Optimise is disabled then we can still access the shader code from within the Metal tools. On iOS/tvOS the shader code will be runtime compiled so that it shows up in the tooling but on Macs it will prefer to load the optimised version and simply unpack the shader code to the path from which it was compiled. This only works if we change the Metal shader compiler to emit temporary Metal files to the OS temporary directory so that the tools can read the file directly. Change 3039880 on 2016/07/06 by Mark.Satterthwaite Implement point-light shadow caching for RHI's that support specifying the render target layer from the vertex shader in lieu of geometry shaders. This requires changing FScreenVSForGS to TScreenVSForGS so that there can be a vertex-shader-layer variant (only compiled on RHI's that use it) whose output matches FCopyShadowMapsCubePS input. This alternative rendering path also requires adding the instance count to DrawRectangle so that we can render to all faces of the cubemap from a single draw call. Change 3040407 on 2016/07/06 by Michael.Trepka Added View->Enter Full Screen menu item for games on Mac Change 3040550 on 2016/07/06 by Mark.Satterthwaite Intel Metal compiler requires bool expressions be cast to 'int' rather than 'uint'. Change 3041098 on 2016/07/07 by Peter.Sauerbrei initial changes to get IOS builds from PC in launcher release of engine Change 3041310 on 2016/07/07 by Keith.Judge Xbox One - Optimize away GetDesc() and checks for D3D11_USAGE_DYNAMIC deep in the state cache as it's impossible for any buffer to have that flag set. Change 3041327 on 2016/07/07 by Keith.Judge Xbox One - Remove pointless memory barrier call in D3D11Query Change 3041352 on 2016/07/07 by Keith.Judge Xbox One - Add _RenderThread version of UpdateTexture2D() that just passes through to the RHI one. Saves a fairly significant chunk of time on the render/RHI thread when this is called a lot. Change 3041419 on 2016/07/07 by Jeff.Campeau Xbox One toolchain fix for VS2015 Update 3 Change 3041635 on 2016/07/07 by Jeff.Campeau Don't change game render resolution in response to WM_SIZE messages when in fullscreen (the game will restore the correct video mode when the window is restored). #jira OR-15578 Change 3041735 on 2016/07/07 by Peter.Sauerbrei re-enabled the build parameters for launcher release builds in IOS Change 3041783 on 2016/07/07 by Joe.Graf Changed bAutpApplyFailed to bAutoApplyFailed (typo) Change 3041784 on 2016/07/07 by Joe.Graf Fixed missing %s from a log message in UResavePackagesCommandlet Change 3042434 on 2016/07/08 by Lee.Clark PS4 - Fix compilation failure when Unsafe Command Buffers are enabled. Change 3042658 on 2016/07/08 by Lee.Clark PS4 - Use SDK 3.508.201 Change 3042970 on 2016/07/08 by Josh.Adams Redoing CL in 3040890 in Dev-Platform Change 3043243 on 2016/07/08 by Chris.Babcock clamped allowed slot range for gameplay debugger's categories copy of CL# 3040313 from //UE4/Dev-Framework #jira UE-32866 Change 3043500 on 2016/07/08 by Mark.Satterthwaite Downgrade "-Wdelete-non-virtual-dtor " to a warning again for Xcode 8 on iOS/tvOS to match macOS. Change 3044628 on 2016/07/11 by Mark.Satterthwaite Disable ShaderCache by default - it was implemented prior to RHI-thread/parallel-execution so it isn't thread-safe and can't be enabled by default on Mac now that Metal supports these features. #jira UE-32989 Change 3044948 on 2016/07/11 by Dmitry.Rekman Fix editor crash (happened on Linux, but not really specific to it) (UE-32973) - We can pass flags with shadows enabled when rendering asset thumbnails; thus disable shadows always when r.ShadowQuality is 0. (Redoing CL 3029574 by Bob). - Also fix mismatched 'noperspective' qualifier that caused NVidia drivers to refuse to link GL shaders. #jira UE-32973 Change 3045322 on 2016/07/11 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3046028 on 2016/07/12 by Lee.Clark PS4 - Check for correct SDK installation Allow use of 7th core when Morpheus is enabled Change 3046339 on 2016/07/12 by Peter.Sauerbrei fix for incorrect error message when iPhone Plus icon is the correct size [CL 3046645 by Josh Adams in Main branch]
2016-07-12 15:06:08 -04:00
// If no user specified directory try the UE4 bundled directory
DeltaCopyPath = FPaths::ConvertRelativePathToFull(FPaths::EngineDir() / TEXT("Extras\\ThirdPartyNotUE\\DeltaCopy\\Binaries"));
}
if (!FPaths::DirectoryExists(DeltaCopyPath))
{
// if no UE4 bundled version of DeltaCopy, try and use the default install location
TCHAR ProgramPath[4096];
FPlatformMisc::GetEnvironmentVariable(TEXT("PROGRAMFILES(X86)"), ProgramPath, ARRAY_COUNT(ProgramPath));
DeltaCopyPath = FPaths::Combine(ProgramPath, TEXT("DeltaCopy"));
}
Copying //UE4/Dev-Platform to //UE4/Dev-Main (Source: //UE4/Dev-Platform @ 3046626) #rb none #lockdown Nick.Penwarden ========================== MAJOR FEATURES + CHANGES ========================== Change 2948322 on 2016/04/19 by Nick.Shin update libwebsockets to v1.7.4 part 4 of 4 - doing this in stages for tracking purposes #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2970016 on 2016/05/07 by Nick.Shin undo all of the following upgrades: - zlib - openssl - libcurl - libwebsockets and reset webrtc #jira UE-30298 - Fortnite and Orion crash on login Change 3020547 on 2016/06/20 by Jeff.Campeau Support for applocal deployment of binaries -applocaldir added to UAT to specify a per project directory to gather packages for applocal deployment Added ApplocalPrerequisitesDirectory property to packaging settings to set -applocaldir for packages built from the editor. Change 3020552 on 2016/06/20 by Jeff.Campeau Add switch to disable debug symbol cache creation Change 3020567 on 2016/06/20 by Jeff.Campeau constexpr enabled for Xbox One Change 3020568 on 2016/06/20 by Jeff.Campeau Separate setting for debug #jira UEPLAT-1348 Change 3020628 on 2016/06/20 by Jeff.Campeau Use global view instead of relying on current thread (fixes issues if pump message is called from a different thread). Change 3020629 on 2016/06/20 by Jeff.Campeau Use Slate tick to drive message processing during blocking loads (improves PLM). Change 3020633 on 2016/06/20 by Jeff.Campeau Fix Xbox One toolchain pathing to work for environment variables with and without trailing slashes. Pass requested XDK edition to VCVars batch file (fixes issues in building with a newer XDK installed SxS than the engine is configured for). Change 3020873 on 2016/06/21 by Lee.Clark PS4 - Fix missing audio when using A3D. Change 3021225 on 2016/06/21 by Keith.Judge Optimized away a bunch of GetVertexShader() calls in FSplineMeshVertexFactoryShaderParameters::SetMesh(). Saves about 0.9ms across a 100ms capture. Change 3021286 on 2016/06/21 by Dmitry.Rekman Linux: symbolication for memory profiler. - Also repaired/improved finding function name from debug info and overall callstack parsing. #tests Ran Linux editor and TestPAL, crashed multiple times Change 3021512 on 2016/06/21 by Mark.Satterthwaite Compile fixes for new clang version. Change 3021521 on 2016/06/21 by Mark.Satterthwaite Duplicate Fortnite CL #3013418: Don't release Metal buffers directly into the buffer pool, instead defer this until the command-buffer is known to have finished. This prevents the CPU from trying to modify the buffer while the GPU is still reading it if the GPU has fallen so far behind the CPU and therefore eliminates one possible cause of invalid access on the GPU. Change 3021528 on 2016/06/21 by Mark.Satterthwaite Make the Metal buffer pool cull after 30 frames - this will better match Apple's GART which unwires unused allocations after 1sec of idle, making them as expensive to use allocating a new buffer. Change 3021595 on 2016/06/21 by Mark.Satterthwaite Consolidate the way in which optional Metal features are exposed across macOS, iOS & tvOS devices & expose all the available features, unifying more of the code across all three platforms. - Implement Metal Depth-16 and stencil-texture-view support where available. - Use counting queries in Metal when available and expected (i.e. Metal_SM4+ or Metal_MRT+). - On latest iOS devices running Metal export support for GRHISupportsBaseVertexIndex & GRHISupportsFirstInstance when available. - On latest iOS devices running Metal export support for indirect buffer draw and dispatch calls. - Specify Metal layered rendering like any other and change the code so that there aren't preprocessor defines in the code. This lets the Metal MRT path assert if anyone ever tries to issue a layered draw call as its only supported on Mac. - Add support to Metal for setting UAVs from a uniform buffer. - Remove unused GlobalUniform header from MetalRHI. - Remove unnecessary FrameCount delay from Metal resource free lists. Change 3021702 on 2016/06/21 by Mark.Satterthwaite Fix mis-use of FreeListMutex instead of PoolMutex in MetalContext. Change 3022152 on 2016/06/21 by Nick.Shin Back out revision 5 from //UE4/Dev-Platform/Engine/Source/Runtime/NetworkFileSystem/Private/NetworkFileServerHttp.cpp forgot to un-do this when the giant revert (CL: #2970016) was done #jira UE-22166 HTML5 Cook on the fly will launch and then close browser Change 3022409 on 2016/06/21 by Dmitry.Rekman Fixed inability to run Setup.sh on Ubuntu 14.04 (UE-29289). - Contains PR #2258 (contributed by wshearn). Change 3022541 on 2016/06/22 by Lee.Clark PS4 - Make sure the render target masks are set correctly for disabled render targets. Fixes a validation check for shaders expecting to write to NULL render targets. Change 3022973 on 2016/06/22 by Michael.Trepka Fixed a problem in MacToolChain where both BuildConfiguration.bGeneratedSYMFile and BuildConfiguration.bUsePDBFiles set to false would not disable dSYM generation. Change 3023106 on 2016/06/22 by Dmitry.Rekman Linux: enable code to catch memory stomps during async loading. - Changed FLinuxPlatformMemory::BinnedAllocFrom/FreeToOS() to use mmap()/munmap(). Updated platform function signature accordingly. #tests Ran OrionServer on Linux (and OrionClient on Windows as a zero probe), tested also with running Linux editor with binned malloc. Change 3023256 on 2016/06/22 by Mark.Satterthwaite Fix compile errors from latest Metal changes that broke iOS. Change 3023268 on 2016/06/22 by Mark.Satterthwaite Use the Linux mmap/munmap/mprotect code to implement BinnedAllocFromOS/BinnedFreeToOS/PageProtect on Apple platforms as they are all equivalent. Change 3023651 on 2016/06/22 by Mark.Satterthwaite Make Metal SM5 the default for 10.11.5 or later, this time most of the features should be working on AMD & Nvidia, though tiled-reflections and distance-field AO/Shadows must still be forcibly disabled on Intel. Change 3023777 on 2016/06/22 by Brent.Pease + Update config for Android and iOS Change 3023781 on 2016/06/22 by Chris.Babcock Use mmap/munmap for Android BinnedAllocFromOS #ue4 #android Change 3023947 on 2016/06/22 by Mark.Satterthwaite Added a command-line switch for Mac "-RedirectNSLog" that will capture the output of NSLog using an NSPipe and write it into our log instead when not running under the debugger, thereby capturing output from underlying libraries that would otherwise be lost when outside a debugger. Change 3024434 on 2016/06/23 by Lee.Clark PS4 - Remove Delta Color Compression support Change 3024735 on 2016/06/23 by Mark.Satterthwaite Changes to MetalStatistics module initialisation. Change 3024741 on 2016/06/23 by Mark.Satterthwaite Change the way we test for Metal GPU support to avoid instantiating any MTLDevice's until MetalRHI is loaded so we can properly instantiate optional modules. Change 3025477 on 2016/06/23 by Brent.Pease + Added UnrealPluginLanguage.cs based on AndroidPluginLanguage.cs + Change UEDeployAndroid.cs to use UnrealPluginLanguage Change 3026085 on 2016/06/23 by Jeff.Campeau Separate Xbox One target settings for editor only values Move values that need to be loaded by the editor into the default inis (editor won't load target specific inis) Eliminate circular dependency on Xbox One settings (causing settings to either not load or memory corruption on shutdown) Clean up cached ini sections for UBT/UAT Change 3026093 on 2016/06/23 by Jeff.Campeau Cleanup unused files Change 3026745 on 2016/06/24 by Mark.Satterthwaite + Implemented rudimentary runtime debugging of MetalRHI with several different levels of complexity controlled by the new console-variable "rhi.Metal.RuntimeDebugLevel". + The MetalStateCache must also correctly set the render-pass descriptor when the previous render-target load action was 'Clear' as we will need to switch render targets or we'll mistakenly clear again. + Queries must not reset the MetalStateCache when they overflow the available buffer space, they simply break the encoder. - By default "rhi.Metal.RuntimeDebugLevel" is off & it is compiled out for Shipping - when enabled each higher level collects more data or changes the MetalRHI behaviour to make a command-buffer failure mode debuggable at the expense of performance. In order for this to work the number of command-buffers that may be allocated from the command-queue is also controllable via a console-variable "rhi.Metal.CommandQueueSize" which must be set prior to startup. Change 3026831 on 2016/06/24 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3026940 on 2016/06/24 by Brent.Pease PR #2458: added GetGameBundleId blueprint function (Contributed by derekvanvliet) Change 3027396 on 2016/06/24 by Brent.Pease Add BuildGraph.csproj to get Xamarin .sln builds working again Change 3029211 on 2016/06/27 by Michael.Trepka Added a setting (on by default) to make the game window preserve its content's aspect ratio while being resized by user Change 3029518 on 2016/06/27 by Josh.Adams Rollback //UE4/Dev-Platform/Engine/Build/BatchFiles/Mac/xcodeunlock.sh to revision 1 Change 3030385 on 2016/06/28 by Keith.Judge Fix XB1 deployment issues with AppXManifest for Paragon. Change 3030416 on 2016/06/28 by Lee.Clark PS4 - Fix Mediaplayer IsPlaying Change 3030922 on 2016/06/28 by Keith.Judge XB1 - Add pass through _RenderThread resource creation functions to D3D11.x RHI. Stops the render/RHI threads from stalling so much. Change 3030948 on 2016/06/28 by Jeff.Campeau Revert to using constant chunk indexes instead of polling the OS. (OS API has a bug that will not be fixed.) Change 3031016 on 2016/06/28 by Brent.Pease UEPLAT-1244 - Archive dSYM file UEPLAT-1359 - Support creating dSYM bundle Changes: + Added ios settings flag for dsym bundle + Added ios setting for creating xcode archive + xcode archive is now only put in the mac host or build machine's ~/Library/Developer/Xcode/Archives folder, it is not copied into the -archive folder like the ipa is Change 3031352 on 2016/06/28 by Bob.Tellez Added tps file for xcodeunlock Change 3031604 on 2016/06/28 by Mark.Satterthwaite Add an additional cast to flush-to-zero in the Metal shader translator bounds-checking code to avoid an internal GPU compiler error. Change 3031879 on 2016/06/28 by Brent.Pease + PhysX libraries for bitcode support on tvOS. Change 3032374 on 2016/06/29 by Keith.Judge Enable Oodle Handler Component on Xbox One Change 3032407 on 2016/06/29 by Keith.Judge Xbox One - Disable UpdateBufferStats when STATS is 0. Small perf gain. Change 3032432 on 2016/06/29 by Keith.Judge XB1 CPU Perf - Make CreateVertexDeclaration_RenderThread much faster by implementing a pass through to the RHI function rather than stalling the RHI thread. Change 3033474 on 2016/06/29 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3033603 on 2016/06/29 by Brent.Pease + Support UnrealPluginLanguage for IOS and TVOS builds + Allow ios/tvos UPL files an opportunity to modify a package's info.plist file Change 3034004 on 2016/06/30 by Lee.Clark PS4 - Use SDK 3.508.101 Change 3034007 on 2016/06/30 by Lee.Clark PS4 - VRTracker now uses SCE_VR_TRACKER_ROBUSTNESS_LEVEL_HIGH Change 3034173 on 2016/06/30 by Lee.Clark PS4 - Make sure depth target is null when eliminating fast clears. Fixes a GNM Validation failure Change 3034498 on 2016/06/30 by Jeff.Campeau Use MSBuild version 14 when generating project files. Change 3034943 on 2016/06/30 by Mark.Satterthwaite For Metal modify the MTLVertexDescriptor when calls to SetStreamSource provide different strides than the initial vertex-declaration which then requires compiling a different MTLRenderPipelineState. This silences errors reported by the Metal debug layer where the larger stride would see the shader read beyond the end of the buffer, but the smaller stride provided by SetStreamSource would work correctly. This may eliminate some more causes of Page-Fault GPU restarts. Change 3035416 on 2016/07/01 by Lee.Clark PS4 - Replace export vertex shader check with a CFLAG Change 3036093 on 2016/07/01 by Brent.Pease + Fix dSYM bundle path on Windows ios builds + Search for DeltaCopy directory if its not found from the user settings + Do not build an XCArchive file when building for ios on non-mac platforms Change 3036726 on 2016/07/02 by Brent.Pease + Add missing tvOS bitcode library Change 3037455 on 2016/07/05 by Lee.Clark PS4 - Default SmoothFrameRate to false Change 3037470 on 2016/07/05 by Keith.Judge Xbox One - Allow framerate smoothing, but default to off for consistency with PS4. Change 3038322 on 2016/07/05 by Jeremiah.Waldron Fix for asset packages with Unicode characters in their name not being loaded on Android. Fixing AndroidString's WIDECHAR* Strstr(WIDECHAR*, WIDECHAR*) function - Using an implementation of wcsstr, with a fix integrated for the incorrect implementation in Android ndk master branch, instead of converting the incoming WIDECHAR strings to ANSI strings just to be able to use strstr on them. The previous method was prone to causing the FString's Find and Contains functions to return false positives because when we convert wide to ansi, any character over the value of 255 is just set to '?' This in turn caused any package path strings with one of those characters in it to fail to load since they would be interpreted as having a question mark in their path, which is an invalid path character. #jira UE-18643 #android Change 3038693 on 2016/07/05 by Mark.Satterthwaite Change the way we store debug info for Metal shaders - the KeepDebugInfo flag now does precisely that, storing the shader code into the Metal header along with the path it was generated from. That means if KeepDebugInfo is enabled and Optimise is disabled then we can still access the shader code from within the Metal tools. On iOS/tvOS the shader code will be runtime compiled so that it shows up in the tooling but on Macs it will prefer to load the optimised version and simply unpack the shader code to the path from which it was compiled. This only works if we change the Metal shader compiler to emit temporary Metal files to the OS temporary directory so that the tools can read the file directly. Change 3039880 on 2016/07/06 by Mark.Satterthwaite Implement point-light shadow caching for RHI's that support specifying the render target layer from the vertex shader in lieu of geometry shaders. This requires changing FScreenVSForGS to TScreenVSForGS so that there can be a vertex-shader-layer variant (only compiled on RHI's that use it) whose output matches FCopyShadowMapsCubePS input. This alternative rendering path also requires adding the instance count to DrawRectangle so that we can render to all faces of the cubemap from a single draw call. Change 3040407 on 2016/07/06 by Michael.Trepka Added View->Enter Full Screen menu item for games on Mac Change 3040550 on 2016/07/06 by Mark.Satterthwaite Intel Metal compiler requires bool expressions be cast to 'int' rather than 'uint'. Change 3041098 on 2016/07/07 by Peter.Sauerbrei initial changes to get IOS builds from PC in launcher release of engine Change 3041310 on 2016/07/07 by Keith.Judge Xbox One - Optimize away GetDesc() and checks for D3D11_USAGE_DYNAMIC deep in the state cache as it's impossible for any buffer to have that flag set. Change 3041327 on 2016/07/07 by Keith.Judge Xbox One - Remove pointless memory barrier call in D3D11Query Change 3041352 on 2016/07/07 by Keith.Judge Xbox One - Add _RenderThread version of UpdateTexture2D() that just passes through to the RHI one. Saves a fairly significant chunk of time on the render/RHI thread when this is called a lot. Change 3041419 on 2016/07/07 by Jeff.Campeau Xbox One toolchain fix for VS2015 Update 3 Change 3041635 on 2016/07/07 by Jeff.Campeau Don't change game render resolution in response to WM_SIZE messages when in fullscreen (the game will restore the correct video mode when the window is restored). #jira OR-15578 Change 3041735 on 2016/07/07 by Peter.Sauerbrei re-enabled the build parameters for launcher release builds in IOS Change 3041783 on 2016/07/07 by Joe.Graf Changed bAutpApplyFailed to bAutoApplyFailed (typo) Change 3041784 on 2016/07/07 by Joe.Graf Fixed missing %s from a log message in UResavePackagesCommandlet Change 3042434 on 2016/07/08 by Lee.Clark PS4 - Fix compilation failure when Unsafe Command Buffers are enabled. Change 3042658 on 2016/07/08 by Lee.Clark PS4 - Use SDK 3.508.201 Change 3042970 on 2016/07/08 by Josh.Adams Redoing CL in 3040890 in Dev-Platform Change 3043243 on 2016/07/08 by Chris.Babcock clamped allowed slot range for gameplay debugger's categories copy of CL# 3040313 from //UE4/Dev-Framework #jira UE-32866 Change 3043500 on 2016/07/08 by Mark.Satterthwaite Downgrade "-Wdelete-non-virtual-dtor " to a warning again for Xcode 8 on iOS/tvOS to match macOS. Change 3044628 on 2016/07/11 by Mark.Satterthwaite Disable ShaderCache by default - it was implemented prior to RHI-thread/parallel-execution so it isn't thread-safe and can't be enabled by default on Mac now that Metal supports these features. #jira UE-32989 Change 3044948 on 2016/07/11 by Dmitry.Rekman Fix editor crash (happened on Linux, but not really specific to it) (UE-32973) - We can pass flags with shadows enabled when rendering asset thumbnails; thus disable shadows always when r.ShadowQuality is 0. (Redoing CL 3029574 by Bob). - Also fix mismatched 'noperspective' qualifier that caused NVidia drivers to refuse to link GL shaders. #jira UE-32973 Change 3045322 on 2016/07/11 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3046028 on 2016/07/12 by Lee.Clark PS4 - Check for correct SDK installation Allow use of 7th core when Morpheus is enabled Change 3046339 on 2016/07/12 by Peter.Sauerbrei fix for incorrect error message when iPhone Plus icon is the correct size [CL 3046645 by Josh Adams in Main branch]
2016-07-12 15:06:08 -04:00
if (!FPaths::DirectoryExists(DeltaCopyPath))
{
UE_LOG(LogIOSTargetSettings, Error, TEXT("DeltaCopy is not installed correctly"));
}
FString CygwinPath = TEXT("/cygdrive/") + FString(Path).Replace(TEXT(":"), TEXT("")).Replace(TEXT("\\"), TEXT("/"));
FString EnginePath = FPaths::EngineDir();
FString CommandLine = FString::Printf(TEXT("\"%s\\ssh.exe\" \"%s\\rsync.exe\" %s %s \"%s\" \"%s\" \"%s\""),
*DeltaCopyPath,
*DeltaCopyPath,
*(Settings.RSyncUsername),
*(Settings.RemoteServerName),
Path,
*CygwinPath,
*EnginePath);
OutputMessage = TEXT("");
IPPProcess = MakeShareable(new FMonitoredProcess(CmdExe, CommandLine, false, false));
IPPProcess->Launch();
TickerHandle = FTicker::GetCoreTicker().AddTicker(FTickerDelegate::CreateRaw(this, &FIOSTargetSettingsCustomization::UpdateStatusDelegate), 10.0f);
RunningIPPProcess = true;
return FReply::Handled();
}
const FSlateBrush* FIOSTargetSettingsCustomization::GetProvisionStatus() const
{
if( bProvisionInstalled )
{
return FEditorStyle::GetBrush("Automation.Success");
}
else
{
return FEditorStyle::GetBrush("Automation.Fail");
}
}
const FSlateBrush* FIOSTargetSettingsCustomization::GetCertificateStatus() const
{
if( bCertificateInstalled )
{
return FEditorStyle::GetBrush("Automation.Success");
}
else
{
return FEditorStyle::GetBrush("Automation.Fail");
}
}
bool FIOSTargetSettingsCustomization::UpdateStatusDelegate(float DeltaTime)
{
if (IPPProcess.IsValid())
{
if (IPPProcess->IsRunning())
{
return true;
}
int RetCode = IPPProcess->GetReturnCode();
IPPProcess = NULL;
UpdateStatus();
UpdateSSHStatus();
}
RunningIPPProcess = false;
return false;
}
TSharedRef<ITableRow> FIOSTargetSettingsCustomization::HandleProvisionListGenerateRow( ProvisionPtr InProvision, const TSharedRef<STableViewBase>& OwnerTable )
{
return SNew(SProvisionListRow, OwnerTable)
.Provision(InProvision)
.ProvisionList(ProvisionList)
.OnProvisionChanged(this, &FIOSTargetSettingsCustomization::HandleProvisionChanged);
}
void FIOSTargetSettingsCustomization::HandleProvisionChanged(FString Provision)
{
FText OutText;
MobileProvisionProperty->GetValueAsFormattedText(OutText);
if (OutText.ToString() != Provision)
{
MobileProvisionProperty->SetValueFromFormattedString(Provision);
}
SignCertificateProperty->GetValueAsFormattedText(OutText);
if (Provision == TEXT("") && OutText.ToString() == TEXT(""))
{
bManuallySelected = false;
FilterLists();
}
else if (!bManuallySelected)
{
bManuallySelected = true;
FilterLists();
}
}
void FIOSTargetSettingsCustomization::HandleCertificateChanged(FString Certificate)
{
FText OutText;
SignCertificateProperty->GetValueAsFormattedText(OutText);
if (OutText.ToString() != Certificate)
{
SignCertificateProperty->SetValueFromFormattedString(Certificate);
}
MobileProvisionProperty->GetValueAsFormattedText(OutText);
if (Certificate == TEXT("") && OutText.ToString() == TEXT(""))
{
bManuallySelected = false;
FilterLists();
}
else if (!bManuallySelected)
{
bManuallySelected = true;
FilterLists();
}
}
TSharedRef<ITableRow> FIOSTargetSettingsCustomization::HandleCertificateListGenerateRow( CertificatePtr InCertificate, const TSharedRef<STableViewBase>& OwnerTable )
{
return SNew(SCertificateListRow, OwnerTable)
.Certificate(InCertificate)
.CertificateList(CertificateList)
.OnCertificateChanged(this, &FIOSTargetSettingsCustomization::HandleCertificateChanged);
}
void FIOSTargetSettingsCustomization::HandleAllProvisionsHyperlinkNavigate( bool AllProvisions )
{
bShowAllProvisions = AllProvisions;
FilterLists();
}
void FIOSTargetSettingsCustomization::HandleAllCertificatesHyperlinkNavigate( bool AllCertificates )
{
bShowAllCertificates = AllCertificates;
FilterLists();
}
void FIOSTargetSettingsCustomization::FilterLists()
{
FilteredProvisionList.Reset();
FilteredCertificateList.Reset();
for (int Index = 0; Index < ProvisionList->Num(); ++Index)
{
if (SelectedProvision.Contains((*ProvisionList)[Index]->Name) && SelectedFile.Contains((*ProvisionList)[Index]->FileName) && !bManuallySelected)
{
(*ProvisionList)[Index]->bSelected = true;
}
else
{
(*ProvisionList)[Index]->bSelected = false;
}
if (bShowAllProvisions || (*ProvisionList)[Index]->Status.Contains("VALID"))
{
FilteredProvisionList.Add((*ProvisionList)[Index]);
}
}
if (ProvisionList->Num() > 0)
{
if (ProvisionInfoSwitcher.IsValid())
{
ProvisionInfoSwitcher->SetActiveWidgetIndex(3);
}
if (FilteredProvisionList.Num() == 0 && !bShowAllProvisions)
{
FilteredProvisionList.Append(*ProvisionList);
}
}
else
{
if (ProvisionInfoSwitcher.IsValid())
{
ProvisionInfoSwitcher->SetActiveWidgetIndex(2);
}
}
for (int Index = 0; Index < CertificateList->Num(); ++Index)
{
if (SelectedCert.Contains((*CertificateList)[Index]->Name) && !bManuallySelected)
{
(*CertificateList)[Index]->bSelected = true;
}
else
{
(*CertificateList)[Index]->bSelected = false;
}
if (bShowAllCertificates || (*CertificateList)[Index]->Status.Contains("VALID"))
{
FilteredCertificateList.Add((*CertificateList)[Index]);
}
}
if (CertificateList->Num() > 0)
{
if (CertificateInfoSwitcher.IsValid())
{
CertificateInfoSwitcher->SetActiveWidgetIndex(3);
}
if (FilteredCertificateList.Num() == 0 && !bShowAllCertificates)
{
FilteredCertificateList.Append(*CertificateList);
}
}
else
{
if (CertificateInfoSwitcher.IsValid())
{
CertificateInfoSwitcher->SetActiveWidgetIndex(2);
}
}
CertificateListView->RequestListRefresh();
ProvisionListView->RequestListRefresh();
}
bool FIOSTargetSettingsCustomization::IsImportEnabled() const
{
return !RunningIPPProcess.Get();
}
void FIOSTargetSettingsCustomization::OnBundleIdentifierChanged(const FText& NewText, ETextCommit::Type CommitType, TSharedRef<IPropertyHandle> InPropertyHandle)
{
Copying //UE4/Dev-Platform to //UE4/Main (Source: //UE4/Dev-Platform @ 3008177) ========================== MAJOR FEATURES + CHANGES ========================== Change 2948322 on 2016/04/19 by Nick.Shin update libwebsockets to v1.7.4 part 4 of 4 - doing this in stages for tracking purposes #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2970016 on 2016/05/07 by Nick.Shin undo all of the following upgrades: - zlib - openssl - libcurl - libwebsockets and reset webrtc #jira UE-30298 - Fortnite and Orion crash on login #lockdown josh.adams Change 2970373 on 2016/05/09 by Lee.Clark PS4 - Fix NumInstances not getting reset after DrawIndirect calls Change 2972873 on 2016/05/10 by Michael.Trepka Correct initial position for SlateViewer windows on Mac Change 2974363 on 2016/05/11 by Mark.Satterthwaite Fix invoking buils using distcc from UFE - the command-line executed to access the number of parallel tasks was incorrect. Change 2975921 on 2016/05/12 by Michael.Trepka Removed unused AdjustWindowRegion declaration from LinuxWindow.h #codereview Dmitry.Rekman Change 2977002 on 2016/05/13 by Michael.Trepka Make sure dSYM generation action in UBT on Mac does not start before the source dylib is ready #codereview Ben.Marsh Change 2977337 on 2016/05/13 by Brent.Pease UE-27805 - Adding special characters into the BundleDisplayName or BundleName causes packaging error + Prevent illegal characters from being entered in the packaging UI + Report an error from iPhonePackager if a illegal bundle id is specified + Convert special characters to XML equivalents - Correctly check for the presence of iTunes 12 when packaging iOS games on Windows - Improve ios certificate and provision message in package settings UI #codereview peter.sauerbrei Change 2977509 on 2016/05/13 by Brent.Pease + Fix mac compile error Change 2978036 on 2016/05/14 by Mark.Satterthwaite One-line tweak that resolves incorrect rendering of the colour LUT because float imprecision allows -ve values to be passed into a call to pow which then generates NaN. #jira UE-30777 Change 2978037 on 2016/05/14 by Mark.Satterthwaite Fix a heap-use-after-free bug spotted by AddressSanitizer - you can't assume that the UObject system will be available in ShutdownModule() - on OS X it may have been killed a long time ago. Change 2978333 on 2016/05/16 by Lee.Clark Fix packaging of non-code projects when plugins are enabled #codereview Peter.Sauerbrei Change 2978780 on 2016/05/16 by Mark.Satterthwaite Reduce temporary allocations required to set uniform parameters in Metal. Change 2979680 on 2016/05/16 by Nick.Shin editor's HTML5 platform settings was missing due to the emscripten SDK move should have been included with CL: #2946251 Change 2979681 on 2016/05/16 by Nick.Shin cleaned up websocket processing for HTML5 #jira UE-13657 - HTML5 plugin OnRawRecieve overflow Change 2979701 on 2016/05/16 by Brent.Pease UE-28421 - Message box cannot be closed after accessing the home screen on iOS + Implement a timeout when waiting for a reply after sending background/foreground/suspend events from the main thread to the game thread. This solves the immediate problem presented in the jira bug report, however, there are deeper issues with the consequences of blocking the game thread that are not addressed. Perhaps structuring the game thread loop to know about modal dialogs so that it can receive these events even when a modal dialog is up could be a better longer term solution Change 2980766 on 2016/05/17 by Jeremiah.Waldron Adding Android build support for HarfBuzz - using a combination of android-cmake (from https://github.com/taka-no-me/android-cmake) to create the build files and Visual Studio 2015 to compile them - Adding Debug and RelWithDebInfo compiled binaries to harfbuzz-1.2.4/Android/<arch>/<config> Tested armv7 with TextShapingTest project on a GalaxyNote3 and text showed up correctly #jira UE-28586 #codereview chris.babcock Change 2980953 on 2016/05/17 by Jeremiah.Waldron Changing HarfBuzz build script and libs to use Release instead of RelWithDebInfo #jira UE-28586 Change 2981039 on 2016/05/17 by Jeff.Campeau ICMP support disabled for Xbox One and basic address processing wrappers provided (needed for Oodle support) Change 2981054 on 2016/05/17 by Jeff.Campeau Enable Live OSS for Orion on Xbox One Change 2981553 on 2016/05/18 by Jeff.Campeau Enable Oodle for Xbox One Change 2981555 on 2016/05/18 by Jeff.Campeau Scalability settings for Xbox One Change 2981774 on 2016/05/18 by Keith.Judge Xbox One - Duplicating Movie Player fix from 4.12. Change 2981789 on 2016/05/18 by Keith.Judge Xbox One - Duplicate fast semantics rendertarget unbind/clear/rebind fix from 4.12. Change 2981802 on 2016/05/18 by Keith.Judge Xbox One - Duplicate of distance field AO/Shadow fixes from 4.12. Change 2981875 on 2016/05/18 by Keith.Judge Xbox One - Dynamic VB/IB refactor. Duplicated from 4.12. Change 2981900 on 2016/05/18 by Keith.Judge Xbox One - D3D11Query refactor. Duplicated from 4.12 Change 2981945 on 2016/05/18 by Nick.Shin filled out response headers for HTML5 platform #jira UE-26047 - HTML5 HTTP Response Headers not implemented Change 2981981 on 2016/05/18 by Lee.Clark PS4 - Fix COTF not updating files #codereview Daniel.Lamb Change 2982246 on 2016/05/18 by Michael.Trepka Fixed Mono compile errors in UT build scripts Change 2983869 on 2016/05/19 by Mark.Satterthwaite Explicitly retain/release all the MTLTexture objects in FMetalSurface without the assumptions about them being the same object - the recent stencil & SRV related changes make those assumptions invalid and could lead to over-releasing some textures. #jira UE-29557 Change 2983871 on 2016/05/19 by Mark.Satterthwaite Pool Metal texture update buffers to reduce churn. Change 2983892 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2972885: Enable Metal resource lifetime delay on all platforms, not just iOS to try and address intermittent invalid resource errors. Change 2983898 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2982825: Correctly wait for the dispatch semaphore when clearing the Metal resource free lists. Change 2983911 on 2016/05/19 by Mark.Satterthwaite Change Metal SubmitCommandsHint to use an enum of flags rather than boolean variables to control behaviour so that its clearer to the reader what is going to happen. Change 2983916 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2974765: Workaround for UE-30069 - on Nvidia Macs we are breaking the GMux swap the second time we run the engine and it isn't clear why, so instead explicitly select the Metal device ourselves and don't allow the OS to swap the GPU driving the display. This will potentially reduce performance a little if the discrete GPU isn't already driving the display but until we know how we are clobbering the GMux/driver it is all we can do. This only applies to 10.11.5 with the default OS X drivers where there is more than one GPU in the system, earlier versions of OS X and the Nvidia WebDrivers are unaffected. Change 2984874 on 2016/05/20 by Keith.Judge Xbox One - Re-enable shader DXBC intermediate bytecode stripping, except for geometry and hull shaders where there's a possibility of runtime recompilation in certain combinations. Saves ~2MB in TM-ShaderModels, will save more in larger maps. #jira UEPLAT-1295 Change 2985446 on 2016/05/20 by Mark.Satterthwaite Remove the non-functional -metaldebug option from MetalRHI. Change 2985827 on 2016/05/20 by Nick.Shin call EndSession() onbeforeunload() note: API CHANGE - HTML5JavaScripteFx.{js,h} - UE_MakeHTTPDataRequest() #jira UE-22285 - Session End events are not generated for HTML5 Change 2986013 on 2016/05/20 by Jeremiah.Waldron PR #2387: In-App Purchases - parameters needed for Receipt Validation (Contributed by gameDNAstudio) Also touches IOS because of added RawPrice member in FInAppPurchaseProductInfo Pulled from Release-4.12 CL #jira UE-30782 #codereview chris.babcock, Peter.Sauerbrei Change 2986057 on 2016/05/20 by Mark.Satterthwaite Further changes to ensure that UE-30710 really is fixed while also not live-leaking memory in MetalRHI. Change 2986059 on 2016/05/20 by Mark.Satterthwaite Move the Metal uniform buffers into the same resource pool as all the other buffers and add stats for how many buffers are in the pool, how much memory is in use, free and wasted (due to aligned-buffer sizes). Change 2986060 on 2016/05/20 by Mark.Satterthwaite Disable tiled-reflections on Nvidia & Intel Metal until they sort out the sample command on cube-arrays ignoring the lod level. Change 2986063 on 2016/05/20 by Mark.Satterthwaite Missing change from previous CL. Change 2986066 on 2016/05/20 by Mark.Satterthwaite More Metal stats tracking the number & memory size of id<MTLBuffer>'s allocated/released each frame. Change 2986455 on 2016/05/23 by Keith.Judge Xbox One - Fix precompile promise in shader compiler to not stop subsequent defines from being parsed by D3DCompiler. Change 2986886 on 2016/05/23 by Mark.Satterthwaite Duplicate 4.12 CL #2986880: Fix UE-31124 due to bad array iteration logic - amazing that this hadn't been seen earlier. Change 2986955 on 2016/05/23 by Brent.Pease + Do not error out if "[PROJECT_NAME]" is in the bundle ID #codereview peter.sauerbrei Change 2987304 on 2016/05/23 by Chris.Babcock Remove old Android platforms #ue4 #android #codeview Josh.Adams Change 2987571 on 2016/05/23 by Mark.Satterthwaite Duplicate CL #2967998: Integrate - MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) #jira UE-31111 Change 2987591 on 2016/05/23 by Mark.Satterthwaite Remove usage of MTLRender/ComputeEncoder setSamplerState/s calls that take Min & Max Lod overrides - they currently don't work as expected on some GPU drivers and as we don't use them anywhere and I can't see that we will removing them costs us nothing and fixes tiled reflections on Nvidia with Metal SM5. Change 2987679 on 2016/05/23 by Mark.Satterthwaite Re-enable tiled reflections on Nvidia by default now that they work. Change 2987799 on 2016/05/24 by Mark.Satterthwaite Add a shader compile option "r.Shaders.ZeroInitialise" that we can turn on to force explicit zero-initialisation of local & temporary variables in hlslcc - so far only implemented for Metal. The default behaviour remains to omit zero-initialisation but the option is helpful to eliminate or track down uninitialised access in shaders that are causing real bugs (e.g. POM material relying on zero-initialised loop counters causing hangs/bad rendering on Mac). Change 2989395 on 2016/05/25 by Lee.Clark PS4 - Fix shader output / render target format mismatch for sparse MRT. Change 2990003 on 2016/05/25 by Jeremiah.Waldron When creating our own ConfigCacheIni in GetConfigCacheIni_APL, do not assume that the Engine ini was requested. Instead use the baseIniName passed to the function. Change 2990393 on 2016/05/25 by Mark.Satterthwaite Back out changelist 2961310 - causes more problems than it solves. DistanceField rendering will still work on Intel Metal SM5 and may work on AMD but will be broken on Nvidia due to a bad access within the compute shader - there's no bounds checking in Metal... Change 2990516 on 2016/05/25 by Brent.Pease + UEPLAT-1294 - Support for local notifications + UEPLAT-1254 - Add BP event for device orientation change + Added a new class based on UGameInstance for mobile device callbacks + Ensured IOSAppDelegate.cpp follows convention for lambda functions Change 2991361 on 2016/05/26 by Jeremiah.Waldron Move InAppPurchase class to StoreHelper.java so GooglePlay and Amazon store helpers can use it Change 2992450 on 2016/05/27 by Mark.Satterthwaite Optional r.Shaders.BoundsChecking flag to control whether shader platforms should manually enforce buffer access bounds - HLSL returns zero or ignores invalid reads & writes but Metal leaves the behaviour undefined and some drivers then fail. By default this is off and its whatever the native platform behaviour is, enabling it will cost some amount of performance as the shader translator inserts additional instructions to try and match D3D as accurately as possible. This is required to fix GPU restart errors on some Metal drivers when using SM5 rendering features including DistanceField shaders. Change 2993027 on 2016/05/27 by Mark.Satterthwaite Fix typo for new CFLAG_BoundsChecking enumeration value. Change 2993594 on 2016/05/27 by Mark.Satterthwaite Build fix - check not assert... Change 2993595 on 2016/05/27 by Mark.Satterthwaite Fix typo from Xcode hang... Change 2993614 on 2016/05/28 by Mark.Satterthwaite At least for now enable shader zero-initialisation and bounds-checking on Mac to ensure that Metal shaders are compiled with semantics that approximate those HLSL assumes. This may cost some performance but will avoid a few GPU restarts on some vendor drivers. Change 2993747 on 2016/05/28 by Mark.Satterthwaite Separate texture & buffer references in the Metal backend as they bind to separate arrays in the runtime to avoid giving the side-table buffer an innaccessible binding index. Also the side-table doesn't need to be emitted if no buffer SRV or UAV is used. Change 2994256 on 2016/05/31 by Lee.Clark PS4 - Fix unitialized Head Position from HMD tracker when tracking fails. Fixes a problem with A3D audio not working. #codereview Chad.Taylor,Aaron.McLeran Change 2994281 on 2016/05/31 by Rolando.Caloca DP - Allow hlslcc to process type casts containing the 'const' keyword - it isn't strictly complete as it will simply omit the type qualifier from the cast in the AST but it is sufficient for FortniteFoliage_MasterMaterial to compile. #codereview Mark.Satterthwaite, Dmitry.Rekman #jira UE-31411 Change 2994467 on 2016/05/31 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 2994493 on 2016/05/31 by Daniel.Lamb Fixed issue with DDC commandlet not caching things from the startup packages list. Change 2994644 on 2016/05/31 by Mark.Satterthwaite Updated hlslcc Mac binaries with fix for UE-31411 which RCO accepted and submitted + script for building parsers on POSIX OSes hooked up to an Xcode scheme in the project. Change 2996074 on 2016/06/01 by Lee.Clark PS4 - Fix GS mode not getting disabled when using parallel contexts. #codereview Marcus.Wassmer Change 2996129 on 2016/06/01 by Brent.Pease Manual merge of Pete's dsym generation fix (CL#2996089) from the 4.12 branch. Change 2996130 on 2016/06/01 by Jeremiah.Waldron PR #2387 part 2 (Contributed by gameDNAstudio) Adding ability to consume purchases during GooglePlay RestorePurchases This also touches IOS due to changes to base classes and function signatures #codereview chris.babcock, Peter.Sauerbrei Change 2996441 on 2016/06/01 by Jeremiah.Waldron Relates to PR #2387: Adding ability to consume purchases during GooglePlay RestorePurchases (Contributed by gameDNAstudio) Missing changes from part 2 reworked so that there is still only one RestorePurchases function which takes the product IDs and consumable flags. I reflected this in StoreHelper so no casting is necessary in GameActivity and the soon-to-be-added AmazonStoreHelper in the GameCircle plugin will still work dynamically with GameActivity since it will call StoreHelper functionality rather than a GooglePlayStoreHelper specific function. #codereview chris.babcock Change 2996514 on 2016/06/01 by Jeff.Campeau Fix merge issue from main #jira UE-31502 Change 2996740 on 2016/06/01 by Jonathan.Fitzpatrick https://jira.ol.epicgames.net/browse/UE-31446 Two PS4 source files fail during unity builds due to name conflict with handleReserveFailed. Renamed handleReserveFailed to handleReserveFailedLightweight Change 2997235 on 2016/06/01 by Jeremiah.Waldron RestorePurchases fix up in Match3 since the new Restore consumable stuff adds an additional pin to the Restore node. The IAP product in Match3 is non-consumable so just passing an empty array where necessary Change 2997241 on 2016/06/01 by Jeremiah.Waldron OnlineSubsystemGameCircle Plugin - Leaderboards - Achievements - Friends - IAP - External UI Interface - Runtime Settings in Project Settings Plugin section when plugin is enabled - Disabled by default #jira UEPLAT-105 #codereview chris.babcock Change 2997618 on 2016/06/02 by Lee.Clark #UE4Docs: Removed PS4MapFileUtil info Change 2997840 on 2016/06/02 by Jeremiah.Waldron Removing trace logging from OnlineSubsystemGameCircle_APL Change 2998754 on 2016/06/02 by Brent.Pease Change BlueprintMobileLibrary to BlueprintPlatformLibrary Change 3000762 on 2016/06/03 by Jeff.Campeau Add example rating info to ShooterGame Change 3001037 on 2016/06/04 by Brent.Pease + Add ui screens for delegate test, local notification test, and iap test + Implement delegate test Change 3001250 on 2016/06/05 by Brent.Pease + Initial pass at IAP test screen Change 3001639 on 2016/06/06 by Jeff.Campeau Fix Xbox One build issue with DX12 #codereview Zabir.Hoque Change 3002574 on 2016/06/06 by Jeremiah.Waldron Adding Android Install Location to Android platform runtime settings and manifest generation Change 3002780 on 2016/06/06 by Brent.Pease + Initial implementation of local notification test Change 3003005 on 2016/06/06 by Jeremiah.Waldron OnlineSubsystemGameCircle plugin - adding setting for Fire TV support. Using that specification in the APL to Add/Update android.hardware.touchscreen feature required attribute Change 3004392 on 2016/06/07 by Jeremiah.Waldron Fixing typo in APL comment :) Change 3005768 on 2016/06/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3005929 on 2016/06/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3006151 on 2016/06/08 by Peter.Sauerbrei fix for LocalNotifications not available on TVOS #lockdown josh.adams Change 3006183 on 2016/06/08 by Brent.Pease Manual merge CL#3000242 from Release-4.12 into Dev-Platform #lockdown josh.adams Change 3006296 on 2016/06/08 by Peter.Sauerbrei submit an updated iPhonePackager and support DLLs #lockdown josh.adams Change 3006378 on 2016/06/08 by Peter.Sauerbrei fix for API update to RestorePurchases #codereview brent.pease #lockdown josh.adams #lockdown nick.penwarden [CL 3008183 by Josh Adams in Main branch]
2016-06-09 17:45:44 -04:00
if(!IsBundleIdentifierValid(NewText.ToString()))
{
Copying //UE4/Dev-Platform to //UE4/Main (Source: //UE4/Dev-Platform @ 3008177) ========================== MAJOR FEATURES + CHANGES ========================== Change 2948322 on 2016/04/19 by Nick.Shin update libwebsockets to v1.7.4 part 4 of 4 - doing this in stages for tracking purposes #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2970016 on 2016/05/07 by Nick.Shin undo all of the following upgrades: - zlib - openssl - libcurl - libwebsockets and reset webrtc #jira UE-30298 - Fortnite and Orion crash on login #lockdown josh.adams Change 2970373 on 2016/05/09 by Lee.Clark PS4 - Fix NumInstances not getting reset after DrawIndirect calls Change 2972873 on 2016/05/10 by Michael.Trepka Correct initial position for SlateViewer windows on Mac Change 2974363 on 2016/05/11 by Mark.Satterthwaite Fix invoking buils using distcc from UFE - the command-line executed to access the number of parallel tasks was incorrect. Change 2975921 on 2016/05/12 by Michael.Trepka Removed unused AdjustWindowRegion declaration from LinuxWindow.h #codereview Dmitry.Rekman Change 2977002 on 2016/05/13 by Michael.Trepka Make sure dSYM generation action in UBT on Mac does not start before the source dylib is ready #codereview Ben.Marsh Change 2977337 on 2016/05/13 by Brent.Pease UE-27805 - Adding special characters into the BundleDisplayName or BundleName causes packaging error + Prevent illegal characters from being entered in the packaging UI + Report an error from iPhonePackager if a illegal bundle id is specified + Convert special characters to XML equivalents - Correctly check for the presence of iTunes 12 when packaging iOS games on Windows - Improve ios certificate and provision message in package settings UI #codereview peter.sauerbrei Change 2977509 on 2016/05/13 by Brent.Pease + Fix mac compile error Change 2978036 on 2016/05/14 by Mark.Satterthwaite One-line tweak that resolves incorrect rendering of the colour LUT because float imprecision allows -ve values to be passed into a call to pow which then generates NaN. #jira UE-30777 Change 2978037 on 2016/05/14 by Mark.Satterthwaite Fix a heap-use-after-free bug spotted by AddressSanitizer - you can't assume that the UObject system will be available in ShutdownModule() - on OS X it may have been killed a long time ago. Change 2978333 on 2016/05/16 by Lee.Clark Fix packaging of non-code projects when plugins are enabled #codereview Peter.Sauerbrei Change 2978780 on 2016/05/16 by Mark.Satterthwaite Reduce temporary allocations required to set uniform parameters in Metal. Change 2979680 on 2016/05/16 by Nick.Shin editor's HTML5 platform settings was missing due to the emscripten SDK move should have been included with CL: #2946251 Change 2979681 on 2016/05/16 by Nick.Shin cleaned up websocket processing for HTML5 #jira UE-13657 - HTML5 plugin OnRawRecieve overflow Change 2979701 on 2016/05/16 by Brent.Pease UE-28421 - Message box cannot be closed after accessing the home screen on iOS + Implement a timeout when waiting for a reply after sending background/foreground/suspend events from the main thread to the game thread. This solves the immediate problem presented in the jira bug report, however, there are deeper issues with the consequences of blocking the game thread that are not addressed. Perhaps structuring the game thread loop to know about modal dialogs so that it can receive these events even when a modal dialog is up could be a better longer term solution Change 2980766 on 2016/05/17 by Jeremiah.Waldron Adding Android build support for HarfBuzz - using a combination of android-cmake (from https://github.com/taka-no-me/android-cmake) to create the build files and Visual Studio 2015 to compile them - Adding Debug and RelWithDebInfo compiled binaries to harfbuzz-1.2.4/Android/<arch>/<config> Tested armv7 with TextShapingTest project on a GalaxyNote3 and text showed up correctly #jira UE-28586 #codereview chris.babcock Change 2980953 on 2016/05/17 by Jeremiah.Waldron Changing HarfBuzz build script and libs to use Release instead of RelWithDebInfo #jira UE-28586 Change 2981039 on 2016/05/17 by Jeff.Campeau ICMP support disabled for Xbox One and basic address processing wrappers provided (needed for Oodle support) Change 2981054 on 2016/05/17 by Jeff.Campeau Enable Live OSS for Orion on Xbox One Change 2981553 on 2016/05/18 by Jeff.Campeau Enable Oodle for Xbox One Change 2981555 on 2016/05/18 by Jeff.Campeau Scalability settings for Xbox One Change 2981774 on 2016/05/18 by Keith.Judge Xbox One - Duplicating Movie Player fix from 4.12. Change 2981789 on 2016/05/18 by Keith.Judge Xbox One - Duplicate fast semantics rendertarget unbind/clear/rebind fix from 4.12. Change 2981802 on 2016/05/18 by Keith.Judge Xbox One - Duplicate of distance field AO/Shadow fixes from 4.12. Change 2981875 on 2016/05/18 by Keith.Judge Xbox One - Dynamic VB/IB refactor. Duplicated from 4.12. Change 2981900 on 2016/05/18 by Keith.Judge Xbox One - D3D11Query refactor. Duplicated from 4.12 Change 2981945 on 2016/05/18 by Nick.Shin filled out response headers for HTML5 platform #jira UE-26047 - HTML5 HTTP Response Headers not implemented Change 2981981 on 2016/05/18 by Lee.Clark PS4 - Fix COTF not updating files #codereview Daniel.Lamb Change 2982246 on 2016/05/18 by Michael.Trepka Fixed Mono compile errors in UT build scripts Change 2983869 on 2016/05/19 by Mark.Satterthwaite Explicitly retain/release all the MTLTexture objects in FMetalSurface without the assumptions about them being the same object - the recent stencil & SRV related changes make those assumptions invalid and could lead to over-releasing some textures. #jira UE-29557 Change 2983871 on 2016/05/19 by Mark.Satterthwaite Pool Metal texture update buffers to reduce churn. Change 2983892 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2972885: Enable Metal resource lifetime delay on all platforms, not just iOS to try and address intermittent invalid resource errors. Change 2983898 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2982825: Correctly wait for the dispatch semaphore when clearing the Metal resource free lists. Change 2983911 on 2016/05/19 by Mark.Satterthwaite Change Metal SubmitCommandsHint to use an enum of flags rather than boolean variables to control behaviour so that its clearer to the reader what is going to happen. Change 2983916 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2974765: Workaround for UE-30069 - on Nvidia Macs we are breaking the GMux swap the second time we run the engine and it isn't clear why, so instead explicitly select the Metal device ourselves and don't allow the OS to swap the GPU driving the display. This will potentially reduce performance a little if the discrete GPU isn't already driving the display but until we know how we are clobbering the GMux/driver it is all we can do. This only applies to 10.11.5 with the default OS X drivers where there is more than one GPU in the system, earlier versions of OS X and the Nvidia WebDrivers are unaffected. Change 2984874 on 2016/05/20 by Keith.Judge Xbox One - Re-enable shader DXBC intermediate bytecode stripping, except for geometry and hull shaders where there's a possibility of runtime recompilation in certain combinations. Saves ~2MB in TM-ShaderModels, will save more in larger maps. #jira UEPLAT-1295 Change 2985446 on 2016/05/20 by Mark.Satterthwaite Remove the non-functional -metaldebug option from MetalRHI. Change 2985827 on 2016/05/20 by Nick.Shin call EndSession() onbeforeunload() note: API CHANGE - HTML5JavaScripteFx.{js,h} - UE_MakeHTTPDataRequest() #jira UE-22285 - Session End events are not generated for HTML5 Change 2986013 on 2016/05/20 by Jeremiah.Waldron PR #2387: In-App Purchases - parameters needed for Receipt Validation (Contributed by gameDNAstudio) Also touches IOS because of added RawPrice member in FInAppPurchaseProductInfo Pulled from Release-4.12 CL #jira UE-30782 #codereview chris.babcock, Peter.Sauerbrei Change 2986057 on 2016/05/20 by Mark.Satterthwaite Further changes to ensure that UE-30710 really is fixed while also not live-leaking memory in MetalRHI. Change 2986059 on 2016/05/20 by Mark.Satterthwaite Move the Metal uniform buffers into the same resource pool as all the other buffers and add stats for how many buffers are in the pool, how much memory is in use, free and wasted (due to aligned-buffer sizes). Change 2986060 on 2016/05/20 by Mark.Satterthwaite Disable tiled-reflections on Nvidia & Intel Metal until they sort out the sample command on cube-arrays ignoring the lod level. Change 2986063 on 2016/05/20 by Mark.Satterthwaite Missing change from previous CL. Change 2986066 on 2016/05/20 by Mark.Satterthwaite More Metal stats tracking the number & memory size of id<MTLBuffer>'s allocated/released each frame. Change 2986455 on 2016/05/23 by Keith.Judge Xbox One - Fix precompile promise in shader compiler to not stop subsequent defines from being parsed by D3DCompiler. Change 2986886 on 2016/05/23 by Mark.Satterthwaite Duplicate 4.12 CL #2986880: Fix UE-31124 due to bad array iteration logic - amazing that this hadn't been seen earlier. Change 2986955 on 2016/05/23 by Brent.Pease + Do not error out if "[PROJECT_NAME]" is in the bundle ID #codereview peter.sauerbrei Change 2987304 on 2016/05/23 by Chris.Babcock Remove old Android platforms #ue4 #android #codeview Josh.Adams Change 2987571 on 2016/05/23 by Mark.Satterthwaite Duplicate CL #2967998: Integrate - MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) #jira UE-31111 Change 2987591 on 2016/05/23 by Mark.Satterthwaite Remove usage of MTLRender/ComputeEncoder setSamplerState/s calls that take Min & Max Lod overrides - they currently don't work as expected on some GPU drivers and as we don't use them anywhere and I can't see that we will removing them costs us nothing and fixes tiled reflections on Nvidia with Metal SM5. Change 2987679 on 2016/05/23 by Mark.Satterthwaite Re-enable tiled reflections on Nvidia by default now that they work. Change 2987799 on 2016/05/24 by Mark.Satterthwaite Add a shader compile option "r.Shaders.ZeroInitialise" that we can turn on to force explicit zero-initialisation of local & temporary variables in hlslcc - so far only implemented for Metal. The default behaviour remains to omit zero-initialisation but the option is helpful to eliminate or track down uninitialised access in shaders that are causing real bugs (e.g. POM material relying on zero-initialised loop counters causing hangs/bad rendering on Mac). Change 2989395 on 2016/05/25 by Lee.Clark PS4 - Fix shader output / render target format mismatch for sparse MRT. Change 2990003 on 2016/05/25 by Jeremiah.Waldron When creating our own ConfigCacheIni in GetConfigCacheIni_APL, do not assume that the Engine ini was requested. Instead use the baseIniName passed to the function. Change 2990393 on 2016/05/25 by Mark.Satterthwaite Back out changelist 2961310 - causes more problems than it solves. DistanceField rendering will still work on Intel Metal SM5 and may work on AMD but will be broken on Nvidia due to a bad access within the compute shader - there's no bounds checking in Metal... Change 2990516 on 2016/05/25 by Brent.Pease + UEPLAT-1294 - Support for local notifications + UEPLAT-1254 - Add BP event for device orientation change + Added a new class based on UGameInstance for mobile device callbacks + Ensured IOSAppDelegate.cpp follows convention for lambda functions Change 2991361 on 2016/05/26 by Jeremiah.Waldron Move InAppPurchase class to StoreHelper.java so GooglePlay and Amazon store helpers can use it Change 2992450 on 2016/05/27 by Mark.Satterthwaite Optional r.Shaders.BoundsChecking flag to control whether shader platforms should manually enforce buffer access bounds - HLSL returns zero or ignores invalid reads & writes but Metal leaves the behaviour undefined and some drivers then fail. By default this is off and its whatever the native platform behaviour is, enabling it will cost some amount of performance as the shader translator inserts additional instructions to try and match D3D as accurately as possible. This is required to fix GPU restart errors on some Metal drivers when using SM5 rendering features including DistanceField shaders. Change 2993027 on 2016/05/27 by Mark.Satterthwaite Fix typo for new CFLAG_BoundsChecking enumeration value. Change 2993594 on 2016/05/27 by Mark.Satterthwaite Build fix - check not assert... Change 2993595 on 2016/05/27 by Mark.Satterthwaite Fix typo from Xcode hang... Change 2993614 on 2016/05/28 by Mark.Satterthwaite At least for now enable shader zero-initialisation and bounds-checking on Mac to ensure that Metal shaders are compiled with semantics that approximate those HLSL assumes. This may cost some performance but will avoid a few GPU restarts on some vendor drivers. Change 2993747 on 2016/05/28 by Mark.Satterthwaite Separate texture & buffer references in the Metal backend as they bind to separate arrays in the runtime to avoid giving the side-table buffer an innaccessible binding index. Also the side-table doesn't need to be emitted if no buffer SRV or UAV is used. Change 2994256 on 2016/05/31 by Lee.Clark PS4 - Fix unitialized Head Position from HMD tracker when tracking fails. Fixes a problem with A3D audio not working. #codereview Chad.Taylor,Aaron.McLeran Change 2994281 on 2016/05/31 by Rolando.Caloca DP - Allow hlslcc to process type casts containing the 'const' keyword - it isn't strictly complete as it will simply omit the type qualifier from the cast in the AST but it is sufficient for FortniteFoliage_MasterMaterial to compile. #codereview Mark.Satterthwaite, Dmitry.Rekman #jira UE-31411 Change 2994467 on 2016/05/31 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 2994493 on 2016/05/31 by Daniel.Lamb Fixed issue with DDC commandlet not caching things from the startup packages list. Change 2994644 on 2016/05/31 by Mark.Satterthwaite Updated hlslcc Mac binaries with fix for UE-31411 which RCO accepted and submitted + script for building parsers on POSIX OSes hooked up to an Xcode scheme in the project. Change 2996074 on 2016/06/01 by Lee.Clark PS4 - Fix GS mode not getting disabled when using parallel contexts. #codereview Marcus.Wassmer Change 2996129 on 2016/06/01 by Brent.Pease Manual merge of Pete's dsym generation fix (CL#2996089) from the 4.12 branch. Change 2996130 on 2016/06/01 by Jeremiah.Waldron PR #2387 part 2 (Contributed by gameDNAstudio) Adding ability to consume purchases during GooglePlay RestorePurchases This also touches IOS due to changes to base classes and function signatures #codereview chris.babcock, Peter.Sauerbrei Change 2996441 on 2016/06/01 by Jeremiah.Waldron Relates to PR #2387: Adding ability to consume purchases during GooglePlay RestorePurchases (Contributed by gameDNAstudio) Missing changes from part 2 reworked so that there is still only one RestorePurchases function which takes the product IDs and consumable flags. I reflected this in StoreHelper so no casting is necessary in GameActivity and the soon-to-be-added AmazonStoreHelper in the GameCircle plugin will still work dynamically with GameActivity since it will call StoreHelper functionality rather than a GooglePlayStoreHelper specific function. #codereview chris.babcock Change 2996514 on 2016/06/01 by Jeff.Campeau Fix merge issue from main #jira UE-31502 Change 2996740 on 2016/06/01 by Jonathan.Fitzpatrick https://jira.ol.epicgames.net/browse/UE-31446 Two PS4 source files fail during unity builds due to name conflict with handleReserveFailed. Renamed handleReserveFailed to handleReserveFailedLightweight Change 2997235 on 2016/06/01 by Jeremiah.Waldron RestorePurchases fix up in Match3 since the new Restore consumable stuff adds an additional pin to the Restore node. The IAP product in Match3 is non-consumable so just passing an empty array where necessary Change 2997241 on 2016/06/01 by Jeremiah.Waldron OnlineSubsystemGameCircle Plugin - Leaderboards - Achievements - Friends - IAP - External UI Interface - Runtime Settings in Project Settings Plugin section when plugin is enabled - Disabled by default #jira UEPLAT-105 #codereview chris.babcock Change 2997618 on 2016/06/02 by Lee.Clark #UE4Docs: Removed PS4MapFileUtil info Change 2997840 on 2016/06/02 by Jeremiah.Waldron Removing trace logging from OnlineSubsystemGameCircle_APL Change 2998754 on 2016/06/02 by Brent.Pease Change BlueprintMobileLibrary to BlueprintPlatformLibrary Change 3000762 on 2016/06/03 by Jeff.Campeau Add example rating info to ShooterGame Change 3001037 on 2016/06/04 by Brent.Pease + Add ui screens for delegate test, local notification test, and iap test + Implement delegate test Change 3001250 on 2016/06/05 by Brent.Pease + Initial pass at IAP test screen Change 3001639 on 2016/06/06 by Jeff.Campeau Fix Xbox One build issue with DX12 #codereview Zabir.Hoque Change 3002574 on 2016/06/06 by Jeremiah.Waldron Adding Android Install Location to Android platform runtime settings and manifest generation Change 3002780 on 2016/06/06 by Brent.Pease + Initial implementation of local notification test Change 3003005 on 2016/06/06 by Jeremiah.Waldron OnlineSubsystemGameCircle plugin - adding setting for Fire TV support. Using that specification in the APL to Add/Update android.hardware.touchscreen feature required attribute Change 3004392 on 2016/06/07 by Jeremiah.Waldron Fixing typo in APL comment :) Change 3005768 on 2016/06/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3005929 on 2016/06/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3006151 on 2016/06/08 by Peter.Sauerbrei fix for LocalNotifications not available on TVOS #lockdown josh.adams Change 3006183 on 2016/06/08 by Brent.Pease Manual merge CL#3000242 from Release-4.12 into Dev-Platform #lockdown josh.adams Change 3006296 on 2016/06/08 by Peter.Sauerbrei submit an updated iPhonePackager and support DLLs #lockdown josh.adams Change 3006378 on 2016/06/08 by Peter.Sauerbrei fix for API update to RestorePurchases #codereview brent.pease #lockdown josh.adams #lockdown nick.penwarden [CL 3008183 by Josh Adams in Main branch]
2016-06-09 17:45:44 -04:00
BundleIdTextBox->SetError( LOCTEXT("NameContainsInvalidCharacters", "Identifier may only contain the characters 0-9, A-Z, a-z, period, hyphen, or [PROJECT_NAME]") );
}
Copying //UE4/Dev-Platform to //UE4/Main (Source: //UE4/Dev-Platform @ 3008177) ========================== MAJOR FEATURES + CHANGES ========================== Change 2948322 on 2016/04/19 by Nick.Shin update libwebsockets to v1.7.4 part 4 of 4 - doing this in stages for tracking purposes #jira UEPLAT-1246 - Update libWebsockets #jira UEPLAT-1221 - update websocket library #jira UEPLAT-1204 - Rebuild libwebsockets with SSL Change 2970016 on 2016/05/07 by Nick.Shin undo all of the following upgrades: - zlib - openssl - libcurl - libwebsockets and reset webrtc #jira UE-30298 - Fortnite and Orion crash on login #lockdown josh.adams Change 2970373 on 2016/05/09 by Lee.Clark PS4 - Fix NumInstances not getting reset after DrawIndirect calls Change 2972873 on 2016/05/10 by Michael.Trepka Correct initial position for SlateViewer windows on Mac Change 2974363 on 2016/05/11 by Mark.Satterthwaite Fix invoking buils using distcc from UFE - the command-line executed to access the number of parallel tasks was incorrect. Change 2975921 on 2016/05/12 by Michael.Trepka Removed unused AdjustWindowRegion declaration from LinuxWindow.h #codereview Dmitry.Rekman Change 2977002 on 2016/05/13 by Michael.Trepka Make sure dSYM generation action in UBT on Mac does not start before the source dylib is ready #codereview Ben.Marsh Change 2977337 on 2016/05/13 by Brent.Pease UE-27805 - Adding special characters into the BundleDisplayName or BundleName causes packaging error + Prevent illegal characters from being entered in the packaging UI + Report an error from iPhonePackager if a illegal bundle id is specified + Convert special characters to XML equivalents - Correctly check for the presence of iTunes 12 when packaging iOS games on Windows - Improve ios certificate and provision message in package settings UI #codereview peter.sauerbrei Change 2977509 on 2016/05/13 by Brent.Pease + Fix mac compile error Change 2978036 on 2016/05/14 by Mark.Satterthwaite One-line tweak that resolves incorrect rendering of the colour LUT because float imprecision allows -ve values to be passed into a call to pow which then generates NaN. #jira UE-30777 Change 2978037 on 2016/05/14 by Mark.Satterthwaite Fix a heap-use-after-free bug spotted by AddressSanitizer - you can't assume that the UObject system will be available in ShutdownModule() - on OS X it may have been killed a long time ago. Change 2978333 on 2016/05/16 by Lee.Clark Fix packaging of non-code projects when plugins are enabled #codereview Peter.Sauerbrei Change 2978780 on 2016/05/16 by Mark.Satterthwaite Reduce temporary allocations required to set uniform parameters in Metal. Change 2979680 on 2016/05/16 by Nick.Shin editor's HTML5 platform settings was missing due to the emscripten SDK move should have been included with CL: #2946251 Change 2979681 on 2016/05/16 by Nick.Shin cleaned up websocket processing for HTML5 #jira UE-13657 - HTML5 plugin OnRawRecieve overflow Change 2979701 on 2016/05/16 by Brent.Pease UE-28421 - Message box cannot be closed after accessing the home screen on iOS + Implement a timeout when waiting for a reply after sending background/foreground/suspend events from the main thread to the game thread. This solves the immediate problem presented in the jira bug report, however, there are deeper issues with the consequences of blocking the game thread that are not addressed. Perhaps structuring the game thread loop to know about modal dialogs so that it can receive these events even when a modal dialog is up could be a better longer term solution Change 2980766 on 2016/05/17 by Jeremiah.Waldron Adding Android build support for HarfBuzz - using a combination of android-cmake (from https://github.com/taka-no-me/android-cmake) to create the build files and Visual Studio 2015 to compile them - Adding Debug and RelWithDebInfo compiled binaries to harfbuzz-1.2.4/Android/<arch>/<config> Tested armv7 with TextShapingTest project on a GalaxyNote3 and text showed up correctly #jira UE-28586 #codereview chris.babcock Change 2980953 on 2016/05/17 by Jeremiah.Waldron Changing HarfBuzz build script and libs to use Release instead of RelWithDebInfo #jira UE-28586 Change 2981039 on 2016/05/17 by Jeff.Campeau ICMP support disabled for Xbox One and basic address processing wrappers provided (needed for Oodle support) Change 2981054 on 2016/05/17 by Jeff.Campeau Enable Live OSS for Orion on Xbox One Change 2981553 on 2016/05/18 by Jeff.Campeau Enable Oodle for Xbox One Change 2981555 on 2016/05/18 by Jeff.Campeau Scalability settings for Xbox One Change 2981774 on 2016/05/18 by Keith.Judge Xbox One - Duplicating Movie Player fix from 4.12. Change 2981789 on 2016/05/18 by Keith.Judge Xbox One - Duplicate fast semantics rendertarget unbind/clear/rebind fix from 4.12. Change 2981802 on 2016/05/18 by Keith.Judge Xbox One - Duplicate of distance field AO/Shadow fixes from 4.12. Change 2981875 on 2016/05/18 by Keith.Judge Xbox One - Dynamic VB/IB refactor. Duplicated from 4.12. Change 2981900 on 2016/05/18 by Keith.Judge Xbox One - D3D11Query refactor. Duplicated from 4.12 Change 2981945 on 2016/05/18 by Nick.Shin filled out response headers for HTML5 platform #jira UE-26047 - HTML5 HTTP Response Headers not implemented Change 2981981 on 2016/05/18 by Lee.Clark PS4 - Fix COTF not updating files #codereview Daniel.Lamb Change 2982246 on 2016/05/18 by Michael.Trepka Fixed Mono compile errors in UT build scripts Change 2983869 on 2016/05/19 by Mark.Satterthwaite Explicitly retain/release all the MTLTexture objects in FMetalSurface without the assumptions about them being the same object - the recent stencil & SRV related changes make those assumptions invalid and could lead to over-releasing some textures. #jira UE-29557 Change 2983871 on 2016/05/19 by Mark.Satterthwaite Pool Metal texture update buffers to reduce churn. Change 2983892 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2972885: Enable Metal resource lifetime delay on all platforms, not just iOS to try and address intermittent invalid resource errors. Change 2983898 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2982825: Correctly wait for the dispatch semaphore when clearing the Metal resource free lists. Change 2983911 on 2016/05/19 by Mark.Satterthwaite Change Metal SubmitCommandsHint to use an enum of flags rather than boolean variables to control behaviour so that its clearer to the reader what is going to happen. Change 2983916 on 2016/05/19 by Mark.Satterthwaite Duplicate 4.12 CL #2974765: Workaround for UE-30069 - on Nvidia Macs we are breaking the GMux swap the second time we run the engine and it isn't clear why, so instead explicitly select the Metal device ourselves and don't allow the OS to swap the GPU driving the display. This will potentially reduce performance a little if the discrete GPU isn't already driving the display but until we know how we are clobbering the GMux/driver it is all we can do. This only applies to 10.11.5 with the default OS X drivers where there is more than one GPU in the system, earlier versions of OS X and the Nvidia WebDrivers are unaffected. Change 2984874 on 2016/05/20 by Keith.Judge Xbox One - Re-enable shader DXBC intermediate bytecode stripping, except for geometry and hull shaders where there's a possibility of runtime recompilation in certain combinations. Saves ~2MB in TM-ShaderModels, will save more in larger maps. #jira UEPLAT-1295 Change 2985446 on 2016/05/20 by Mark.Satterthwaite Remove the non-functional -metaldebug option from MetalRHI. Change 2985827 on 2016/05/20 by Nick.Shin call EndSession() onbeforeunload() note: API CHANGE - HTML5JavaScripteFx.{js,h} - UE_MakeHTTPDataRequest() #jira UE-22285 - Session End events are not generated for HTML5 Change 2986013 on 2016/05/20 by Jeremiah.Waldron PR #2387: In-App Purchases - parameters needed for Receipt Validation (Contributed by gameDNAstudio) Also touches IOS because of added RawPrice member in FInAppPurchaseProductInfo Pulled from Release-4.12 CL #jira UE-30782 #codereview chris.babcock, Peter.Sauerbrei Change 2986057 on 2016/05/20 by Mark.Satterthwaite Further changes to ensure that UE-30710 really is fixed while also not live-leaking memory in MetalRHI. Change 2986059 on 2016/05/20 by Mark.Satterthwaite Move the Metal uniform buffers into the same resource pool as all the other buffers and add stats for how many buffers are in the pool, how much memory is in use, free and wasted (due to aligned-buffer sizes). Change 2986060 on 2016/05/20 by Mark.Satterthwaite Disable tiled-reflections on Nvidia & Intel Metal until they sort out the sample command on cube-arrays ignoring the lod level. Change 2986063 on 2016/05/20 by Mark.Satterthwaite Missing change from previous CL. Change 2986066 on 2016/05/20 by Mark.Satterthwaite More Metal stats tracking the number & memory size of id<MTLBuffer>'s allocated/released each frame. Change 2986455 on 2016/05/23 by Keith.Judge Xbox One - Fix precompile promise in shader compiler to not stop subsequent defines from being parsed by D3DCompiler. Change 2986886 on 2016/05/23 by Mark.Satterthwaite Duplicate 4.12 CL #2986880: Fix UE-31124 due to bad array iteration logic - amazing that this hadn't been seen earlier. Change 2986955 on 2016/05/23 by Brent.Pease + Do not error out if "[PROJECT_NAME]" is in the bundle ID #codereview peter.sauerbrei Change 2987304 on 2016/05/23 by Chris.Babcock Remove old Android platforms #ue4 #android #codeview Josh.Adams Change 2987571 on 2016/05/23 by Mark.Satterthwaite Duplicate CL #2967998: Integrate - MaterialParameterCollections now create default resources (uniform buffers) which are used when no valid FScene is present (eg DrawTile while exporting materials to lightmass) #jira UE-31111 Change 2987591 on 2016/05/23 by Mark.Satterthwaite Remove usage of MTLRender/ComputeEncoder setSamplerState/s calls that take Min & Max Lod overrides - they currently don't work as expected on some GPU drivers and as we don't use them anywhere and I can't see that we will removing them costs us nothing and fixes tiled reflections on Nvidia with Metal SM5. Change 2987679 on 2016/05/23 by Mark.Satterthwaite Re-enable tiled reflections on Nvidia by default now that they work. Change 2987799 on 2016/05/24 by Mark.Satterthwaite Add a shader compile option "r.Shaders.ZeroInitialise" that we can turn on to force explicit zero-initialisation of local & temporary variables in hlslcc - so far only implemented for Metal. The default behaviour remains to omit zero-initialisation but the option is helpful to eliminate or track down uninitialised access in shaders that are causing real bugs (e.g. POM material relying on zero-initialised loop counters causing hangs/bad rendering on Mac). Change 2989395 on 2016/05/25 by Lee.Clark PS4 - Fix shader output / render target format mismatch for sparse MRT. Change 2990003 on 2016/05/25 by Jeremiah.Waldron When creating our own ConfigCacheIni in GetConfigCacheIni_APL, do not assume that the Engine ini was requested. Instead use the baseIniName passed to the function. Change 2990393 on 2016/05/25 by Mark.Satterthwaite Back out changelist 2961310 - causes more problems than it solves. DistanceField rendering will still work on Intel Metal SM5 and may work on AMD but will be broken on Nvidia due to a bad access within the compute shader - there's no bounds checking in Metal... Change 2990516 on 2016/05/25 by Brent.Pease + UEPLAT-1294 - Support for local notifications + UEPLAT-1254 - Add BP event for device orientation change + Added a new class based on UGameInstance for mobile device callbacks + Ensured IOSAppDelegate.cpp follows convention for lambda functions Change 2991361 on 2016/05/26 by Jeremiah.Waldron Move InAppPurchase class to StoreHelper.java so GooglePlay and Amazon store helpers can use it Change 2992450 on 2016/05/27 by Mark.Satterthwaite Optional r.Shaders.BoundsChecking flag to control whether shader platforms should manually enforce buffer access bounds - HLSL returns zero or ignores invalid reads & writes but Metal leaves the behaviour undefined and some drivers then fail. By default this is off and its whatever the native platform behaviour is, enabling it will cost some amount of performance as the shader translator inserts additional instructions to try and match D3D as accurately as possible. This is required to fix GPU restart errors on some Metal drivers when using SM5 rendering features including DistanceField shaders. Change 2993027 on 2016/05/27 by Mark.Satterthwaite Fix typo for new CFLAG_BoundsChecking enumeration value. Change 2993594 on 2016/05/27 by Mark.Satterthwaite Build fix - check not assert... Change 2993595 on 2016/05/27 by Mark.Satterthwaite Fix typo from Xcode hang... Change 2993614 on 2016/05/28 by Mark.Satterthwaite At least for now enable shader zero-initialisation and bounds-checking on Mac to ensure that Metal shaders are compiled with semantics that approximate those HLSL assumes. This may cost some performance but will avoid a few GPU restarts on some vendor drivers. Change 2993747 on 2016/05/28 by Mark.Satterthwaite Separate texture & buffer references in the Metal backend as they bind to separate arrays in the runtime to avoid giving the side-table buffer an innaccessible binding index. Also the side-table doesn't need to be emitted if no buffer SRV or UAV is used. Change 2994256 on 2016/05/31 by Lee.Clark PS4 - Fix unitialized Head Position from HMD tracker when tracking fails. Fixes a problem with A3D audio not working. #codereview Chad.Taylor,Aaron.McLeran Change 2994281 on 2016/05/31 by Rolando.Caloca DP - Allow hlslcc to process type casts containing the 'const' keyword - it isn't strictly complete as it will simply omit the type qualifier from the cast in the AST but it is sufficient for FortniteFoliage_MasterMaterial to compile. #codereview Mark.Satterthwaite, Dmitry.Rekman #jira UE-31411 Change 2994467 on 2016/05/31 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 2994493 on 2016/05/31 by Daniel.Lamb Fixed issue with DDC commandlet not caching things from the startup packages list. Change 2994644 on 2016/05/31 by Mark.Satterthwaite Updated hlslcc Mac binaries with fix for UE-31411 which RCO accepted and submitted + script for building parsers on POSIX OSes hooked up to an Xcode scheme in the project. Change 2996074 on 2016/06/01 by Lee.Clark PS4 - Fix GS mode not getting disabled when using parallel contexts. #codereview Marcus.Wassmer Change 2996129 on 2016/06/01 by Brent.Pease Manual merge of Pete's dsym generation fix (CL#2996089) from the 4.12 branch. Change 2996130 on 2016/06/01 by Jeremiah.Waldron PR #2387 part 2 (Contributed by gameDNAstudio) Adding ability to consume purchases during GooglePlay RestorePurchases This also touches IOS due to changes to base classes and function signatures #codereview chris.babcock, Peter.Sauerbrei Change 2996441 on 2016/06/01 by Jeremiah.Waldron Relates to PR #2387: Adding ability to consume purchases during GooglePlay RestorePurchases (Contributed by gameDNAstudio) Missing changes from part 2 reworked so that there is still only one RestorePurchases function which takes the product IDs and consumable flags. I reflected this in StoreHelper so no casting is necessary in GameActivity and the soon-to-be-added AmazonStoreHelper in the GameCircle plugin will still work dynamically with GameActivity since it will call StoreHelper functionality rather than a GooglePlayStoreHelper specific function. #codereview chris.babcock Change 2996514 on 2016/06/01 by Jeff.Campeau Fix merge issue from main #jira UE-31502 Change 2996740 on 2016/06/01 by Jonathan.Fitzpatrick https://jira.ol.epicgames.net/browse/UE-31446 Two PS4 source files fail during unity builds due to name conflict with handleReserveFailed. Renamed handleReserveFailed to handleReserveFailedLightweight Change 2997235 on 2016/06/01 by Jeremiah.Waldron RestorePurchases fix up in Match3 since the new Restore consumable stuff adds an additional pin to the Restore node. The IAP product in Match3 is non-consumable so just passing an empty array where necessary Change 2997241 on 2016/06/01 by Jeremiah.Waldron OnlineSubsystemGameCircle Plugin - Leaderboards - Achievements - Friends - IAP - External UI Interface - Runtime Settings in Project Settings Plugin section when plugin is enabled - Disabled by default #jira UEPLAT-105 #codereview chris.babcock Change 2997618 on 2016/06/02 by Lee.Clark #UE4Docs: Removed PS4MapFileUtil info Change 2997840 on 2016/06/02 by Jeremiah.Waldron Removing trace logging from OnlineSubsystemGameCircle_APL Change 2998754 on 2016/06/02 by Brent.Pease Change BlueprintMobileLibrary to BlueprintPlatformLibrary Change 3000762 on 2016/06/03 by Jeff.Campeau Add example rating info to ShooterGame Change 3001037 on 2016/06/04 by Brent.Pease + Add ui screens for delegate test, local notification test, and iap test + Implement delegate test Change 3001250 on 2016/06/05 by Brent.Pease + Initial pass at IAP test screen Change 3001639 on 2016/06/06 by Jeff.Campeau Fix Xbox One build issue with DX12 #codereview Zabir.Hoque Change 3002574 on 2016/06/06 by Jeremiah.Waldron Adding Android Install Location to Android platform runtime settings and manifest generation Change 3002780 on 2016/06/06 by Brent.Pease + Initial implementation of local notification test Change 3003005 on 2016/06/06 by Jeremiah.Waldron OnlineSubsystemGameCircle plugin - adding setting for Fire TV support. Using that specification in the APL to Add/Update android.hardware.touchscreen feature required attribute Change 3004392 on 2016/06/07 by Jeremiah.Waldron Fixing typo in APL comment :) Change 3005768 on 2016/06/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3005929 on 2016/06/08 by Josh.Adams Merging //UE4/Dev-Main to Dev-Platform (//UE4/Dev-Platform) Change 3006151 on 2016/06/08 by Peter.Sauerbrei fix for LocalNotifications not available on TVOS #lockdown josh.adams Change 3006183 on 2016/06/08 by Brent.Pease Manual merge CL#3000242 from Release-4.12 into Dev-Platform #lockdown josh.adams Change 3006296 on 2016/06/08 by Peter.Sauerbrei submit an updated iPhonePackager and support DLLs #lockdown josh.adams Change 3006378 on 2016/06/08 by Peter.Sauerbrei fix for API update to RestorePurchases #codereview brent.pease #lockdown josh.adams #lockdown nick.penwarden [CL 3008183 by Josh Adams in Main branch]
2016-06-09 17:45:44 -04:00
else
{
BundleIdTextBox->SetError(FText::GetEmpty());
FText OutText;
InPropertyHandle->GetValueAsFormattedText(OutText);
if (OutText.ToString() != NewText.ToString())
{
InPropertyHandle->SetValueFromFormattedString( NewText.ToString() );
FindRequiredFiles();
}
}
}
void FIOSTargetSettingsCustomization::OnBundleIdentifierTextChanged(const FText& NewText, ETextCommit::Type CommitType, TSharedRef<IPropertyHandle> InPropertyHandle)
{
if(!IsBundleIdentifierValid(NewText.ToString()))
{
BundleIdTextBox->SetError( LOCTEXT("NameContainsInvalidCharacters", "Identifier may only contain the characters 0-9, A-Z, a-z, period, hyphen, or [PROJECT_NAME]") );
}
else
{
BundleIdTextBox->SetError(FText::GetEmpty());
}
}
bool FIOSTargetSettingsCustomization::IsBundleIdentifierValid(const FString& inIdentifier)
{
for(int32 i = 0; i < inIdentifier.Len(); ++i)
{
TCHAR c = inIdentifier[i];
if(c == '[')
{
if(inIdentifier.Find(gProjectNameText, ESearchCase::CaseSensitive, ESearchDir::FromStart, i) != i)
{
return false;
}
i += gProjectNameText.Len();
}
else if((c < '0' || c > '9') && (c < 'a' || c > 'z') && (c < 'A' || c > 'Z') && c != '.' && c != '-')
{
return false;
}
}
return true;
}
void FIOSTargetSettingsCustomization::OnRemoteServerChanged(const FText& NewText, ETextCommit::Type CommitType, TSharedRef<IPropertyHandle> InPropertyHandle)
{
FText OutText;
InPropertyHandle->GetValueAsFormattedText(OutText);
if (OutText.ToString() != NewText.ToString())
{
InPropertyHandle->SetValueFromFormattedString(NewText.ToString());
OutputMessage = TEXT("");
UpdateSSHStatus();
}
}
FText FIOSTargetSettingsCustomization::GetBundleText(TSharedRef<IPropertyHandle> InPropertyHandle) const
{
FText OutText;
InPropertyHandle->GetValueAsFormattedText(OutText);
return OutText;
}
//////////////////////////////////////////////////////////////////////////
#undef LOCTEXT_NAMESPACE