Commit Graph

16 Commits

Author SHA1 Message Date
aurel cordonnier
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
Marc Audy
e80ea6b959 Merge from Release-Engine-Staging @ 16444985
This represents UE4/Main @ 16445039 and Dev-PerfTest @ 16444526

[CL 16445122 by Marc Audy in ue5-release-engine-test branch]
2021-05-25 02:43:26 -04:00
marc audy
01023cab87 Fixed bug in iPhonePackager Mach-O handling, updated signatures to use SHA-256.
#jira UE-114823
#rb Florin.Pascu

#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 16434034 in //UE4/Release-4.27/... via CL 16434052
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Staging) (v814-16434418)
#ROBOMERGE-CONFLICT from-shelf

Taking UE4 version of executable over UE5 per Rolando
#fyi Jack.Porter

[CL 16436256 by marc audy in ue5-release-engine-staging branch]
2021-05-24 12:00:03 -04:00
rolando caloca
7d8b641b60 Updated iPhonePackager signature format to support iOS 14.5
#rb jack.porter
#jira UE-114823
#fyi Axel.Riffard, Jack.Porter

#ROBOMERGE-OWNER: rolando.caloca
#ROBOMERGE-AUTHOR: axel.riffard
#ROBOMERGE-SOURCE: CL 16365222 in //UE4/Release-4.27/... via CL 16365229
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Staging) (v804-16311228)
#ROBOMERGE-CONFLICT from-shelf

[CL 16373097 by rolando caloca in ue5-release-engine-staging branch]
2021-05-18 14:49:19 -04:00
Ryan Durand
9ef3748747 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536
#ROBOMERGE-BOT: FORTNITE (Main -> Dev-EngineMerge) (v613-10869866)

[CL 10870955 by Ryan Durand in Main branch]
2019-12-26 23:01:54 -05:00
jack porter
d46f62ea4a Fix issue with iPhonePackager failing on Mac with Mono 6
#rb Michael.Trepka
#jira UE-79546
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 8734476 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v422-8689730)

[CL 8734480 by jack porter in Main branch]
2019-09-17 04:21:21 -04:00
Ben Marsh
7598af0532 Update copyright notices to 2019.
#rb none
#lockdown Nick.Penwarden

[CL 4662404 by Ben Marsh in Main branch]
2018-12-14 13:41:00 -05:00
Ben Marsh
13d012685f Merging copyright update from 4.19 branch.
#rb none
#rnx
#jira

