Peter Bay Bastian
|
e69e0431
|
Foundation has been laid for node inspectors (partially implemented for surface master)
|
8 年前 |
Peter Bay Bastian
|
a2959466
|
Implemented node pinning
|
8 年前 |
Tim Cooper
|
e6b70122
|
[Material Graph]Show slot default inputs in the inspector.
|
8 年前 |
Tim Cooper
|
17429180
|
Add support for setting default input values on material sub graphs (when editing the graph) so there is something to compare with.
|
8 年前 |
Tim Cooper
|
435b3c0e
|
Add names to property nodes in the editor
|
8 年前 |
bfogerty
|
af4518e0
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Jennifer Nordwall
|
475f5e3b
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
RinaldoTjan
|
c5984a7b
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Tim Cooper
|
b44a8aea
|
Fix some bugs in new nodes (bad conversion to HLSLSnippet node) + Add ability to hide slots at the slot level (i.e. hide implicit inputs for function node)
|
7 年前 |
Peter Bay Bastian
|
f2510f42
|
#35 Move a bunch of files from SerializableGraph folder to MaterialGraph folder (and delete a few unused ones)
|
7 年前 |
Peter Bay Bastian
|
696062ae
|
#35 namespace UnityEditor.Graphing.Drawing -> UnityEditor.MaterialGraph.Drawing
|
7 年前 |
Peter Bay Bastian
|
485654b6
|
#31 Graph inspector now lives inside graph editor window (also, it works again!)
|
7 年前 |
Peter Bay Bastian
|
7e160ce8
|
Run `hg format` on repository
|
7 年前 |
Tim Cooper
|
f6fa3513
|
Starting to extract properties.
|
7 年前 |
Tim Cooper
|
8a87c992
|
More refactoring.
|
7 年前 |
GitHub
|
5f6271d2
|
Merge pull request #67 from stramit/refactor-properties
Refactor properties
|
7 年前 |
Tim Cooper
|
0b56c45b
|
first pass.
|
7 年前 |
Tim Cooper
|
f2cae710
|
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
|
7 年前 |
Tim Cooper
|
2c1b60e0
|
compiling
|
7 年前 |
Tim Cooper
|
a5c9b0ce
|
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Input/Matrix/Matrix2Node.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Input/Matrix/Matrix3Node.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/SubGraph/AbstractSubGraphIONode.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/SubGraph/AbstractSubGraphIONode.cs.meta
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/AbstractMaterialGraphEditWindow.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialGraphPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/Nodes/SubgraphIONodePresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Runtime/SubGraph/SubGraphOutputNode.cs
|
7 年前 |
GitHub
|
1d08cd88
|
Merge pull request #70 from Unity-Technologies/tidyup
Tidyup
|
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 年前 |
Jens Holm
|
0f07c1c0
|
Add mesh selection for master node preveiw
|
7 年前 |
GitHub
|
fcd97941
|
Merge pull request #75 from Unity-Technologies/master
Update from 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 年前 |
Patrick Fournier
|
de93c238
|
Merge trunk
|
7 年前 |