Marc Audy
0c3be2b6ad
Merge Release-Engine-Staging to Test @ CL# 18240298
...
[CL 18241953 by Marc Audy in ue5-release-engine-test branch]
2021-11-18 14:37:34 -05:00
aurel cordonnier
fc542f6cfd
Merge from Release-Engine-Staging @ 18081189 to Release-Engine-Test
...
This represents UE4/Main @18073326, Release-5.0 @18081140 and Dev-PerfTest @18045971
[CL 18081471 by aurel cordonnier in ue5-release-engine-test branch]
2021-11-07 23:43:01 -05:00
aurel cordonnier
a6e741e007
Merge from Release-Engine-Staging @ 17915896 to Release-Engine-Test
...
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035
[CL 17918595 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-25 20:05:28 -04:00
ben ingram
e6a86e1fbb
Fix up UMaterialInstance::GetParameterValue().
...
Now will always get metadata from base meterial if applicable, then apply override value on top of that
#rb none
#jira none
#ROBOMERGE-AUTHOR: ben.ingram
#ROBOMERGE-SOURCE: CL 17602431 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v871-17566257)
[CL 17602438 by ben ingram in ue5-release-engine-test branch]
2021-09-22 19:05:06 -04:00
ben ingram
96be34fb82
Allow 'Output Translucent Velocity' to be overriden by material instances
...
#jira FROST-2607
#rb arciel.rekman, jason.nadro
#ROBOMERGE-SOURCE: CL 16316954 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v804-16311228)
[CL 16316976 by ben ingram in ue5-release-engine-test branch]
2021-05-13 15:29:02 -04:00
louise rasmussen
af40e9cac5
Level Editor Menu Clean Up, Part 2
...
#JIRA UETOOL-3039
#rb Lauren.Barnes
#lockdown Simon.Tourangeau
#preflight 606d2c11dc3e5b0001c915aa
#ROBOMERGE-OWNER: louise.rasmussen
#ROBOMERGE-AUTHOR: louise.rasmussen
#ROBOMERGE-SOURCE: CL 15937971 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)
#ROBOMERGE-CONFLICT from-shelf
[CL 15938452 by louise rasmussen in ue5-main branch]
2021-04-07 02:56:12 -04:00
louise rasmussen
825c64a6f5
Level Editor Menu Re-org, Part 1
...
#JIRA UETOOL-3039
#rb Lauren.Barnes
#lockdown Simon.Tourangeau
#preflight 606b8e0315d4190001b1698b
#ROBOMERGE-SOURCE: CL 15924633 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)
[CL 15924652 by louise rasmussen in ue5-main branch]
2021-04-05 19:11:24 -04:00
Marc Audy
4c1bb11c29
Merge UE5/Release-Engine-Staging to UE5/Main @ 14548662
...
This represents UE4/Main @ 14525125 + cherrypicked fixes
#skipundocheck
[CL 14551026 by Marc Audy in ue5-main branch]
2020-10-22 19:19:16 -04:00
brooke hubert
48113fc77e
Adding EditorFramework to build.cs files
...
#rnx
#Jira UE-96448
#rb chris.gagnon
[CL 14114839 by brooke hubert in ue5-main branch]
2020-08-14 13:24:16 -04:00
Matt Kuhlenschmidt
5c064acc86
Initial pass on content browser reskin
...
[CL 13949190 by Matt Kuhlenschmidt in ue5-main branch]
2020-07-27 16:11:54 -04:00
JeanMichel Dignard
082db0664e
Copyright fixes for csharp files
...
#jira UE-86445
#rb none
#rnx
[CL 10926220 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-09 09:41:51 -05:00
Ryan Durand
28d3d740dd
(Integrating from Dev-EngineMerge to Main)
...
Second batch of remaining Engine copyright updates.
#rnx
#rb none
#jira none
[CL 10871196 by Ryan Durand in Main branch]
2019-12-27 07:44:07 -05:00
lauren ridge
bd2129103b
Fixing non-unity compile errors
...
#rb trivial
#rnx
#ROBOMERGE-SOURCE: CL 70957047105935
2019-06-20 11:52:01 -04:00
lauren ridge
2877a50bc2
Adding "Browse To Asset in Content Browser" button and alternate row styling for the Material Analyzer
...
#rb trivial
#rnx
#ROBOMERGE-SOURCE: CL 7095398 via CL 7105765
#ROBOMERGE-BOT: (v367-6836689)
[CL 7105831 by lauren ridge in Main branch]
2019-06-20 11:49:09 -04:00
lauren ridge
4e2384bf6d
Adding recursive expansion to the material analyzer tree
...
#rnx
#rb trivial
#ROBOMERGE-SOURCE: CL 6956377 via CL 6957865
#ROBOMERGE-BOT: (v367-6836689)
[CL 6970929 by lauren ridge in Main branch]
2019-06-13 11:56:08 -04:00
lauren ridge
d3d8b81798
Adding nesting to the Material Analyzer's collection creation
...
#rb trivial
#rnx
#ROBOMERGE-SOURCE: CL 6954716 via CL 6957628
#ROBOMERGE-BOT: (v367-6836689)
[CL 6970675 by lauren ridge in Main branch]
2019-06-13 11:53:16 -04:00
lauren ridge
0d430fab1d
Updating messaging as far as static parameters go
...
#rb trivial
#rnx
#ROBOMERGE-SOURCE: CL 6911401 via CL 6912320
#ROBOMERGE-BOT: (v366-6836689)
[CL 6913958 by lauren ridge in Main branch]
2019-06-10 14:22:54 -04:00
kevin ortegren
c92b1c86d9
Adds support for multiple shading models per material. Each material now has a bit field of which shading models it is using. Shading models for a material are selected through a new Shading Model material expression, which can be connected to the new Shading Model material output pin. This is opt-in by selecting "From Material Expression" in the Shading Model drop down on the material. With no changes, everything should behave like before, and the old workflow is still there. Optimized shader code should be as performant as before if not using more than one shading model.
...
[FYI] Chris.Bunner, Krzysztof.Narkowicz, Marcus.Wassmer, Yuriy.Odonnell, Matt.Kuhlenschmidt
#rb Krzysztof.Narkowicz
#ROBOMERGE-OWNER: kevin.ortegren
#ROBOMERGE-AUTHOR: kevin.ortegren
#ROBOMERGE-SOURCE: CL 6308573 via CL 6309266
[CL 6315508 by kevin ortegren in Main branch]
2019-05-06 06:04:18 -04:00
Lauren Ridge
5ef0871c58
Fixing stale suggestions staying in the material analyzer list
...
#jira none
#rb trivial
#lockdown Chris.Gagnon
[CL 4783625 by Lauren Ridge in Dev-Editor branch]
2019-01-23 11:01:45 -05:00
Chris Gagnon
0dbe1f7fb2
Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
...
#rb none
[CL 4766091 by Chris Gagnon in Dev-Editor branch]
2019-01-21 17:47:02 -05:00
Chris Gagnon
1a3bf5caf1
Merging The Engine directory from //UE4/Dev-Main to //UE4/Dev-Editor upto CL 4698813
...
#rb none
[CL 4720826 by Chris Gagnon in Dev-Editor branch]
2019-01-14 16:55:55 -05:00
