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

981 Commits

Author SHA1 Message Date
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
marc audy
38ed3b7edb Try to fix Linux's unnecessary complaints 
#jira UE-69090
#rb
#rnx

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

[CL 4815115 by marc audy in Dev-Networking branch]
 2019-01-25 15:09:19 -05:00
marc audy
abe25866e9 FFallbackStruct needs CPP struct ops 
#jira UE-68412
#jira UE-68477
#rb Michael.Noland

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

[CL 4812958 by marc audy in Dev-Networking branch]
 2019-01-25 12:31:46 -05:00
steve robb
d42cd122bf Refactored structs to reduce executable space from UHT-generated code tables. 
#rb robert.manuszewski
[FYI] peter.sauerbrei


#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: steve.robb
#ROBOMERGE-SOURCE: CL 4784689 via CL 4789908 via CL 4794430
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4803761 by steve robb in Dev-Networking branch]
 2019-01-24 15:50:36 -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
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
john barrett
f156ccf391 Added UObject 'OverridePerObjectConfigSection' virtual, so that PerObjectConfig instances can move away from using the transient package, for achieving short section names in .ini files. 
Using the transient package, would trigger name conflicts whenever two transient objects/PerObjectConfig-instances shared the same name, causing hard to predict crashes.

This also allows previously inaccessible ini sections, to be exposed to UObject reflection in the engine and editor - creating a path for moving GConfig sections to UObject/PerObjectConfig, in a backwards-compatible way.

#rb Robert.Manuszewski

#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: john.barrett
#ROBOMERGE-SOURCE: CL 4763438 via CL 4763440 via CL 4763441
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4763448 by john barrett in Dev-Networking branch]
 2019-01-21 14:47:07 -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
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
derek ehrman
2b4e5f64b1 * 3rd time's the charm. Still want exclusive CSV timing stat for incremental purge, just want it to live with same naming as higher level CSV stat. 
[FYI] James.Golding, Ben.Woodhouse


#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: derek.ehrman
#ROBOMERGE-SOURCE: CL 4703373 via CL 4703908
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4711392 by derek ehrman in Dev-Networking branch]
 2019-01-11 13:22:53 -05:00
derek ehrman
d74f121b16 * Reducing GC CSV stats down to one, incremental purge stat is redundant and subsumed by GC stat. 
[FYI] James.Golding, Ben.Woodhouse, Robert.Manuszewski



#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: derek.ehrman
#ROBOMERGE-SOURCE: CL 4701517 via CL 4702517
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4711289 by derek ehrman in Dev-Networking branch]
 2019-01-11 13:19:37 -05:00
derek ehrman
d51f21f801 * Adding CSV stats for overall and incremental garbage collection 
[FYI] James.Golding, Ben.Woodhouse, Robert.Manuszewski



#ROBOMERGE-OWNER: ryan.gerleve
#ROBOMERGE-AUTHOR: derek.ehrman
#ROBOMERGE-SOURCE: CL 4701451 via CL 4702476
#ROBOMERGE-BOT: ENGINE (Main -> Dev-Networking)

[CL 4711278 by derek ehrman in Dev-Networking branch]
 2019-01-11 13:19:22 -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
ben marsh
2b46ba7b94 Update copyright notices to 2019. 
#rb none
#lockdown Nick.Penwarden

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

[CL 4662413 by ben marsh in Dev-Networking branch]
 2018-12-14 13:44:01 -05:00
robert manuszewski
e1c4201c8f Making sure the editor custom version is serialized with package file summary in cases where the package doesn't have UMetaData object. Otherwise the package may get corrupted because the localization gather code already forces the editor custom version on the linker after the file summary has been serialized. Fixes package redirects not being able to save. 
#rb none
#jira UE-67251
#lockdown Nick.Penwarden

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

[CL 4647593 by robert manuszewski in Dev-Networking branch]
 2018-12-11 01:06:02 -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
Ryan Gerleve
9af1fb3463 Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking) 
#rb none
#rnx

[CL 4516466 by Ryan Gerleve in Dev-Networking branch]
 2018-10-29 10:01:28 -04:00
John Barrett
b6595ec478 Fixed live server crash with invalid package names passed to LoadPackage, in UPackageMap::InternalLoadObject. 
#JIRA FORT-117719
#rb Robert.Manuszewski

[CL 4505804 by John Barrett in Dev-Networking branch]
 2018-10-24 22:37:33 -04:00
Bart Hawthorne
deb9115149 Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking) 
#rb none

[CL 4351996 by Bart Hawthorne in Dev-Networking branch]
 2018-09-07 16:38:29 -04:00
Ryan Gerleve
dc8c73958a Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking) 
#rb none
#rnx

[CL 4344377 by Ryan Gerleve in Dev-Networking branch]
 2018-09-05 10:39:46 -04:00
Ryan Gerleve
f20cd46b96 Merging //UE4/Dev-Main to Dev-Networking (//UE4/Dev-Networking) 
#rb none
#rnx

[CL 4344260 by Ryan Gerleve in Dev-Networking branch]
 2018-09-05 10:17:10 -04:00
Peter Engstrom
497e5ed68f Implemented NetSerialize for FTimespan. This allows such variables to be replicated. 
#jira UE-57403
#rb ryan.gerleve

[CL 4341983 by Peter Engstrom in Dev-Networking branch]
 2018-09-04 14:52:12 -04:00