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
143,691 Commits 23 Branches 254 Tags
c8bc20ff8b15bfda71ea00afaaf512d828b252bb
Commit Graph

444 Commits

Author SHA1 Message Date
IGood
e2a473dffd PR #6761: Fix for unsafe cast of IAssetTypeActions* to FAssetTypeActions_Base* (Contributed by IGood) 
#jira UE-90292
#rb rex.hill

#robomerge[RELEASE] 4.25
#ROBOMERGE-SOURCE: CL 12069288 via CL 12069307 via CL 12069321
#ROBOMERGE-BOT: (v657-12064184)

[CL 12072296 by rex hill in Main branch]
 2020-03-09 12:42:34 -04:00
rex hill
782ebdba5f Fix source control errors during rename of file open for add 
#jira UE-88886
#rb Dave.Belanger


#ROBOMERGE-SOURCE: CL 11548509 via CL 11548538 via CL 11548551
#ROBOMERGE-BOT: (v654-11333218)

[CL 11548562 by rex hill in Main branch]
 2020-02-19 14:16:53 -05:00
benoit deschenes
ec5edba1ae Integrating CL#11136074 from Dev-Enterprise 
Fixing Python asset import task returning wrong path when not combining mesh.

#jira UE-72503
#rb none

#ROBOMERGE-SOURCE: CL 11461632 in //UE4/Release-4.25/... via CL 11461660
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11462399 by benoit deschenes in Main branch]
 2020-02-17 14:23:08 -05:00
benoit deschenes
ab17f991c8 Integrating CL#11136074 from Dev-Enterprise 
Fixing Python asset import task returning wrong path when not combining mesh.

#jira UE-72503
#rb none

#ROBOMERGE-SOURCE: CL 11461632 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11461660 by benoit deschenes in 4.25-Plus branch]
 2020-02-17 13:39:58 -05:00
jamie dale
25e852a5e8 Fixed localization conflicts 
#jira
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 11448060 in //UE4/Release-4.25/... via CL 11448075
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11448100 by jamie dale in Main branch]
 2020-02-14 15:49:24 -05:00
jamie dale
db9507f916 Fixed localization conflicts 
#jira
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 11448060 in //UE4/Release-4.25/...
#ROBOMERGE-BOT: RELEASE (Release-4.25 -> Release-4.25Plus) (v654-11333218)

[CL 11448075 by jamie dale in 4.25-Plus branch]
 2020-02-14 15:48:32 -05:00
dave belanger
a32107b87c Add option on whether to prompt user with checkout dialog in AssetFixUpRedirectors and use it to avoid pop-up in PPID generation. 
#rb Rex.Hill


#ROBOMERGE-SOURCE: CL 11447143 via CL 11447144 via CL 11447146
#ROBOMERGE-BOT: (v654-11333218)

[CL 11447152 by dave belanger in Main branch]
 2020-02-14 15:01:22 -05:00
robert manuszewski
b938e59c9b Reimplementing FProperty changes from //UE4/Main 
+ Reimplemented FProperty related fixed from //UE4/Main:
CL#10791312, 10804850, 10851666, 10855122, 10855198, 10942138, 11030611, 11030639, 11032261, 11061515, 11136964,11138881, 11214238, 11214865

#rb none (previously reviewed in Dev-Core)
[FYI] Chris.Bunnner, Daniel.Lamb


#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 11302985 via CL 11303011 via CL 11303019
#ROBOMERGE-BOT: (v0-11244347)

[CL 11303183 by robert manuszewski in Main branch]
 2020-02-10 08:06:56 -05:00
jamie hayes
f7886ec2bc Merging Global Distance Field and volume texture changes 
#rb none


#ROBOMERGE-OWNER: jamie.hayes
#ROBOMERGE-AUTHOR: jamie.hayes
#ROBOMERGE-SOURCE: CL 11287861 via CL 11287862
#ROBOMERGE-BOT: (v647-11244347)

[CL 11287902 by jamie hayes in Main branch]
 2020-02-06 17:56:50 -05:00
rex hill
0d4303b088 Fix asset bulk export not having filename 
#jira UE-88007
[FYI] Marc.Audy
#rnx


#ROBOMERGE-SOURCE: CL 11216103 via CL 11216109 via CL 11216118
#ROBOMERGE-BOT: (v644-11213502)

[CL 11227465 by rex hill in Main branch]
 2020-02-04 20:10:45 -05:00
Chris Gagnon
c3f9a18841 Merge from Main in prep for Dev-Tools-Staging Copy up 
#rb none

[CL 11221539 by Chris Gagnon in Dev-Tools-Staging branch]
 2020-02-04 17:00:31 -05:00
Jamie Dale
ddf3e630c8 Correctly update in-memory String Table asset references when a String Table asset is renamed 
#jira UE-87884
#rb Lauren.Barnes

[CL 11199152 by Jamie Dale in Main branch]
 2020-01-31 14:55:39 -05:00
