izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merging UE4-Pretest @ 2042161 to UE4

Browse Source 
Change 1996384 by Andrew Brown:
	322252 - EDITOR: Asset picker displays incorrect text when there are no filter results.
Change 1996385 by Andrew Brown:
	321858 - CRASH: Assertion failed: (Index >= 0) Function: STransformViewportToolBar::GetLocationGridLabel() STextBlock::CacheDesiredSize()
Change 1996977 by Andrew Brown:
	309685 - UE4: Adding an event/renaming an event on an event track in Matinee does not update the MatineeActor node in blueprint
Change 2034873 by Jaroslaw Palczynski:
	More robust VS installation detection.
Change 2039693 by Jaroslaw Palczynski:
	327268 - RocketGDC: POSTLAUNCH: DEV: Make engine more robust against bad Visual Studio environment variables
Change 1978978 by Jaroslaw Surowiec:
	- Removed obsolete AllowEliminatingReferences from the FArchive
Change 2020326 by Maciej Mroz:
	pretest BP K2Node: RemovePinsFromOldPins function moved from K2Node to RemovePinsFromOldPins
Change 2017608 by Maciej Mroz:
	pretest Some changes in SFortMissionEventSelector caused by FPinTypeTreeInfo
Change 2017463 by Maciej Mroz:
	PinTypeSelector can lins unloaded UDStructs
Change 2019979 by Maciej Mroz:
	pretest BP: Crash when performing Diff against Depot with blueprints containing Format Text nodes
Change 2024469 by Maciej Mroz:
	MemberReference variable added to PinType. It's necessary for delegate's signature.
Change 2024049 by Maciej Mroz:
	HasExternalBlueprintDependencies added to UK2Node_DynamicCast
Change 2024586 by Maciej Mroz:
	FillSimpleMemberReference fix
Change 2024472 by Maciej Mroz:
	workaround for delegates signature in pintype removed.
Change 2023997 by Maciej Mroz:
	BP, UDStruc: Class UserDefinedStructEditorData added. It fixes many problems with undo/redo.
Change 2021934 by Maciej Mroz:
	typo in a comment
Change 2020355 by Maciej Mroz:
	Back out changelist 2020342
Change 2022178 by Maciej Mroz:
	CRASH: PRETEST: EDITOR: UDS: Crash when undo then redo new variable in struct that is used by blueprint
Change 2021958 by Maciej Mroz:
	CRASH: PRETEST: EDITOR: UDS: Crash using variable of a type of copied struct in blueprint
Change 1986247 by Maciej Mroz:
	User Defined Structures: circle dependency fixed. Early version.
Change 1985107 by Maciej Mroz:
	UserDefinedStruct cannot have a field of a non-native type
Change 1986278 by Maciej Mroz:
	pretest ensureMsgf in Struct::link
Change 1986250 by Maciej Mroz:
	User Defined Struct: Non native classes are accepted types od values in structures.
Change 1980955 by Maciej Mroz:
	Using AssetPtr and LazyPtr as UFunction parameter (intput or return) is explicitly disallowed.
Change 2041215 by Maciej Mroz:
	ttp331249 BLOCKER: PRETEST: UI: Survive the Storm is missing the Mission HUD.
Change 1984316 by Maciej Mroz:
	New User Defined Structure. WIP - there are still problems with circular dependencies.
Change 2011616 by Maciej Mroz:
	UserDefinedStructures - various problems fixed.
Change 2011609 by Maciej Mroz:
	more robust HasExternalBlueprintDependencies implementation
Change 2016697 by Maciej Mroz:
	pretest BP: UDStruct - default value propagation in cooked build
Change 2016288 by Maciej Mroz:
	pretest BP: UDStruct: Renaming variables wont break links from make/break nodes
Change 1987637 by Maciej Mroz:
	CustomStruct icons placeholders
Change 1987422 by Maciej Mroz:
	Better tooltips for variables in MyBlueprint
Change 1991387 by Maciej Mroz:
	UDStructures fixes:
Change 2029165 by Maciej Mroz:
	BP: better comment for incomatible pins
Change 2030016 by Maciej Mroz:
	8PRETEST: EDITOR: UDS: Defaults values aren't updated in struct type variables in blueprints
Change 2030017 by Maciej Mroz:
	Unused UDStructure code removed (PPF_UseDefaultsForUDStructures)
Change 2028856 by Maciej Mroz:
	BP: Pins with PC_Struct type are compatible only with exactly the same structure. (No derived structures are not handled as compatible).
Change 2026701 by Maciej Mroz:
	k2: odd error on an add item node within a function (see attached image in details)
Change 2028160 by Maciej Mroz:
	PRETEST: EDITOR: UDS: When deleting structures just after creating there is always some references in the memory
Change 2028165 by Maciej Mroz:
	BP: BreakHitResult function has proper icon.
Change 2033340 by Maciej Mroz:
	ttp330786 PRETEST: EDITOR: UDS: Changes of default values aren't apllied to breeak nodes for text type of variables
Change 2034255 by Maciej Mroz:
	EDITOR: UDS: Changes of default values aren't apllied to make nodes for text type of variables ttp#330620
Change 2037682 by Maciej Mroz:
	ttp331309 BLOCKER: PRETEST: CRASH: EDITOR: Crash occurs when performing Diff Against Depot on any Blueprint
Change 2033142 by Maciej Mroz:
	CreateDelegate Node uses internally FMemberReference. Refactor.
Change 2032329 by Maciej Mroz:
	ttp330608 CRASH: PRETEST: EDITOR: UDS: Crash when trying to use struct named 'Color' in blueprint
Change 2032420 by Maciej Mroz:
	ttp330620 PRETEST: EDITOR: UDS: Changes of default values aren't apllied to make nodes for text type of variables
Change 2033139 by Maciej Mroz:
	Functions generated from CustomEvents can be also identified by GUID
Change 2026631 by Maciej Mroz:
	BP. UDStruct: Invalid structs are handled better.
Change 2025344 by Maciej Mroz:
	UDStruct enabled by default
Change 2026672 by Maciej Mroz:
	EDITOR: BP: Can't easily remove 'pass-by-reference' pins on ReturnNodes
Change 2026411 by Maciej Mroz:
	ExposeOnSpawn updated, it supports UDStructs, custom native Structs, and it throws compiler error.
Change 2025342 by Maciej Mroz:
	GenerateBlueprintSkeleton moved from BLueprint::Serialize to RegenerateBlueprintClass, because SkeletonClass compilation requires all external dependencies to be loaded and linked.
Change 2025570 by Steve Robb:
	Moved dependency processing to its own function.
Change 2033235 by Steve Robb:
	String improvements
Change 2035830 by Steve Robb:
	Workaround for FriendsAndChat crash in Fortnite.
Change 2035115 by Steve Robb:
	UBT build time regression fixes.
Change 2034162 by Steve Robb:
	312775: UObject improvement: Ensure that *.generated.inl is included somewhere
Change 2034181 by Steve Robb:
	Removal of any references to .generated.inl
Change 2020165 by Steve Robb:
	BuildPublicAndPrivateUObjectHeaders factored out into its own function.
Change 2020187 by Steve Robb:
	CreateModuleCompileEnvironment function factored out.
Change 2020055 by Steve Robb:
	Refactoring of Unity.cs to remove complex and duplicate iteration.
Change 2020083 by Steve Robb:
	Another use of dictionary utilities.
Change 2031049 by Steve Robb:
	312775: UObject improvement: Ensure that *.generated.inl is included somewhere
Change 2025728 by Steve Robb:
	Refactored the application of a shared PCH file to multiple file into a single ApplySharedPCH function.
Change 2020068 by Steve Robb:
	A couple of helpful utility functions for populating dictionaries.
Change 2032307 by Steve Robb:
	312775: UObject improvement: Ensure that *.generated.inl is included somewhere

