Martin Thorzen
|
4334f8e2
|
Split up MaterialGraph.USS file into multiple USS files for better organization.
|
7 年前 |
|
Martin Thorzen
|
6ad87d77
|
Split up ScreenPositionSlotControl into its own .USS file
|
7 年前 |
Jens Holm
|
532c8de0
|
Add control view for bound input types
|
7 年前 |
|
Jens Holm
|
3bff7ec6
|
Make bound input types have a default slot label that identifies the space of the default input
|
7 年前 |
|
Martin Thorzen
|
f5ae4e88
|
Merge with master
|
7 年前 |
|
Jens Holm
|
5d32dbf0
|
Delete BoundInputVectorcontrolView which was a dumplicate of LabelSlotControlView
|
7 年前 |
Peter Bay Bastian
|
0e95358f
|
Update meta files
|
7 年前 |
|
Martin Thorzen
|
731a2018
|
Merge branch 'master' into node-settings
# Conflicts:
# com.unity.shadergraph/Editor/Data/MasterNodes/PBRMasterNode.cs
# com.unity.shadergraph/Editor/Util/UIUtilities.cs
|
7 年前 |
|
Martin Thorzen
|
57b10b82
|
[FIX] # 288 Updated the ChannelEnum and ChannelEnumMask controls to use their own uss files. This solves the 5pixels extra width on the nodes using them.
|
7 年前 |
GitHub
|
0d17d3ed
|
Merge pull request #291 from Unity-Technologies/uss-for-channel-enum-mask-control
[FIX] # 288
|
7 年前 |
|
Martin Thorzen
|
c4047df5
|
Fixed the enum control size, so it is now aligning properly in the UI
|
7 年前 |
|
GitHub
|
c08093e7
|
Merge pull request #298 from Unity-Technologies/fix-for-enum-control-size
Fixed the enum control size, so it is now aligning properly in the UI
|
7 年前 |
|
Martin Thorzen
|
8742fc7b
|
Merge branch 'master' into node-settings
|
7 年前 |
Matt Dean
|
f20e7691
|
Update Gradient UIs to UIElements
|
7 年前 |
|
Peter Bay Bastian
|
9cc55c03
|
Merge branch 'master' into path-for-shaders
|
7 年前 |
|
Matt Dean
|
ee59804c
|
Update ChannelEnumControl to UIElements and USS
|
7 年前 |
|
GitHub
|
24edf725
|
Merge pull request #314 from Unity-Technologies/channel-enum-control
Update ChannelEnumControl to UIElements and USS
|
7 年前 |
|
GitHub
|
f6380703
|
Merge pull request #310 from Unity-Technologies/gradient-nodes
Gradient Nodes
|
7 年前 |
|
Peter Bay Bastian
|
8076c27e
|
Merge branch 'master' into copy-property-nodes
|
6 年前 |
|
Jens Holm
|
60639f41
|
Merge branch 'master' into editable-property-reference-names
|
6 年前 |
|
Matt Dean
|
42b09806
|
Add first pass Texture2DArray and Texture3D support
|
6 年前 |
|
GitHub
|
f8e5ff57
|
Merge pull request #1377 from Unity-Technologies/sg/texture-types
Texture2D Array and Texture 3D
|
6 年前 |
Tim Cooper
|
99d825bc
|
first pass fixing paths
|
6 年前 |
|
Tim Cooper
|
fafb59af
|
Run code formatter.
|
6 年前 |
Frédéric Vauchelles
|
4d7f78f1
|
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/BuildPlayer/HDRPVariantStripper.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
|
6 年前 |
|
Martin Thorzen
|
d9a306ac
|
There were some issues on our nodes that needed to be fixed.
The expand arrow icon was showing al the time
The Enum control was a tad bit too wide.
|
6 年前 |
|
GitHub
|
5809781d
|
Merge pull request #1440 from Unity-Technologies/sg/fix-for-ui-issues-on-nodes
Fixes for visual issues on nodes
|
6 年前 |
|
GitHub
|
51a1873e
|
Merge branch 'master' into update-changelog
|
6 年前 |
|
Peter Bay Bastian
|
b4dd9062
|
Merge remote-tracking branch 'origin/master' into sg/facesign
|
6 年前 |
Paul Melamed
|
797daf79
|
Merge branch 'master' into decals/ss3_channel_mask
|
6 年前 |
Aleksandr Kirillov
|
4695f235
|
Merge branch 'master' into lw/terrain_optimization
|
6 年前 |