Chris Gagnon
76c6bcbfeb UE4 Main merged to Dev-Tools-Staging at CL 11164391 
#rb none

[CL 11171981 by Chris Gagnon in Dev-Tools-Staging branch]
 2020-01-29 20:39:37 -05:00
dave belanger
3ef0eaeb01 Fast and lexical sort functors for FSoftObjectPath, FSoftObjectPtr, TSoftObjectPtr and TSoftClassPtr. 
#rb Steve.Robb


#ROBOMERGE-SOURCE: CL 11163489 via CL 11163493 via CL 11163498
#ROBOMERGE-BOT: (v640-11091645)

[CL 11167146 by dave belanger in Main branch]
 2020-01-29 15:33:21 -05:00
Thomas Sarkanen
4242a943b8 Fix LOCTEXT issues arising from Dev-Anim copy-up 
#jira UE-87413 - //UE4/Main - Build Engine Localization - Multiple Warnings: Non-matching LOCTEXT_NAMESPACE defines found and Found previously entered localized string in Anim cpp files
#rb none

[CL 11153187 by Thomas Sarkanen in Main branch]
 2020-01-29 04:46:17 -05:00
christina tempelaarl
fe7b1f4718 Added PhysicalMaterialMasks. 
#jira UE-1949, UE-1950
#rb benn.gallagher, matt.kuhlenschmidt


#ROBOMERGE-SOURCE: CL 11125982 via CL 11126447
#ROBOMERGE-BOT: (v640-11091645)

[CL 11126552 by christina tempelaarl in Main branch]
 2020-01-28 05:18:40 -05:00
Max Chen
b4881d8bf8 Copying //UE4/Dev-Editor to Dev-Tools-Staging (//UE4/Dev-Tools-Staging) @11123875 
#rb none
#jira none

[CL 11123880 by Max Chen in Dev-Tools-Staging branch]
 2020-01-27 20:11:15 -05:00
christina tempelaarl
d87c5e9cfe Back out changelist 11112514 
#ROBOMERGE-SOURCE: CL 11112640 via CL 11112641
#ROBOMERGE-BOT: (v640-11091645)

[CL 11112642 by christina tempelaarl in Main branch]
 2020-01-25 00:34:35 -05:00
christina tempelaarl
62fb7bd1a5 Added PhysicalMaterialMasks. 
#jira UE-1949, UE1950
#rb matt.kuhlenschmidt, benn.gallagher


#ROBOMERGE-SOURCE: CL 11112514 via CL 11112515
#ROBOMERGE-BOT: (v640-11091645)

[CL 11112518 by christina tempelaarl in Main branch]
 2020-01-24 23:29:37 -05:00
JeanMichel Dignard
84facd6d15 Copy from dev-enterprise cl 11097196 
#rb none
#rnx

[CL 11099277 by JeanMichel Dignard in Dev-Tools-Staging branch]
 2020-01-23 16:28:59 -05:00
Lina Halper
44c1bb3292 COPY from //Dev-Anim to //Dev-Main 
#rb: none
#fyi: Laurent.Delayen, Thomas.Sarkanen

[CL 11088765 by Lina Halper in Main branch]
 2020-01-22 17:58:55 -05:00
lauren barnes
8608c8e7ff Migrate now correctly checks for packages outside the source packages' root directory, and will not add those to the dependency list. 
#jira UE-85015
#rb Frank.Fella
#rnx


#ROBOMERGE-SOURCE: CL 11075462 via CL 11075477
#ROBOMERGE-BOT: (v637-11041722)

[CL 11075480 by lauren barnes in Main branch]
 2020-01-21 14:59:26 -05:00
rex hill
63f58eda9f Allow plugins to control which folders are writable 
#rb jamie.dale


#ROBOMERGE-SOURCE: CL 11075022 via CL 11075023 via CL 11075025
#ROBOMERGE-BOT: (v637-11041722)

[CL 11075026 by rex hill in Main branch]
 2020-01-21 14:04:13 -05:00
JeanMichel Dignard
70d074639f Merging //UE4/Dev-Main @ 10886849 to Dev-Tools-Staging (//UE4/Dev-Tools-Staging) 
#rb none
#rnx

[CL 10906274 by JeanMichel Dignard in Dev-Tools-Staging branch]
 2020-01-08 13:26:18 -05:00
jeanmichel dignard
2ce7666d2d Copying //UE4/Dev-Core [at] 10708550 to Dev-Main (//UE4/Dev-Main) 
#rb none

#ROBOMERGE-OWNER: jeanmichel.dignard
#ROBOMERGE-AUTHOR: robert.manuszewski
#ROBOMERGE-SOURCE: CL 10708666 in //UE4/Main/...
#ROBOMERGE-BOT: TOOLS (Main -> Dev-Tools-Staging) (v626-10872990)

[CL 10898071 by jeanmichel dignard in Dev-Tools-Staging branch]
 2020-01-07 15:54:23 -05:00