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
150,838 Commits 23 Branches 254 Tags
4976868f6c11ba767b7022e65b1e691655f3fb8a
Commit Graph

36 Commits

Author SHA1 Message Date
lauren barnes
3557cb3a38 Removing unneeded material object regeneration and added more clear calls to the material editor 
#jira UE-90880
#rb trivial

#ROBOMERGE-SOURCE: CL 12296492 in //UE4/Release-4.25/... via CL 12296505
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v668-12245121)

[CL 12296948 by lauren barnes in Main branch]
 2020-03-19 11:03:59 -04:00
ben ingram
2260c7703c #jira UE-90705 
Fix duplicate LOCTEXT
#rb none

#ROBOMERGE-SOURCE: CL 12221721 in //UE4/Release-4.25/... via CL 12221754
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v662-12191386)

[CL 12221821 by ben ingram in Main branch]
 2020-03-16 16:06:37 -04:00
ben ingram
61b4095be4 #jira UE-89792 
Add UI to disconnect/reconnect MI layers from parent material
[FYI] lauren.barnes
#rb none

#ROBOMERGE-SOURCE: CL 12166521 in //UE4/Release-4.25/... via CL 12166529
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v661-12148976)

[CL 12166536 by ben ingram in Main branch]
 2020-03-13 15:39:57 -04:00
lauren barnes
4fc5d3059f Fixing infinitely refreshing UI in material editor 
#jira UE-87120
#rb Jason.Stasik
#rnx

#ROBOMERGE-SOURCE: CL 12021983 in //UE4/Release-4.25/... via CL 12021999
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 12022036 by lauren barnes in Main branch]
 2020-03-06 16:45:23 -05:00
Lauren Barnes
43b2b2ff76 Material layer parameter preview panel will no longer crash in the material editor. 
#rb Matt.Kuhlenschmidt
#jira UE-89059

#ROBOMERGE-OWNER: Lauren.Barnes
#ROBOMERGE-AUTHOR: lauren.barnes
#ROBOMERGE-SOURCE: CL 11938624 in //UE4/Release-4.25/... via CL 11938655
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11939210 by Lauren Barnes in Main branch]
 2020-03-05 12:23:03 -05:00
lauren barnes
521a608178 Getting material layer parameter visibility to be impacted by static switches 
#jira UE-89644
#rb Ben.Ingram

#ROBOMERGE-SOURCE: CL 11772820 in //UE4/Release-4.25/... via CL 11772860
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11776773 by lauren barnes in Main branch]
 2020-02-28 16:04:42 -05:00
ben ingram
e00231521f #jira UE-87033 
Propagate changes made to layers in base material to derived MIs
#rb none

#ROBOMERGE-SOURCE: CL 11684340 in //UE4/Release-4.25/... via CL 11684379
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11684439 by ben ingram in Main branch]
 2020-02-27 14:56:33 -05:00
ryan durand
627baf970a Updating copyright for Engine Editor. 
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869241 via CL 10869527 via CL 10869904
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870586 by ryan durand in Main branch]
 2019-12-26 15:33:43 -05:00
lauren barnes
3cc9e48e05 Adding refresh to parameter toggling in material layers so you can update nested children. 
#jira UE-82530
#rb Jason.Stasik
[FYI] Michal.Valient

#ROBOMERGE-SOURCE: CL 10075390 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v574-10069753)

[CL 10075392 by lauren barnes in Main branch]
 2019-11-07 16:01:41 -05:00
Rolando Caloca
7632478918 Merging //UE4/Main@9388041 to Dev-RenderPlat-Staging 
#rb none
#rnx

[CL 9389881 by Rolando Caloca in Dev-RenderPlat-Staging branch]
 2019-10-03 09:26:00 -04:00
Chris Gagnon
8ab0638182 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.24 
#rb none

[CL 9325047 by Chris Gagnon in Main branch]
 2019-10-01 20:41:42 -04:00
Rolando Caloca
f83ae4807a Copying //UE4/Dev-Rendering@9317594 to Dev-RenderPlat-Staging 
#rb none
#rnx

