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
46,268 Commits 23 Branches 254 Tags
c8fe08076ce8f656b79dfffe2b66dd9cbdf499ac
Commit Graph

922 Commits

Author SHA1 Message Date
chris gagnon
435467dd55 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) 
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 4837001 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4837013 by chris gagnon in Dev-Networking branch]
 2019-01-29 19:24:53 -05:00
James Hopkin
51d5e59cbe Copying //UE4/Dev-Console to Main (//UE4/Main) Source CL: 4825024 
#lockdown: Nick.Penwarden
#rb integration


#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: joe.barnes
#ROBOMERGE-SOURCE: CL 4825156 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4828298 by James Hopkin in Dev-Networking branch]
 2019-01-29 04:28:43 -05:00
ryan vance
398a8c4814 Copying //UE4/Dev-VR to Dev-Main (//UE4/Dev-Main) Souce CL: 4824152 
#lockdown: Nick.Penwarden
#rb Integration

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

[CL 4824878 by ryan vance in Dev-Networking branch]
 2019-01-28 16:32:53 -05:00
sam zamani
9c1c3cc4fd Added "NetErrorLogInterval" config to reduce network connection failure log spam 
[at]josh.markiewicz, [at]ryan.gerleve

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: sam.zamani
#ROBOMERGE-SOURCE: CL 4806517 via CL 4806787 via CL 4806834 via CL 4809381 via CL 4809616
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4810051 by sam zamani in Dev-Networking branch]
 2019-01-25 05:16:42 -05:00
jack porter
2bbc43bc53 Copying //UE4/Dev-Mobile to Dev-Main (//UE4/Dev-Main) Souce CL: 4806680 
#lockdown: Nick.Penwarden
#rb None

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 4806726 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4806733 by jack porter in Dev-Networking branch]
 2019-01-24 20:39:08 -05:00
matt collins
2b2dd365d8 Moving heuristics to Fortnite only. 
#jira UE-65764
#rb none

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: matt.collins
#ROBOMERGE-SOURCE: CL 4785067 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4788126 by matt collins in Dev-Networking branch]
 2019-01-23 16:06:39 -05:00
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
max chen
fa7cf1f29a Copying //UE4/Dev-Sequencer [at] 4773300 to Dev-Main (//UE4/Dev-Main) 
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: max.chen
#ROBOMERGE-SOURCE: CL 4773320 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4782701 by max chen in Dev-Networking branch]
 2019-01-23 09:49:24 -05:00
robert manuszewski
be36beb7e4 Copying //UE4/Dev-Core [at] 4771952 to Dev-Main (//UE4/Dev-Main) 
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 4772220 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4782699 by robert manuszewski in Dev-Networking branch]
 2019-01-23 09:49:18 -05:00
marc audy
892f022bda Copying //UE4/Dev-Framework to Dev-Main (//UE4/Dev-Main) [at] 4736279 
#rb
#rnx

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 4736445 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4736453 by marc audy in Dev-Networking branch]
 2019-01-16 16:19:29 -05:00
peter knepley
8b77430984 ProfileGPUHitches should autocomplete in console 
[FYI] Bob.Tellez

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: peter.knepley
#ROBOMERGE-SOURCE: CL 4735348 via CL 4735354 via CL 4735361 via CL 4735946
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4736064 by peter knepley in Dev-Networking branch]
 2019-01-16 15:37:31 -05:00
david hamm
c75081b36f Added support for using display cutout region on Android 
- added new project setting bUseDisplayCutout
- temporary restriction to HUAWEI devices for this release (remove later)

#android
#rb Jack.Porter

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 4732433 via CL 4732462 via CL 4732476 via CL 4732493 via CL 4732510
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4732567 by david hamm in Dev-Networking branch]
 2019-01-16 10:14:53 -05:00
matt kuhlenschmidt
6a07a27806 Unshelved from pending changelist '4725278': 
[CODEREVIEW] matt.kuhlenschmidt,jeff.williams

Merge conflict.
matt.kuhlenschmidt, please merge this change by hand.
More info at https://robomerge.epicgames.net#FORTNITE

/src/robomerge_ue4_main_01/Engine/Config/BaseDeviceProfiles.ini - merging //Fortnite/Dev-EngineMerge/Engine/Config/BaseDeviceProfiles.ini#2


--------------------------------------
Disable mipmaps by default on UI texture group

#rb Pete.Sauerbrei
[CODEREVIEW] nick.darnell

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: matt.kuhlenschmidt
#ROBOMERGE-SOURCE: CL 4725269 via CL 4725272 via CL 4725374
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4725381 by matt kuhlenschmidt in Dev-Networking branch]
 2019-01-15 14:25:35 -05:00
