Peter Bay Bastian
|
ff8de4d3
|
New attribute-based system for node controls
|
7 年前 |
Peter Bay Bastian
|
1125f7df
|
Common attribute control for floaty properties
|
7 年前 |
Peter Bay Bastian
|
2bfaf109
|
Default control attribute (so far only for floats)
|
7 年前 |
Peter Bay Bastian
|
811d7dab
|
Color attribute control
|
7 年前 |
Peter Bay Bastian
|
f695b6fa
|
Enum attribute control
|
7 年前 |
Peter Bay Bastian
|
56967512
|
Property attribute control
|
7 年前 |
Peter Bay Bastian
|
aeedf575
|
Attribute control for gradient node
|
7 年前 |
Peter Bay Bastian
|
9bf884ab
|
Add object field attribute control
|
7 年前 |
Peter Bay Bastian
|
3790252c
|
Remove last node presenters and also type mapper in MaterialGraphPresenter
|
7 年前 |
Peter Bay Bastian
|
99701f90
|
UIElements-based controls for color and vector controls
|
7 年前 |
Peter Bay Bastian
|
39d3dc25
|
Undo support for all node controls
|
7 年前 |
Peter Bay Bastian
|
a15cfa1d
|
Minor changes to VectorControl
|
7 年前 |
Tim Cooper
|
209da78a
|
Merge remote-tracking branch 'origin/master' into tidyup
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
|
7 年前 |
Peter Bay Bastian
|
b75b4c04
|
Merge branch 'master' into no-presenters
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialNodePresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/GraphEditorView.cs
# MaterialGraphProject/Assets/fresnelstuff.ShaderSubGraph.meta
|
7 年前 |
GitHub
|
21a946ef
|
Merge pull request #73 from Unity-Technologies/master
Merge master
|
7 年前 |
Peter Bay Bastian
|
f95f8c27
|
BIG namespace refactor: UnityEngine -> UnityEditor, MaterialGraph -> ShaderGraph
No longer need assembly name in serialized data
|
7 年前 |
Matt Dean
|
abed850e
|
Merge master
And fix conflicts
|
7 年前 |
Tim Cooper
|
3039671f
|
Merge master
|
7 年前 |
Matt Dean
|
fe4745b9
|
Input Part 4
- Organised Input/Texture
- Added TextureAsset
- Added TextureControl
|
7 年前 |
Tim Cooper
|
8e5b0d9b
|
First pass inlining property nodes.
|
7 年前 |
Natalie Burke
|
11e072f9
|
Merge branch 'node-validation' of https://github.com/Unity-Technologies/ShaderGraph into node-validation
|
7 年前 |
Patrick Fournier
|
de93c238
|
Merge trunk
|
7 年前 |
Matt Dean
|
bbb186d6
|
Remove Gradient nodes and asset type :(
|
7 年前 |
Matt Dean
|
02c6b58d
|
Merge master
|
7 年前 |
Tim Cooper
|
a1cb65d5
|
Working scripted importer version.
|
7 年前 |
Peter Bay Bastian
|
a00f148d
|
Remove usage of EditorGUILayout.MiniThumbnailObjectField, so that we don't have to make it public
|
7 年前 |
Tim Cooper
|
fc3caa89
|
Merge commit '0a54bdcf00befab61d3a0bbec18c543478eb086d' into fixing
|
7 年前 |
Peter Bay Bastian
|
2ced9041
|
Make property control label go away so that the enum field takes up entire width
|
7 年前 |
Matt Dean
|
711f81fa
|
Added Channel Mixer Node
|
7 年前 |
mathieum-unity
|
045d568e
|
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
|
7 年前 |
Matt Dean
|
b14c1f98
|
Merge branch 'master' into node-artistic-adjustment
|
7 年前 |
Matt Dean
|
13948f2d
|
Channel Mask Node
|
7 年前 |
Matt Dean
|
c06cd050
|
Fixes for PR
Also made function reusable for different node insatnces
|
7 年前 |
Peter Bay Bastian
|
406da125
|
Add INodeModificationListener which allows control views to be notified of node change
|
7 年前 |
Matt Dean
|
6c7ced70
|
Merge branch 'master' into node-artistic-mask
|
7 年前 |
Matt Dean
|
00061ee8
|
ChannelEnumControl fixes
- Add modification listener
- Add slot ID to attribute
- Cleanup
|
7 年前 |
Matt Dean
|
2cc3b58e
|
Fix Channel Mask node
- Convert to Abstract derived
- Move channel validation check to node side
- Cleanup
|
7 年前 |
mathieum-unity
|
bd9683ea
|
Merge branch 'master' of github.com:Unity-Technologies/ShaderGraph into graphview-styling-updates
|
7 年前 |
Matt Dean
|
20cf4421
|
Flip Node
- Added ToggleControl (first pass)
|
7 年前 |
Matt Dean
|
96fb4fb6
|
Flip Node Improvements
- Pass flip as an argument to method
- Switch to abs(flip - value)
- Handle preview rendering path
- Handle reuse of method
|
7 年前 |
Matt Dean
|
8e410579
|
Merge branch 'master' into node-artistic-adjustment
|
7 年前 |
Peter Bay Bastian
|
e1281f8c
|
Fixes for new node style
|
7 年前 |
Peter Bay Bastian
|
cd4618e1
|
Add field dragger to vector inputs
|
7 年前 |
GitHub
|
a8dfafe4
|
Merge pull request #84 from Unity-Technologies/node-artistic-mask
Node Artistic Mask
|
7 年前 |
Matt Dean
|
dadccc50
|
Merge branch 'master' into node-channel
|
7 年前 |
Peter Bay Bastian
|
0d6ff9c3
|
Flip change check in EnumControlView and remove unused field
|
7 年前 |
Matt Dean
|
5131e8e1
|
Fixes for PR
|
7 年前 |
Matt Dean
|
f14af0f4
|
Added Cubemap nodes
|
7 年前 |
Tim Cooper
|
a0602cf5
|
Generalised PBR / Unlit master
|
7 年前 |
Matt Dean
|
1b3ac398
|
Merge branch 'master' into node-artistic-adjustment
|
7 年前 |
Matt Dean
|
5e47b629
|
Fixes for PR
|
7 年前 |
GitHub
|
9ddf9039
|
Merge pull request #85 from Unity-Technologies/node-channel
Node Channel
|
7 年前 |
GitHub
|
d8578f92
|
Merge pull request #82 from Unity-Technologies/node-artistic-adjustment
Node artistic adjustment
|
7 年前 |
GitHub
|
5d9b28af
|
Merge pull request #90 from Unity-Technologies/node-input-texture
Node input texture
|
7 年前 |
Tim Cooper
|
54ac74c0
|
Merge branch 'master' into node-input-scene
|
7 年前 |
Tim Cooper
|
16640c42
|
Run code format tool
|
7 年前 |
Tim Cooper
|
2731487c
|
Merge branch 'master' into node-input-scene
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Math/Vector/TransformNode.cs
|
7 年前 |
Peter Bay Bastian
|
508ec3ef
|
Workarounds for float formatting (e.g. 0.6 becoming a mess of decimal points) and label draggers (dragging not working on anything but first label on slot control)
|
7 年前 |
Peter Bay Bastian
|
c467fab5
|
Make color space conversion node controls a bit neater
|
7 年前 |
Peter Bay Bastian
|
211cf575
|
Refactor ColorspaceConversionControl to work on enums in general and implement it for TransformNode
|
7 年前 |
Matt Dean
|
5a69c812
|
Merge branch 'master' into node-bugfixes
|
7 年前 |
Jens Holm
|
67d2fd02
|
Merge master
|
7 年前 |
Matt Dean
|
fd5fa964
|
Merge Master
|
7 年前 |
Peter Bay Bastian
|
c2183225
|
Make GetChannelCount return an integer rather than a number enum thingie
|
7 年前 |
Tim Cooper
|
5c979fc8
|
Merge master
|
7 年前 |
Matt Dean
|
3e4f3590
|
Channel Mask node to Mask Field (prt 1)
|
7 年前 |
Matt Dean
|
29e04332
|
Channel Mask node to Mask Field (prt 2)
|
7 年前 |
Matt Dean
|
2f6e839e
|
Add Integer
Node, ShaderProperty, MaterialSlot
Update Property node and properties list
|
7 年前 |
GitHub
|
87638b44
|
Merge pull request #149 from Unity-Technologies/node-bugfixes
Node bugfixes
|
7 年前 |
Matt Dean
|
8ea43935
|
Add HDR Color
- Add HDR Color node
- Add new constructor to ColorShaderProperty
- Add hdr flag to ColorControl
- Add HDR Color property to GraphInspectorView
|
7 年前 |
Matt Dean
|
cfb57499
|
Add Slider
ShaderProperty, Control, Node and property list entry
|
7 年前 |
Matt Dean
|
28df6957
|
Upgrade Slider UI to UIElements
|
7 年前 |
Matt Dean
|
fb18c249
|
Refactor Channel Mixer UI
|
7 年前 |
Matt Dean
|
21d73861
|
Improve ChannelMixerControl callbacks
|
7 年前 |
Matt Dean
|
f7209064
|
Switch control's HDR argument to enum
|
7 年前 |
Matt Dean
|
7e22f269
|
Update ToggleControl to UIElements
Cosmetic fixes to
- InvertColors node
- ChannelMixer node
- Blend node
|
7 年前 |
Matt Dean
|
25109a19
|
Extend PBR master functionality
- Add Fade and Multiply blend modes
- Expose culling options
- Change UV enum to caps
- Add camel case string converter to utils
- Convert camel case on CodeFunctionNode
|
7 年前 |
Matt Dean
|
7f9b3b2c
|
Remove eyedropper from Color fields
|
7 年前 |
Matt Dean
|
6e105759
|
Fix toggle control defaults
|
7 年前 |
GitHub
|
c763baf4
|
Merge pull request #163 from Unity-Technologies/node-bugfixes
Node bugfixes
|
7 年前 |
Matt Dean
|
f43e0a6f
|
Merge branch 'master' into node-input
|
7 年前 |
Matt Dean
|
352a061a
|
Merge branch 'master' into compare-and-branch
|
7 年前 |
Jens Holm
|
55b86ced
|
Merge branch 'master' into inspector-window
|
7 年前 |
Peter Bay Bastian
|
90e67259
|
Repaint property node control when name changes
|
7 年前 |
Matt Dean
|
725a1ea9
|
Merge branch 'master' into sliders
|
7 年前 |
GitHub
|
1c0c24b4
|
Merge pull request #151 from Unity-Technologies/sliders
Sliders, Integers and HDR Color
|
7 年前 |
Matt Dean
|
8984577a
|
Merge branch 'master' into node-input
|
7 年前 |
Matt Dean
|
93aa1de8
|
Refactor Dielectric Specular node for UI changes
|
7 年前 |
Jens Holm
|
fb49e741
|
Merge remote-tracking branch 'origin/master' into inspector-window
|
7 年前 |
GitHub
|
927b9dac
|
Merge pull request #180 from Unity-Technologies/blackboard
Blackboard
|
7 年前 |
Jens Holm
|
66a70b8f
|
Merge branch 'master' into inspector-window and resolve conflicts
|
7 年前 |
GitHub
|
758a90e4
|
Merge pull request #170 from Unity-Technologies/node-input
Various nodes
|
7 年前 |
Matt Dean
|
affdcadf
|
Add HDR color support to Blackboard
|
7 年前 |
Peter Bay Bastian
|
484b4f58
|
* Add individual properties to node search
* Remove dropdown from property node
* Add all compatible slots to node search when dragging into empty space
*
|
7 年前 |
Matt Dean
|
0292ae36
|
Color control refactor
- Add mode enum to ControlView
- Remove HDR Color node
- Switch Color node value to struct
- Update USS
|
7 年前 |
GitHub
|
395c3ec5
|
Merge pull request #193 from Unity-Technologies/properties-in-search
Improvements to node search
|
7 年前 |
Matt Dean
|
9c0b93c1
|
Merge branch 'master' into node-bugfixes
|
7 年前 |
GitHub
|
d2f86285
|
Merge pull request #192 from Unity-Technologies/node-bugfixes
Property type refactor and Blackboard extension
|
7 年前 |
Matt Dean
|
c0c00ec0
|
Merge branch 'master' into node-matrix
|
7 年前 |
Martin Thorzen
|
4334f8e2
|
Split up MaterialGraph.USS file into multiple USS files for better organization.
|
7 年前 |
GitHub
|
caaf7a64
|
Merge pull request #236 from Unity-Technologies/splitting-up-uss-files
Splitting up uss files
|
7 年前 |
Peter Bay Bastian
|
a4d1c27d
|
Merge branch 'master' into node-bugfixes
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Resources/Styles/MaterialGraph.uss
|
7 年前 |
Peter Bay Bastian
|
e7218ad7
|
Remove unused variables and classes and rework how master preview resizing is handled
|
7 年前 |
Peter Bay Bastian
|
57a0eab1
|
Remove unused imports in entire solution
|
7 年前 |
GitHub
|
cdc03be9
|
Merge pull request #244 from Unity-Technologies/fix-all-warnings
Fix all warnings
|
7 年前 |
Martin Thorzen
|
f5ae4e88
|
Merge with master
|
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 年前 |
Peter Bay Bastian
|
13a428be
|
More trunk compatibility fixes
|
7 年前 |
Martin Thorzen
|
d36a05a1
|
Fix issues after merge with master
|
7 年前 |
GitHub
|
685fecd6
|
Merge pull request #286 from Unity-Technologies/trunk-compatibility
More trunk compatibility fixes
|
7 年前 |
GitHub
|
0d17d3ed
|
Merge pull request #291 from Unity-Technologies/uss-for-channel-enum-mask-control
[FIX] # 288
|
7 年前 |
Martin Thorzen
|
8742fc7b
|
Merge branch 'master' into node-settings
|
7 年前 |
Matt Dean
|
589cb99a
|
Add changes from previous branch
|
7 年前 |
Matt Dean
|
ff7c4856
|
Fix serialisation of preview properties in Gradient Asset node
|
7 年前 |
Matt Dean
|
15328c1d
|
Add support for Fixed gradient mode
|
7 年前 |
Matt Dean
|
f20e7691
|
Update Gradient UIs to UIElements
|
6 年前 |
Matt Dean
|
67827c5c
|
Remove unnecessary serialized properties
|
6 年前 |
Peter Bay Bastian
|
ea90628a
|
Fix trunk warnings
|
6 年前 |
Matt Dean
|
ee59804c
|
Update ChannelEnumControl to UIElements and USS
|
6 年前 |
Matt Dean
|
cb9ab96f
|
Prevent GC allocation when popup doesnt need to be recreated
|
6 年前 |
GitHub
|
24edf725
|
Merge pull request #314 from Unity-Technologies/channel-enum-control
Update ChannelEnumControl to UIElements and USS
|
6 年前 |
Peter Bay Bastian
|
6ec339e3
|
Forwardport pull request #336
|
6 年前 |
GitHub
|
f6380703
|
Merge pull request #310 from Unity-Technologies/gradient-nodes
Gradient Nodes
|
6 年前 |
Peter Bay Bastian
|
8076c27e
|
Merge branch 'master' into copy-property-nodes
|
6 年前 |
Jens Holm
|
60639f41
|
Merge branch 'master' into editable-property-reference-names
|
6 年前 |
GitHub
|
c833d39e
|
Merge pull request #325 from Unity-Technologies/node-settings
Node settings
|
6 年前 |
Peter Bay Bastian
|
8fcaa92a
|
Merge branch 'master' into warning-incompatible-pipeline
|
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
|
2c4a517b
|
Merge remote-tracking branch 'origin/master' into build/automation
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDPBRPass.template
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDPBRPass.template.meta
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template.meta
# ScriptableRenderPipeline/HDRenderPipeline/sub-package.json
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightAssetEditor.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightAssetEditor.cs.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightPipelineAssetEditor.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightPipelineAssetEditor.cs.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightShadowPass.cs.meta
# ScriptableRenderPipeline/Ligh...
|
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 年前 |
Peter Bay Bastian
|
f9b16024
|
Remove 2018.1 compatibility code from Shader Graph
|
6 年前 |
GitHub
|
29b369e0
|
Merge pull request #1399 from Unity-Technologies/sg/remove-2018.1-ifdefs
Remove 2018.1 compatibility code from Shader Graph
|
6 年前 |
Peter Bay Bastian
|
ca71f84b
|
Remove use of deprecated method Dirty()
|
6 年前 |
GitHub
|
b0322fa0
|
Merge pull request #1421 from Unity-Technologies/sg/texture-array-control-trunk-compat
Fix trunk compatibility for TextureArrayControl
|
6 年前 |
Peter Bay Bastian
|
31db4b9f
|
Fix core changes to UIElements Toggle with compatibility layer
|
6 年前 |
GitHub
|
ba8fbc25
|
Merge pull request #1522 from Unity-Technologies/sg/fix-toggle-changes
Compatibility with Toggle changes in core Unity
|
6 年前 |
Antoine Lelievre
|
516b896c
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
6 年前 |
Stephane Laroche
|
a49a696e
|
Merge branch 'master' into StackLit2
|
6 年前 |
Remy
|
9db2a137
|
Merge branch 'master' into HDRP-Tests
|
6 年前 |
GitHub
|
3a6a4e59
|
Merge branch 'master' into sg/spheremasknode
|
6 年前 |
Nerites
|
4b5c5d5c
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
|
6 年前 |
Matt Dean
|
8bf93fba
|
Fix dielectric specular control
It was resetting control values
|
6 年前 |
Matt Dean
|
5ec7bc49
|
Fix acceptable IOR range for Dielectric Specular node
|
6 年前 |
Matt Dean
|
1c4c0d09
|
Merge branch 'master' into sg/fix-dielectric-specular-control
|
6 年前 |
GitHub
|
2801eb36
|
Merge pull request #1568 from Unity-Technologies/sg/fix-dielectric-specular-control
Fix dielectric specular control
|
6 年前 |
Stephane Laroche
|
cbb9a885
|
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
|
6 年前 |
Tim Cooper
|
8406655d
|
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
|
6 年前 |
Nerites
|
cc9ae6f7
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
|
6 年前 |
Nerites
|
9b69a952
|
Merge xrconfig branch into xrsettings
|
6 年前 |
Aleksandr Kirillov
|
4695f235
|
Merge branch 'master' into lw/terrain_optimization
|
6 年前 |
GitHub
|
7281fe31
|
Merge branch 'HDRP/staging' into decals/v2/per_channel_mask_new_ui
|
6 年前 |