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
Files
efd1e982344025084cf5d8b6a5fe4c7a72dfd976
UnrealEngineUWP/Engine/Source/Developer
History
ryan gerleve efd1e98234 Resolving conflict. 
/src/ROBOMERGE_ENGINE_Dev_Networking/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.cpp - merging //UE4/Main/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.cpp#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.h - merging //UE4/Main/Enterprise/Plugins/Editor/DatasmithFBXImporter/Source/DatasmithDeltaGenImporter/Private/DatasmithDeltaGenImporterAuxFiles.h#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Enterprise/Plugins/Editor/MDLImporter/Source/MDLImporter/Private/MDLImporterFactory.h - merging //UE4/Main/Enterprise/Plugins/Editor/MDLImporter/Source/MDLImporter/Private/MDLImporterFactory.h#1


--------------------------------------
Copying //UE4/Dev-Enterprise [at] cl 4784880 to Dev-Main (//UE4/Dev-Main)

#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jeanmichel.dignard
#ROBOMERGE-SOURCE: CL 4784913 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4788073 by ryan gerleve in Dev-Networking branch]
2019-01-23 16:05:15 -05:00
..
AITestSuite
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
AllDesktopTargetPlatform
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
Android
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
Apple/MetalShaderFormat
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
AssetTools
Fixed localization gather warnings
2019-01-21 15:19:57 -05:00
AudioFormatADPCM
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
AudioFormatOgg
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
AudioFormatOpus
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
AudioSettingsEditor
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
AutomationController
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
AutomationDriver
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
AutomationWindow
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
BlankModule
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
BlueprintCompilerCppBackend
Fix invalid cast of a nativized enum term to its underlying pointer type in generated Blueprint C++ code.
2019-01-23 09:47:16 -05:00
BlueprintNativeCodeGen
Copying //UE4/Dev-Framework to Dev-Main (//UE4/Dev-Main) [at] 4736279
2019-01-16 16:19:29 -05:00
CollectionManager
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
2019-01-02 15:37:07 -05:00
CollisionAnalyzer
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
CrashDebugHelper
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
CrashReportHelper
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
DerivedDataCache
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
DesktopPlatform
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
DesktopWidgets
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
DeviceManager
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
DirectoryWatcher
Resolving conflict from Dev-Enterprise.
2019-01-11 14:26:15 -05:00
ExternalImagePicker
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
FunctionalTesting
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
GameplayDebugger
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
GammaUI
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
GraphColor
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
HierarchicalLODUtilities
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
HotReload
Fix hot reload compiling all game modules. Caused by AnimationSharing module declaring itself as a game module (via IModuleInterface), and hot reload disabling shared PCHs if a non-game module (determined via directory location) is being rebuilt.
2019-01-23 09:47:14 -05:00
HTML5
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
IOS
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
LauncherServices
Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
2019-01-14 12:15:37 -05:00
Linux
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
Localization
Fixed empty translations being added to non-native LocRes files
2019-01-11 15:09:15 -05:00
LocalizationService
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
LogVisualizer
Resolving conflict from Dev-Enterprise.
2019-01-11 14:26:15 -05:00
Lumin
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
Mac
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
MaterialBaking
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
MaterialUtilities
Resolving conflict.
2019-01-23 16:05:15 -05:00
Merge
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
MeshBoneReduction
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
MeshBuilder
Copying //UE4/Dev-Anim to Main (//UE4/Main)
2019-01-11 22:36:30 -05:00
MeshDescriptionOperations
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
2019-01-02 15:37:07 -05:00
MeshMergeUtilities
Resolving conflict from Dev-Enterprise.
2019-01-11 14:26:15 -05:00
MeshReductionInterface
Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
2019-01-11 02:57:03 -05:00
MeshSimplifier
Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
2019-01-11 02:57:03 -05:00
MeshUtilities
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
MeshUtilitiesCommon
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
MessageLog
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
ModuleUI
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
OutputLog
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
2019-01-02 15:37:07 -05:00
PakFileUtilities
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
Profiler
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
ProfilerClient
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
ProfilerMessages
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
ProfilerService
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
ProjectLauncher
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
RawMesh
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
RealtimeProfiler
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
ScreenShotComparison
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
ScreenShotComparisonTools
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
SessionFrontend
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
Settings
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
SettingsEditor
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
ShaderCompilerCommon
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
ShaderFormatOpenGL
Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
2019-01-11 02:57:03 -05:00
ShaderFormatVectorVM
Copying //UE4/Dev-Niagara to Dev-Main (//UE4/Dev-Main) as of Niagara CL 4733936
2019-01-16 14:31:35 -05:00
ShaderPreprocessor
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
SharedSettingsWidgets
Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main)
2019-01-02 15:37:07 -05:00
SlackIntegrations
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
SlateFileDialogs
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
SlateReflector
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
SourceCodeAccess
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
SourceControl
Resolving conflict from Dev-Enterprise.
2019-01-11 14:26:15 -05:00
StandaloneRenderer
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
TargetDeviceServices
Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
2019-01-11 02:57:03 -05:00
TargetPlatform
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
TaskGraph
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
TextureCompressor
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
TextureFormatAndroid
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
TextureFormatASTC
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
TextureFormatDXT
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
TextureFormatIntelISPCTexComp
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
TextureFormatPVR
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
TextureFormatUncompressed
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
TreeMap
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00
VulkanShaderFormat
Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking)
2019-01-11 02:57:03 -05:00
Windows
Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main)
2019-01-23 09:49:18 -05:00
XGEController
Update copyright notices to 2019.
2018-12-14 13:44:01 -05:00