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 年前 |
|
Peter Bay Bastian
|
ef73a507
|
Update party preview to work again
|
7 年前 |
|
Peter Bay Bastian
|
e39f99bb
|
Add "(i/total)" to shader compile progress
|
7 年前 |
GitHub
|
1d08cd88
|
Merge pull request #70 from Unity-Technologies/tidyup
Tidyup
|
7 年前 |
Tim Cooper
|
209da78a
|
Merge remote-tracking branch 'origin/master' into tidyup
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
|
7 年前 |
|
Tim Cooper
|
615c8ff6
|
Update test shaders
|
7 年前 |
|
Peter Bay Bastian
|
3bcd87d8
|
Add progress bar during shader compilation
|
7 年前 |
|
Tim Cooper
|
6161fea6
|
Fix compiler warnings :)
|
7 年前 |
|
Peter Bay Bastian
|
145b4d5f
|
Get rid of presenter for graph inspector
|
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 年前 |
|
Peter Bay Bastian
|
a15cfa1d
|
Minor changes to VectorControl
|
7 年前 |
Matt Dean
|
25f091c2
|
Missed file
|
7 年前 |
|
Peter Bay Bastian
|
39d3dc25
|
Undo support for all node controls
|
7 年前 |
|
Matt Dean
|
31068f89
|
More PR fixes
|
7 年前 |
|
Peter Bay Bastian
|
99701f90
|
UIElements-based controls for color and vector controls
|
7 年前 |
|
Matt Dean
|
9772a011
|
More PR fixes
|
7 年前 |
|
Peter Bay Bastian
|
d4bf2988
|
Update to work with latest Editor
|
7 年前 |
|
Matt Dean
|
b4599393
|
Fix merge conflicts for PR
|
7 年前 |
|
Peter Bay Bastian
|
e3cb9212
|
Undo handling for adding/removing shader properties
|
7 年前 |
|
Matt Dean
|
3ca3abee
|
Maths Part 2
- Maths/Interpolation
- Maths/Round
- Fix merge conflict for PR
|
7 年前 |
|
Peter Bay Bastian
|
1b46d517
|
More robust undo/redo by removing and adding nodes
|
7 年前 |
|
Matt Dean
|
4ec6fe3b
|
Maths Part 1
- Maths/Basic
- Maths/Advanced
- Maths/Range
- Add HLSL safe conversion for node name
|
7 年前 |
|
Peter Bay Bastian
|
b7975d8f
|
Reflection based undo deserialization
|
7 年前 |
damian
|
1b331496
|
Merge branch 'master' into no-presenters
|
7 年前 |
|
Peter Bay Bastian
|
e0963bb8
|
More serialization fix
|
7 年前 |
|
damian
|
6a03177d
|
Merge branch 'master' into no-presenters
|
7 年前 |
|
Peter Bay Bastian
|
a8f898e3
|
Fix serialization
|
7 年前 |
|
damian
|
3db84206
|
Fixed some bugs after master merge.
|
7 年前 |
|
Peter Bay Bastian
|
3b4b0eb6
|
Fix deserialization of SerializableGraphObject (refactor typo)
Rename inMemoryAsset to graphObject
|
7 年前 |
|
damian
|
83548475
|
Merging master.
|
7 年前 |
|
Peter Bay Bastian
|
c5a7e594
|
Fix integration with Undo by introducing IGraphObject
|
7 年前 |
|
Peter Bay Bastian
|
9f5fba90
|
Merge branch 'attribute-controls'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
|
7 年前 |
|
Peter Bay Bastian
|
3790252c
|
Remove last node presenters and also type mapper in MaterialGraphPresenter
|
7 年前 |
|
Peter Bay Bastian
|
9bf884ab
|
Add object field attribute control
|
7 年前 |
|
Peter Bay Bastian
|
fd78eaed
|
Small fix for gradient node
|
7 年前 |
|
Peter Bay Bastian
|
aeedf575
|
Attribute control for gradient node
|
7 年前 |
|
Peter Bay Bastian
|
319e2795
|
Fix update scope of matrix nodes (they do not support preview properties yet)
|
7 年前 |
|
Peter Bay Bastian
|
7bb42428
|
Use attribute controls for Matrix nodes
|
7 年前 |
|
damian
|
7e977d50
|
Fixed inspector and node position is now saved.
|
7 年前 |
|
Peter Bay Bastian
|
e6e04a49
|
Use attribute controls for TransformNode
|
7 年前 |
|
damian
|
20646d1b
|
Removed MaterialNodePresenter.
|
7 年前 |
|
Peter Bay Bastian
|
152042bb
|
Comment out IfNode for now
|
7 年前 |
|
damian
|
17b67cdf
|
More cleanup of presenter code.
|
7 年前 |
|
Peter Bay Bastian
|
56967512
|
Property attribute control
|
7 年前 |
|
damian
|
d9e85fdf
|
Cleaning up presenter code.
|
7 年前 |
|
Peter Bay Bastian
|
f695b6fa
|
Enum attribute control
|
7 年前 |
|
damian
|
a327462f
|
Converted all nodes to use no-presenter.
|
7 年前 |
|
Peter Bay Bastian
|
95ea6e13
|
Turn off preview for color node
|
7 年前 |
|
damian
|
92315882
|
Fixed deleting edges
|
7 年前 |
|
Peter Bay Bastian
|
fcbee16f
|
Remove commented out node presenters
|
7 年前 |