[CL 3818977 by Ben Marsh in Staging-4.19 branch]
2018-01-02 15:30:26 -05:00
Ben Marsh
20bf0eb6a1 Updating copyright notices to 2017 (copying from //Tasks/UE4/Dev-Copyright-2017).
#rb none
#lockdown Nick.Penwarden

[CL 3226823 by Ben Marsh in Main branch]
2016-12-08 08:52:44 -05:00
Ben Marsh
6c32244d56 Copying //UE4/Release-Staging-4.11 to //UE4/Main (Source: //UE4/Release-Staging-4.11 @ 2941426, //UE4/Release-4.11 @ 2927265)
==========================
MAJOR FEATURES + CHANGES
==========================

Change 2910079 on 2016/03/15 by Taizyd.Korambayil

	#jira UE-28293 Reworded some Sentences

Change 2910157 on 2016/03/15 by Taizyd.Korambayil

	#jira UE-28240 Rebuilt Lighting for Sanctuary

Change 2910317 on 2016/03/15 by Ben.Marsh

	Fix crash trying to print out a message explaining that you need to install the Visual Studio 2015 toolchain, if the Visual Studio 2015 toolchain is not installed!

Change 2910425 on 2016/03/15 by Ori.Cohen

	Fix crash and incorrect behavior when setting physical material on a welded body.

	#JIRA UE-28399
	#rb Marc.Audy

Change 2910525 on 2016/03/15 by Ori.Cohen

	Fix player capsule not spawning at the right place due to float precision issues.

	#JIRA UE-28438
	#rb Zak.Middleton

Change 2910595 on 2016/03/15 by Chris.Babcock

	Fixed issue with missing event location paired with IE_Pressed if IE_DoubleClick generated
	#jira UE-28051
	#ue4
	#codereview Marc.Audy

Change 2911442 on 2016/03/16 by Andrew.Rodham

	Sequencer: Fixed frame grabbers where hardware mapped surfaces to memory of a different stride

	#jira UE-28434

Change 2911596 on 2016/03/16 by andrew.porter

	Test content for blueprint vertex painting
	#jira UE-24473

Change 2911860 on 2016/03/16 by Jamie.Dale

	Allowed SViewport to (once again) be able to use non-pre-multiplied alpha blending

	SViewport now has an PreMultipliedAlpha argument (default true), which can control whether to use pre-multiplied alpha when blending is enabled (blending is disabled by default). Note: This is a change in behavior from 4.10, as non-pre-multiplied alpha blending used to be the default, but pre-multiplied alpha blending better supports the pipeline used through Slate.

	This change also cleans up the use of bool parameters in the FSlateDrawElement::MakeX functions to control the render behavior, instead favoring use of advanced ESlateDrawEffect flags.

	API Breaking Changes
	  - FSlateDrawElement::MakeGradient no longer takes a bInGammaCorrect bool, instead pass ESlateDrawEffect::NoGamma as part of InDrawEffects to disable gamma correction.
	  - FSlateDrawElement::MakeViewport no longer takes a bInGammaCorrect bool, instead pass ESlateDrawEffect::NoGamma as part of InDrawEffects to disable gamma correction.
	  - FSlateDrawElement::MakeViewport no longer takes a bInAllowBlending bool, instead pass ESlateDrawEffect::NoBlending as part of InDrawEffects to disable blending.

	#jira UE-26797

Change 2912345 on 2016/03/16 by Olaf.Piesche

	Removing the check that causes UE-28441, duplicating beam type data module from highest LOD in Cascade causes crash. The beam data module is the only one that explicitly checks to make sure it's always shared across LOD levels; there's no obvious reasons why duplicating beam data modules shouldn't be possible.

	#codereview simon.tovey
	#jira UE-28441

Change 2912526 on 2016/03/16 by Steve.Robb

	Fix uninitialized variables.

	#codereview robert.manuszewski
	#jira UE-28391

Change 2913114 on 2016/03/17 by Steve.Robb

	Fixed some private properties which caused UHT errors.

	#codereview robert.manuszewski
	#jira UE-28059

Change 2913295 on 2016/03/17 by Richard.TalbotWatkin

	Replicated from Dev-Editor CL 2913224

	Disallow assets from being deleted if PIE is active. This prevents various troubles which can occur when PIE is referencing asset objects.
	#jira UE-12387 - [CrashReport] Crash when deleting assets needed for template
	#RB Nick.Darnell, Frank.Fella

Change 2913310 on 2016/03/17 by Nick.Shin

	merging from //UE4/Dev-Platform to //UE4/Release-4.11

	--- original commit CL: #2913300 message ---
	corrected VS 2015 websocket lib to look at the right offset

	it is currently a high risk change to just update the libwebsocket wholesale for  release-4.11.

	this change is the most minimum invasive change with a lot of deep analysis (details will be put in jira: # UEPLAT-1221).

	this fix will also be pushed up to release-4.11

	#jira UE-22166 - HTML5 Cook on the fly will launch and then close browser
	#jira UE-22513 - HTTP Network File System crashes randomly.
	#jira UE-28003 - Fail to QuickLaunch HTML5 through UnrealFrontEnd

Change 2913593 on 2016/03/17 by Mark.Satterthwaite

	For non-debug builds silence the warning about no deth/stencil when shader writes to depth in MetalRHI - the RHI implementation will create a temporary D/S buffer to cope but really this needs to be properly addressed elsewhere.
	#jira UE-28491

Change 2913655 on 2016/03/17 by Taizyd.Korambayil

	#jira UE-28492 Rebuilt Lighting For the Samples Listed

Change 2914025 on 2016/03/17 by Olaf.Piesche

	Make sure ST primitives are added to NST draw list if in shader complexity mode

	#codereview simon.tovey
	#jira UE-28471

Change 2914027 on 2016/03/17 by Nick.Shin

[CL 2941462 by Ben Marsh in Main branch]
2016-04-12 17:04:39 -04:00
Josh Adams
b9b38fe97b Copying //UE4/Dev-Platform to //UE4/Main
==========================
MAJOR FEATURES + CHANGES
==========================

Change 2816560 on 2016/01/05 by Jeff.Campeau

	Remove duplicate CEF binaries

Change 2835599 on 2016/01/20 by Lee.Clark

	PS4 - Added pragma optimization macros

Change 2841103 on 2016/01/23 by Mark.Satterthwaite

	Integrate Git PR #1958: Fixed typo in EMetalFeatures enum
	#jira UE-25721

Change 2841369 on 2016/01/24 by Mark.Satterthwaite

	Fix for Metal crash due to attempt to set a null uniform & null SRV to a shader which requires both exist.
	#jira UE-25910

Change 2841795 on 2016/01/25 by Lee.Clark

	PS4 - MovieStreamer improvements

	* Use GPU for YUV conversion
	* Use new Software2 Decoder

Change 2842261 on 2016/01/25 by Mark.Satterthwaite

	Fix some memory leaks.

Change 2842831 on 2016/01/25 by Mark.Satterthwaite

	Metal implementation for RHIBlockUntilGPUIdle.

Change 2842838 on 2016/01/25 by Mark.Satterthwaite

	When using parallel command contexts in Metal we must ensure that the FRingBuffer is still valid, which means some smart/weak pointers are in order. We should also ensure that functions that may return auto-released objects are appropriately wrapped with scoped autorelease pools. Texture creation failures should also be fatal as we never expect that to occur.

Change 2842914 on 2016/01/25 by Mark.Satterthwaite

	Change assert in MetalTexture's format-shifting SRV constructor to enforce the Metal textureView limits:
	1. No format shifting for MSAA color buffers.
	2. No access to stencil in MSAA packed depth/stencil surface.

	This will allow Metal MSAA support to work on iOS when using separate depth & stencil textures since there's no format shifting involved there.
	#codereview peter.sauerbrei

Change 2843028 on 2016/01/25 by Mark.Satterthwaite

	In Metal wwitch to blit on the correct context when copying out the stencil data into the stencil SRV copy.

Change 2845531 on 2016/01/27 by Lee.Clark

	PS4 - Fix memory alignment  for back buffers
	* Fix memory alignment for MapLargeBlock
	* Fix available direct memory tracking

Change 2846491 on 2016/01/27 by Jeff.Campeau

	2015 compile fixes for Orion

Change 2847395 on 2016/01/28 by Mark.Satterthwaite

	Clear the stencil-SRV copy to 0 in Metal using a blit when created to avoid artefacts if used prior to the parent texture being rendered.
	#jira UE-25834

Change 2847419 on 2016/01/28 by Mark.Satterthwaite

	Apply the same fix to OpenGL's Stencil SRV logic as CL #2847395 applies to Metal.

Change 2848093 on 2016/01/28 by Mark.Satterthwaite

	Cache parallel encoding Metal contexts & reuse them rather than creating a new one each time in order to massively improve parallel encoding performance. This required adding a reset function to Metal's internal state-cache which calls the CommandEncoder wrapper's reset so we don't accidently retain previous state.

Change 2849469 on 2016/01/29 by Mark.Satterthwaite

	Defer render & compute command encoder construction to draw/dispatch etc to eliminate redundant encoders that then perform unnecessary driver & GPU synchronisation work. Currently Clear loadActions force an encoder even if it would then be empty as otherwise we see incorrect rendering. This needs to be tracked and optimised away too in order to achieve the same performance as D3D11.

Change 2849820 on 2016/01/29 by Daniel.Lamb

	Fixed issue where a single DDC back end would not create a hierarchy.
	#codereview Peter.Sauerbrei

Change 2850762 on 2016/02/01 by Jeff.Campeau

	System-wide critical section support for Xbox One

Change 2850763 on 2016/02/01 by Jeff.Campeau

	Network and product config for Orion

Change 2852459 on 2016/02/02 by Mark.Satterthwaite

	Temporarily disable the lazy render command-encoder construction while investigating why it turns some samples black in Metal SM5 mode.

Change 2853947 on 2016/02/03 by Mark.Satterthwaite

	Fix some lazy encoder construction fallout which also means we don't need to recreate render encoder state when performing profiling - the next draw/clear will do that as required.

Change 2854015 on 2016/02/03 by Mark.Satterthwaite

	Move Stencil SRV blitting into FMetalSurface::UpdateSRV called when binding the texture SRV instead of having it done immediately post-rendering. This should avoid paying for the blit when stencil SRV sampling is never used or multiple blits when render-encoders that write stencil are split up due to query buffer overflow or similar. The cost will be a blit per-bind instead which should be more predictable.

Change 2854142 on 2016/02/03 by Mark.Satterthwaite

	Implemented GetTextureBaseRHI (brought over from Dev-Rendering CL #2853948) for Metal to avoid unnecessary virtual function call chain to resolve the FMetalSurface* from an RHI texture.

Change 2854222 on 2016/02/03 by Mark.Satterthwaite

	Remove the uniform buffer resource caching from Metal to match Dev-Rendering CL #2853948.

Change 2854246 on 2016/02/03 by Mark.Satterthwaite

	Removed the uniform buffer resource caching from OpenGLDrv & implemented GetTextureBaseRHI to avoid unnecessary virtual function calls to match Dev-Rendering CL #2853948.

Change 2854279 on 2016/02/03 by Mark.Satterthwaite

	Remove direct access to the MTLCommandQueue, for parallel rendering to work we're going to need to do a bit of management that means its more sensible to keep it private.

Change 2855524 on 2016/02/04 by Lee.Clark

	PS4 - Fix Grayscale SRGB support

[CL 2898161 by Josh Adams in Main branch]
2016-03-07 20:55:29 -05:00
Ben Marsh
f402006cb7 Merging //UE4/Release-4.11 to //UE4/Main (Up to CL#2867947)
==========================
MAJOR FEATURES + CHANGES
==========================

Change 2858603 on 2016/02/08 by Tim.Hobson

	#jira UE-26550 - checked in new art assets for buttons and symbols

Change 2858665 on 2016/02/08 by Taizyd.Korambayil

	#jira UE-25797 Added TextureLODSettings for Ipad Mini set all LODBias to 2.

Change 2858668 on 2016/02/08 by Matthew.Griffin

	Added InfiltratorDemo back into Rocket samples

	#jira UEB-591

Change 2858743 on 2016/02/08 by Taizyd.Korambayil

	#jira UE-25996 Fixed Import Error in TopDOwn Code

Change 2858776 on 2016/02/08 by Matthew.Griffin

	Added UnrealMatch3 to packaged projects

	#jira UEB-589

Change 2858900 on 2016/02/08 by Taizyd.Korambayil

	#jira UE-15234 Switched all Mask Textures to use the (Mask,No sRGB) Compression

Change 2858947 on 2016/02/08 by Mike.Beach

	Controlling more when VerifyImport() is ran - trying to  prevent Verify() from running when DeferDependencyLoads is on, and instead trying to fully verify every import upfront (where it's meant to happen) before serializing in the package's contents (to alleviate cyclic dependency complications).

	#jira UE-21098

Change 2858954 on 2016/02/08 by Taizyd.Korambayil

	#jira UE-25524 Resaved Sound Assets to Fix NodeGuid Warnings

Change 2859126 on 2016/02/08 by Max.Chen

	Sequencer: Release track editors when destroying sequencer

	#jira UE-26423

Change 2859147 on 2016/02/08 by Martin.Wilson

	Fix uninitialized variable bug

	#jira UE-26606

Change 2859237 on 2016/02/08 by Lauren.Ridge

	Bumping Match 3 Version Number for iTunes Connect

	#jira UE-26648

Change 2859434 on 2016/02/08 by Chad.Taylor

	Handle the quit and focus message pipe from the SteamVR SDK

	#jira UEBP-142

Change 2859562 on 2016/02/08 by Chad.Taylor

	Mac/Android compile fix

	#jira UEBP-142

Change 2859633 on 2016/02/08 by Dan.Oconnor

	Transaction buffer uniformly address subobjects and SCS created components via an array of names and a root object. This allows undo/redo to work reliably to any depth of object hierarchy. Removed FReferencedObject and replaced it with the robust FPersistentObjectRef.

	DefaultSubObjects of the CDO are now tagged as RF_Archetype at construction (logic in PropertyHandleImpl.cpp probably no longer required)

	Actors reinstanced due to blueprint compilation now have stable names, so that this name can be used to reference their subobjects.

	This is also part of the fix needed for UE-23335, completely fixes UE-26045

	This version of the fix is less aggressive about searching all the way up an object's outer chain before stopping. Fixes issues with parts of outer chain changing on PIE. Also doesn't add objects referenced by subobject name to any AddReference calls which fixes race conditions with GC.

	Also fixes bad logic in CopyPropertiesForUnrelatedObjects, which would create copies of subobjects that already existed because we were populating the ReferenceReplacementMap before adding all existing subobjects (always components in this case)

	#jira UE-26045

Change 2859640 on 2016/02/08 by Dan.Oconnor

	Removed debugging code..

	#jira UE-26045

Change 2859668 on 2016/02/08 by Aaron.McLeran

	#jira UE-26503 A Mixer with a Concatenator node won't loop with a Looping node

	- issue was the looping nodes weren't properly reseting all the child wave instances
	- also looping nodes weren't reporting the correct GetNumSounds() count for use with sequencer node

Change 2859688 on 2016/02/08 by Chris.Babcock

	Allow external access to runtime modifications to OpenGL shaders
	#jira UE-26679
	#ue4

Change 2859739 on 2016/02/08 by Chad.Taylor

	UE4_Win64_Mono compile fix

	#jira UEBP-142

Change 2859962 on 2016/02/09 by Chris.Wood

	Passing command line to Crash Report Client without stripping the project name.
	[UE-24959] - "Send and Restart" brings up the Project Browser
	#jira UE-24959

	Reimplement changes from Orion in UE 4.11
	Reimplementing the command line logging filtering over from Dev-Core (same change as CL 2821359 that moved this change into Orion)
	Reimplementing passing full command line to Crash Report Client (same change as CL 2858617 in Orion)

Change 2859966 on 2016/02/09 by Matthew.Griffin

	Fixed shadow variable issue that was causing build failure in NonUnity mode on Mac

[CL 2873884 by Ben Marsh in Main branch]
2016-02-19 13:49:13 -05:00
Matthew Griffin
bb70b349ce Merging CL 2804086 from //UE4/Release-4.11 to Dev-Main (//UE4/Dev-Main) to isolate copyright update
#lockdown Nick.Penwarden

[CL 2819020 by Matthew Griffin in Main branch]
2016-01-07 08:17:16 -05:00
Peter Sauerbrei
540d4a60aa fix for executable size in the fat binary header when signing
UE-8497
#ios

[CL 2422243 by Peter Sauerbrei in Main branch]
2015-01-28 10:47:54 -05:00
Ben Marsh
149375b14b Update copyright notices to 2015.
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Tim Sweeney
324683ce78 Engine source (Main branch up to CL 2026164) 2014-03-14 14:13:41 -04:00