[CL 9317904 by Rolando Caloca in Dev-RenderPlat-Staging branch]
 2019-10-01 13:03:04 -04:00
Marcus Wassmer
6517c68ef5 Copying //UE4/Dev-RenderPlat-Staging@8684824 to Dev-Main (//UE4/Dev-Main) 
#rb none

[CL 8684840 by Marcus Wassmer in Main branch]
 2019-09-14 09:45:25 -04:00
Marcus Wassmer
6b13d2d0c4 Merging //UE4/Dev-Main@8680903 to Dev-RenderPlat-Staging (//UE4/Dev-RenderPlat-Staging) 
#rb none

[CL 8683443 by Marcus Wassmer in Dev-RenderPlat-Staging branch]
 2019-09-13 18:17:11 -04:00
lauren barnes
25e71b3717 Curve atlas parameters now filter out curves that aren't in the current atlas. 
#jira UE-73129
#rb none
#rnx


#ROBOMERGE-SOURCE: CL 8639261 via CL 8651346
#ROBOMERGE-BOT: (v412-8640799)

[CL 8651500 by lauren barnes in Main branch]
 2019-09-12 02:26:38 -04:00
Rolando Caloca
31828e2cac Merging //UE4/Dev-Main@8580251 to Dev-RenderPlat-Staging 
#rb none
#rnx

[CL 8614298 by Rolando Caloca in Dev-RenderPlat-Staging branch]
 2019-09-10 12:20:29 -04:00
Chris Gagnon
2e87118a18 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) Interim 4.24. 
#rb none

[CL 8614014 by Chris Gagnon in Main branch]
 2019-09-10 11:35:20 -04:00
jeremy moore
ba2c07876c Edition support for RVT parameters 
#ROBOMERGE-SOURCE: CL 8562097 via CL 8563573
#ROBOMERGE-BOT: (v406-8472469)

[CL 8563703 by jeremy moore in Main branch]
 2019-09-06 19:47:59 -04:00
Marcus Wassmer
ded7cece25 Copying //UE4/Dev-Rendering@8444433 to Dev-RenderPlat-Staging (//UE4/Dev-RenderPlat-Staging) 
#rb none

[CL 8445676 by Marcus Wassmer in Dev-RenderPlat-Staging branch]
 2019-09-03 19:19:28 -04:00
lauren ridge
88557de3fc Fix for material updating too frequently 
#rb trivial
#rnx


#ROBOMERGE-SOURCE: CL 8114088 via CL 8116258
#ROBOMERGE-BOT: (v401-8057353)

[CL 8116441 by lauren ridge in Main branch]
 2019-08-19 12:24:43 -04:00
Marcus Wassmer
834e95f3d3 Merging //UE4/Dev-Main@4680011 to Dev-Rendering (//UE4/Dev-Rendering) 
#rb none

[CL 4680455 by Marcus Wassmer in Dev-Rendering branch]
 2019-01-03 19:28:34 -05:00
Marcus Wassmer
cbfcbbb93b Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering) 
#rb none
Should be just copyright updates

[CL 4680440 by Marcus Wassmer in Dev-Rendering branch]
 2019-01-03 19:16:26 -05:00
Chris Gagnon
8fc25ea18e Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor) 
#rb none

[CL 4676797 by Chris Gagnon in Dev-Editor branch]
 2019-01-02 14:54:39 -05:00
Lauren Ridge
11206bb807 Redoing material parameters panel with property row generator 
#rb Chris.Gagnon
#jira UE-54670
#jira UE-54751
#jira UE-60599

[CL 4545980 by Lauren Ridge in Dev-Editor branch]
 2018-11-06 18:07:24 -05:00
lauren ridge
215848a998 #ROBOMERGE-AUTHOR: lauren.ridge 
Fix for crash on connecting curve param node with no texture set
#jira UE-59880
#rb trivial

#ROBOMERGE-SOURCE: CL 4107443 in //UE4/Release-4.20/...
#ROBOMERGE-BOT: RELEASE (Release-4.20 -> Release-Staging-4.20)

[CL 4112455 by lauren ridge in Staging-4.20 branch]
 2018-06-05 04:05:42 -04:00