ben marsh
cf4a18955c Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main) 
#rb none
#rnx

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4718806 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4718825 by ben marsh in Dev-Networking branch]
 2019-01-14 12:15:37 -05:00
lina halper
76003579dd Copying //UE4/Dev-Anim to Main (//UE4/Main) 
[FYI] Laurent.Delayen, Thomas.Sarkanen
#rb: none
#lockdown thomas.sarkanen

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: lina.halper
#ROBOMERGE-SOURCE: CL 4715449 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4715461 by lina halper in Dev-Networking branch]
 2019-01-11 22:36:30 -05:00
ryan gerleve
b41214417e Resolving conflict from Dev-Enterprise. 
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Runtime/Sockets/Private/BSDSockets/SocketsBSD.cpp - merging //UE4/Main/Engine/Source/Runtime/Sockets/Private/BSDSockets/SocketsBSD.cpp#20


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

#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: francis.hurteau
#ROBOMERGE-SOURCE: CL 4705151 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4712032 by ryan gerleve in Dev-Networking branch]
 2019-01-11 14:26:15 -05:00
phillip kavan
4ebac2ca28 Slight improvement to editor startup/load times by deferring Blueprint search data re-indexing work on load. 
Notes:
- Blueprint asset re-indexing is now queued and occurs only when a Blueprint editor window OR any global Find-in-Blueprint tab is open.
- Includes an editor INI option (bDisableDeferredIndexing) to allow the new UX to be disabled if necessary (i.e. revert to previous behavior).

#jira UE-65489
#rb Dan.OConnor

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: phillip.kavan
#ROBOMERGE-SOURCE: CL 4691239 via CL 4691376
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4710564 by phillip kavan in Dev-Networking branch]
 2019-01-11 12:59:12 -05:00
James Hopkin
235137b0cc Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking) 
Copying to Dev-Main @ CL# 4688301

#rb none

[CL 4707991 by James Hopkin in Dev-Networking branch]
 2019-01-11 02:57:03 -05:00
chris gagnon
aad5335ff6 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) 
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: chris.gagnon
#ROBOMERGE-SOURCE: CL 4676940 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4676943 by chris gagnon in Dev-Networking branch]
 2019-01-02 15:37:07 -05:00
ryan gerleve
9843ebaa9f Merging conflict by hand. 
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Plugins/Experimental/GeometryCollectionPlugin/Source/GeometryCollectionEditor/GeometryCollectionEditor.Build.cs - merging //UE4/Main/Engine/Plugins/Experimental/GeometryCollectionPlugin/Source/GeometryCollectionEditor/GeometryCollectionEditor.Build.cs#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDCollisionConstraint.cpp - merging //UE4/Main/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDCollisionConstraint.cpp#1
/src/ROBOMERGE_ENGINE_Dev_Networking/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDRigidsEvolution.cpp - merging //UE4/Main/Engine/Source/Runtime/Experimental/Chaos/Private/Chaos/PBDRigidsEvolution.cpp#1


--------------------------------------
Copying //UE4/Dev-Physics to //UE4/Dev-Main.

#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: michael.lentine
#ROBOMERGE-SOURCE: CL 4653110 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4653305 by ryan gerleve in Dev-Networking branch]
 2018-12-12 11:43:42 -05:00
marcus wassmer
f43eb0e188 Copying //UE4/Dev-Rendering[at]4626416 to Dev-Main (//UE4/Dev-Main) 
#rb none
#lockdown nick.penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 4626501 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4626516 by marcus wassmer in Dev-Networking branch]
 2018-12-03 22:27:31 -05:00
robert manuszewski
e73029037a The cooker will now attempt to collect garbage when the engine is getting close to running out of available UObject indices (reimplementing CL #4581474 from Dev-Core). Bumped max UObject count in the editor. 
#rb none
#jira UE-66989
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 4614594 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4614613 by robert manuszewski in Dev-Networking branch]
 2018-11-30 00:48:30 -05:00
ryan gerleve
289a4fa159 Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main) 
#rb none
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 4567513 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4573136 by ryan gerleve in Dev-Networking branch]
 2018-11-16 14:01:06 -05:00
ryan gerleve
53a3e4eaa8 Copying //UE4/Release-Staging-4.21 to Dev-Main (//UE4/Dev-Main) [at] 4547701 
#rb
#rnx
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 4547706 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4548022 by ryan gerleve in Dev-Networking branch]
 2018-11-07 11:34:19 -05:00
marc audy
9e9c0fdb36 Copying //UE4/Release-Staging-4.21 to Dev-Main (//UE4/Dev-Main) [at] 4530863 
#rb none
#rnx
#lockdown Nick.Penwarden

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: marc.audy
#ROBOMERGE-SOURCE: CL 4530881 in //UE4/Main/...
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4530882 by marc audy in Dev-Networking branch]
 2018-11-01 09:57:31 -04:00