Matt Dean
|
5bed2efc
|
Menu Reorg: Input
|
8 年前 |
Eduardo Chaves
|
5eca2dca
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
bfogerty
|
9d1506f2
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
RinaldoTjan
|
41da8598
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
|
Matt Dean
|
3bce395a
|
Added Matrix4 and fixed Matrix multiply
|
8 年前 |
Andre McGrail
|
c99dc5e2
|
REPO FIX
|
8 年前 |
|
Matt Dean
|
718af347
|
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 年前 |
Florent Guinier
|
fe87f870
|
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 年前 |
|
Matt Dean
|
46d84ef9
|
Fixed vector2 node
|
8 年前 |
|
bfogerty
|
d92a2269
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
ChrisTchou
|
683c517e
|
Merge remote-tracking branch 'origin/hackweek2017' into hackweek2017
|
8 年前 |
|
Florent Guinier
|
73112c5a
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
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
|
779d0288
|
[MatGraph]Use generated names for properties so that they do not conflict and are formatted properly.
|
7 年前 |
|
Tim Cooper
|
f2cae710
|
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
|
7 年前 |
|
Tim Cooper
|
215e1b6a
|
Refactoring slot types.
|
7 年前 |
|
Peter Bay Bastian
|
ff8de4d3
|
New attribute-based system for node controls
|
7 年前 |
|
Tim Cooper
|
2c1b60e0
|
compiling
|
7 年前 |
|
Peter Bay Bastian
|
1125f7df
|
Common attribute control for floaty properties
|
7 年前 |
|
Peter Bay Bastian
|
9f5fba90
|
Merge branch 'attribute-controls'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
|
7 年前 |
damian
|
83548475
|
Merging master.
|
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 年前 |
|
Peter Bay Bastian
|
f95f8c27
|
BIG namespace refactor: UnityEngine -> UnityEditor, MaterialGraph -> ShaderGraph
No longer need assembly name in serialized data
|
7 年前 |
|
Peter Bay Bastian
|
418c94c0
|
Fix bug in Vector nodes
|
7 年前 |
|
Tim Cooper
|
3039671f
|
Merge master
|
7 年前 |
|
Tim Cooper
|
92a955c3
|
Add converter from v1,v2,v3,v4,col nodes -> properties.
|
7 年前 |
Patrick Fournier
|
de93c238
|
Merge trunk
|
7 年前 |