[CL 2054495 by Robert Manuszewski in Main branch]
This commit is contained in:
Robert Manuszewski
2014-04-23 20:18:55 -04:00
committed by UnrealBot
parent 0b22d1a1ce
commit aa11e3bbbf
242 changed files with 4797 additions and 3073 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Build/BatchFiles/Clean.bat
+14 -4
View File
@@ -29,15 +29,25 @@ if not "%INCLUDE%" == "" if not "%LIB%" == "" goto ReadyToCompile
rem ## Check for Visual Studio 2013
if "%VS120COMNTOOLS%" == "" goto NoVisualStudio2013Environment
call "%VS120COMNTOOLS%/../../VC/bin/x86_amd64/vcvarsx86_amd64.bat" >NUL
pushd %~dp0
call GetVSComnToolsPath 12
popd
if "%VsComnToolsPath%" == "" goto NoVisualStudio2013Environment
call "%VsComnToolsPath%/../../VC/bin/x86_amd64/vcvarsx86_amd64.bat" >NUL
goto ReadyToCompile
rem ## Check for Visual Studio 2012
pushd %~dp0
call GetVSComnToolsPath 11
popd
:NoVisualStudio2013Environment
if "%VS110COMNTOOLS%" == "" goto NoVisualStudio2012Environment
call "%VS110COMNTOOLS%/../../VC/bin/x86_amd64/vcvarsx86_amd64.bat" >NUL
if "%VsComnToolsPath%" == "" goto NoVisualStudio2012Environment
call "%VsComnToolsPath%/../../VC/bin/x86_amd64/vcvarsx86_amd64.bat" >NUL
goto ReadyToCompile
Engine/Build/BatchFiles/CopyVisualizers.bat
+11 -3
View File
@@ -5,13 +5,21 @@ reg query "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\
if errorlevel 0 (
for /f "tokens=2,*" %%a in ('reg query "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" /v Personal ^| findstr Personal') do (
set UE4_MyDocs=%%b
if "%VS120COMNTOOLS%" == "" goto NoVisualStudio2013Environment
pushd %~dp0
call GetVSComnToolsPath 12
popd
if "%VsComnToolsPath%" == "" goto NoVisualStudio2013Environment
attrib -R "!UE4_MyDocs!\Visual Studio 2013\Visualizers\UE4.natvis" 1>nul 2>nul
copy /Y "%~dp0..\..\Extras\VisualStudioDebugging\UE4.natvis" "!UE4_MyDocs!\Visual Studio 2013\Visualizers\UE4.natvis" 1>nul 2>nul
:NoVisualStudio2013Environment
if "%VS110COMNTOOLS%" == "" goto NoVisualStudio2012Environment
pushd %~dp0
call GetVSComnToolsPath 11
popd
if "%VsComnToolsPath%" == "" goto NoVisualStudio2012Environment
attrib -R "!UE4_MyDocs!\Visual Studio 2012\Visualizers\UE4.natvis" 1>nul 2>nul
copy /Y "%~dp0..\..\Extras\VisualStudioDebugging\UE4.natvis" "!UE4_MyDocs!\Visual Studio 2012\Visualizers\UE4.natvis" 1>nul 2>nul
Engine/Build/BatchFiles/GenerateProjectFiles.bat
+15 -5
View File
@@ -28,15 +28,25 @@ if not "%INCLUDE%" == "" if not "%LIB%" == "" goto ReadyToCompile
rem ## Check for Visual Studio 2013
if "%VS120COMNTOOLS%" == "" goto NoVisualStudio2013Environment
call "%VS120COMNTOOLS%/../../VC/bin/x86_amd64/vcvarsx86_amd64.bat" >NUL
pushd %~dp0
call GetVSComnToolsPath 12
popd
if "%VsComnToolsPath%" == "" goto NoVisualStudio2013Environment
call "%VsComnToolsPath%/../../VC/bin/x86_amd64/vcvarsx86_amd64.bat" >NUL
goto ReadyToCompile
rem ## Check for Visual Studio 2012
pushd %~dp0
call GetVSComnToolsPath 11
popd
:NoVisualStudio2013Environment
if "%VS110COMNTOOLS%" == "" goto NoVisualStudioEnvironment
call "%VS110COMNTOOLS%/../../VC/bin/x86_amd64/vcvarsx86_amd64.bat" >NUL
if "%VsComnToolsPath%" == "" goto NoVisualStudioEnvironment
call "%VsComnToolsPath%/../../VC/bin/x86_amd64/vcvarsx86_amd64.bat" >NUL
goto ReadyToCompile
@@ -75,7 +85,7 @@ goto Exit
:Error_NoVisualStudioEnvironment
echo.
echo GenerateProjectFiles ERROR: We couldn't find a valid installation of Visual Studio. This program requires either Visual Studio 2013 or Visual Studio 2012. Please check that you have Visual Studio installed, then verify that the VS120COMNTOOLS environment variable is set. Visual Studio configures this environment variable when it is installed, and this program expects it to be set to the '\Common7\Tools\' sub-folder under a valid Visual Studio installation directory.
echo GenerateProjectFiles ERROR: We couldn't find a valid installation of Visual Studio. This program requires either Visual Studio 2013 or Visual Studio 2012. Please check that you have Visual Studio installed, then verify that the HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\12.0\InstallDir (or HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\12.0\InstallDir on 32-bit machines) registry value is set. Visual Studio configures this value when it is installed, and this program expects it to be set to the '\Common7\IDE\' sub-folder under a valid Visual Studio installation directory.
echo.
pause
goto Exit
Engine/Build/BatchFiles/GetVSComnToolsPath.bat
+40
View File
@@ -0,0 +1,40 @@
@ECHO off
SET VSComnToolsPath=
SET TmpPath=""
REM Non-express VS2013 on 64-bit machine.
FOR /f "tokens=2,*" %%A IN ('REG.exe query HKLM\Software\Wow6432Node\Microsoft\VisualStudio\%1.0 /v "InstallDir" 2^>Nul') DO (
SET TmpPath="%%B\..\Tools"
)
REM Non-express VS2013 on 32-bit machine.
IF %TmpPath% == "" (
FOR /f "tokens=2,*" %%A IN ('REG.exe query HKLM\Software\Microsoft\VisualStudio\%1.0 /v "InstallDir" 2^>Nul') DO (
SET TmpPath="%%B\..\Tools"
)
)
REM Express VS2013 on 64-bit machine.
IF %TmpPath% == "" (
FOR /f "tokens=2,*" %%A IN ('REG.exe query HKLM\Software\Wow6432Node\Microsoft\WDExpress\%1.0 /v "InstallDir" 2^>Nul') DO (
SET TmpPath="%%B\..\Tools"
)
)
REM Express VS2013 on 32-bit machine.
IF %TmpPath% == "" (
FOR /f "tokens=2,*" %%A IN ('REG.exe query HKLM\Software\Microsoft\WDExpress\%1.0 /v "InstallDir" 2^>Nul') DO (
SET TmpPath="%%B\..\Tools"
)
)
IF NOT %TmpPath% == "" (
CALL :normalisePath %TmpPath%
)
GOTO :EOF
:normalisePath
SET VSComnToolsPath=%~f1
GOTO :EOF
Engine/Build/BatchFiles/RocketGenerateProjectFiles.bat
+7 -2
View File
@@ -23,8 +23,13 @@ if not "%INCLUDE%" == "" if not "%LIB%" == "" goto ReadyToCompile
rem ## Check for Visual Studio 2013
if "%VS120COMNTOOLS%" == "" goto NoVisualStudio2013Environment
call "%VS120COMNTOOLS%/../../VC/bin/x86_amd64/vcvarsx86_amd64.bat" >NUL
pushd %~dp0
call GetVSComnToolsPath 12
popd
if "%VsComnToolsPath%" == "" goto NoVisualStudio2013Environment
call "%VsComnToolsPath%/../../VC/bin/x86_amd64/vcvarsx86_amd64.bat" >NUL
goto ReadyToCompile
Engine/Build/BatchFiles/RunUAT.bat
+14 -4
View File
@@ -31,15 +31,25 @@ if not "%INCLUDE%" == "" if not "%LIB%" == "" goto ReadyToCompile
echo path="%path%"
rem ## Check for Visual Studio 2013
if "%VS120COMNTOOLS%" == "" goto NoVisualStudio2013Environment
call "%VS120COMNTOOLS%/../../VC/bin/x86_amd64/vcvarsx86_amd64.bat" >NUL
pushd %~dp0
call GetVSComnToolsPath 12
popd
if "%VsComnToolsPath%" == "" goto NoVisualStudio2013Environment
call "%VsComnToolsPath%/../../VC/bin/x86_amd64/vcvarsx86_amd64.bat" >NUL
goto ReadyToCompile
rem ## Check for Visual Studio 2012
:NoVisualStudio2013Environment
if "%VS110COMNTOOLS%" == "" goto RunPrecompiled
call "%VS110COMNTOOLS%/../../VC/bin/x86_amd64/vcvarsx86_amd64.bat" >NUL
pushd %~dp0
call GetVSComnToolsPath 11
popd
if "%VsComnToolsPath%" == "" goto RunPrecompiled
call "%VsComnToolsPath%/../../VC/bin/x86_amd64/vcvarsx86_amd64.bat" >NUL
goto ReadyToCompile
Engine/Config/BaseEditor.ini
+1 -1
View File
@@ -242,7 +242,7 @@ SupportWebsiteURL="http://unrealengine.com/support"
[IntrinsicMetaData]
[UserDefinedStructure]
bUseUserDefinedStructure=false
bUseUserDefinedStructure=true
[EpicSurvey]
Source="CDN"
Engine/Plugins/Developer/UObjectPlugin/Source/UObjectPlugin/Private/UObjectPlugin.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
#include "UObjectPluginPrivatePCH.h"
#include "MyPluginObject.h"
#include "UObjectPlugin.generated.inl"
class FUObjectPlugin : public IUObjectPlugin
Engine/Plugins/Developer/VisualStudioSourceCodeAccess/Source/VisualStudioSourceCodeAccess/Private/VisualStudioSourceCodeAccessor.cpp
+3 -6
View File
@@ -820,16 +820,13 @@ bool FVisualStudioSourceCodeAccessor::OpenVisualStudioFileAtLineInternal(const F
void FVisualStudioSourceCodeAccessor::AddVisualStudioVersion(const int MajorVersion, const bool bAllowExpress)
{
// We can use the common tools macro to work out if this version of Visual Studio is installed
const FString CommonToolsEnvVar = FString::Printf(TEXT("VS%d0COMNTOOLS"), MajorVersion);
TCHAR CommonToolsPath[MAX_PATH];
FPlatformMisc::GetEnvironmentVariable(*CommonToolsEnvVar, CommonToolsPath, ARRAY_COUNT(CommonToolsPath));
if (!FCString::Strlen(CommonToolsPath))
FString CommonToolsPath;
if (!FPlatformMisc::GetVSComnTools(MajorVersion, CommonToolsPath))
{
return;
}
FString BaseExecutablePath = FPaths::Combine(CommonToolsPath, TEXT(".."), TEXT("IDE"));
FString BaseExecutablePath = FPaths::Combine(*CommonToolsPath, TEXT(".."), TEXT("IDE"));
FPaths::NormalizeDirectoryName(BaseExecutablePath);
FPaths::CollapseRelativeDirectories(BaseExecutablePath);
Engine/Plugins/Editor/IntroTutorials/Source/IntroTutorials/Private/InteractiveTutorials.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include "InteractiveTutorials.h"
#include "InteractivityData.h"
#include "K2Node_TutorialExcerptComplete.h"
#include "IntroTutorials.generated.inl"
#include "Editor/LevelEditor/Public/LevelEditor.h"
#include "Editor/UnrealEd/Public/Toolkits/AssetEditorManager.h"
#include "Editor/PlacementMode/Public/IPlacementModeModule.h"
Engine/Plugins/Experimental/LiveEditor/Source/LiveEditor/Private/LiveEditor.cpp
+1 -1
View File
@@ -4,7 +4,7 @@
#include "EdGraphUtilities.h"
#include "WorkspaceMenuStructureModule.h"
#include "LiveEditorConfigWindow.h"
#include "LiveEditor.generated.inl"
#include "BlueprintEditor.h"
#include "BlueprintEditorModes.h"
Engine/Plugins/Experimental/MathExpressions/Source/MathExpressions/Private/MathExpressionsPlugin.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
// Copyright 1998-2014 Epic Games, Inc. All Rights Reserved.
#include "MathExpressionsPrivatePCH.h"
#include "MathExpressions.generated.inl"
class FMathExpressionsPlugin : public IMathExpressionsPlugin
Engine/Plugins/Experimental/Paper2D/Source/Paper2D/Private/Paper2DModule.cpp
+1 -1
View File
@@ -3,7 +3,7 @@
#include "Paper2DPrivatePCH.h"
#include "Paper2DModule.h"
#include "Paper2D.generated.inl"
#include "Physics/Box2DIntegration.h"
Engine/Plugins/Experimental/Paper2D/Source/Paper2DEditor/Private/Paper2DEditorModule.cpp
+1 -1
View File
@@ -19,7 +19,7 @@
#include "ContentBrowserExtensions/ContentBrowserExtensions.h"
#include "Paper2DEditor.generated.inl"
//////////////////////////////////////////////////////////////////////////
// FPaper2DEditor
Engine/Plugins/Experimental/Paper2D/Source/PaperJsonImporter/Private/PaperJsonImporterModule.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
// Copyright 1998-2014 Epic Games, Inc. All Rights Reserved.
#include "PaperJsonImporterPrivatePCH.h"
#include "PaperJsonImporter.generated.inl"
//////////////////////////////////////////////////////////////////////////
// FPaperJsonImporterModule
Engine/Plugins/Experimental/Phya/Source/Phya/Private/PhyaPlugin.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include "PhyaPluginPrivatePCH.h"
#include "Phya.generated.inl"
class FPhyaPlugin : public IPhyaPlugin
Engine/Plugins/Messaging/UdpMessaging/Source/UdpMessaging/Private/UdpMessagingClasses.cpp
+1 -1
View File
@@ -5,7 +5,7 @@
=============================================================================*/
#include "UdpMessagingPrivatePCH.h"
#include "UdpMessaging.generated.inl"
UUdpMessagingSettings::UUdpMessagingSettings( const class FPostConstructInitializeProperties& PCIP )
Engine/Plugins/Runtime/CableComponent/Source/CableComponent/Private/CableComponentPlugin.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include "CableComponentPluginPrivatePCH.h"
#include "CableComponent.generated.inl"
class FCableComponentPlugin : public IModuleInterface
Engine/Plugins/Runtime/CustomMeshComponent/Source/CustomMeshComponent/Private/CustomMeshComponentPlugin.cpp
+1 -1
View File
@@ -2,7 +2,7 @@
#include "CustomMeshComponentPluginPrivatePCH.h"
#include "CustomMeshComponent.generated.inl"
class FCustomMeshComponentPlugin : public ICustomMeshComponentPlugin
Engine/Plugins/Runtime/SoundVisualizations/Source/SoundVisualizations/Private/SoundVisualizationsPlugin.cpp
+1 -1
View File
@@ -1,7 +1,7 @@
// Copyright 1998-2014 Epic Games, Inc. All Rights Reserved.
#include "SoundVisualizationsPrivatePCH.h"
#include "SoundVisualizations.generated.inl"

Some files were not shown because too many files have changed in this diff Show More