Tim Cooper
|
34cc0f15
|
Start work on making 'sub-graph' work again in an expected way.
|
7 年前 |
Tim Cooper
|
793887f9
|
Working 'convert to subgraph'
|
7 年前 |
Peter Bay Bastian
|
f516d811
|
Merge remote-tracking branch 'origin/subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/MaterialGraphEditWindow.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialGraphPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialNodePresenter.cs
|
7 年前 |
Peter Bay Bastian
|
8568c86c
|
#28 Set window title to asset name when window is created
|
7 年前 |
Peter Bay Bastian
|
7e160ce8
|
Run `hg format` on repository
|
7 年前 |
Peter Bay Bastian
|
d465f37d
|
#43 Handle keyboard shortcuts in window rather than GraphView
|
7 年前 |
Peter Bay Bastian
|
8e1d62b6
|
Add presenter for GraphEditorView, such that the presenter hierarchy makes more sense (also, pass through asset name to graph inspector #31)
|
7 年前 |
Peter Bay Bastian
|
931a7f8b
|
Re-create presenter if it's null during update (#37, #39)
|
7 年前 |
Peter Bay Bastian
|
3c039bfd
|
Add save dialog when closing window
|
7 年前 |
Peter Bay Bastian
|
dbebb5a9
|
Fix null reference exception
|
7 年前 |
Peter Bay Bastian
|
4cf36072
|
Enabling pretty printing of shader graph JSON
|
7 年前 |
Peter Bay Bastian
|
9fb6ad45
|
Temporary fix to open sub graphs in correct window class
|
7 年前 |
Peter Bay Bastian
|
62f36e79
|
Frame all after opening window (#52)
|
7 年前 |
Peter Bay Bastian
|
ac0a8cfe
|
Frame all when graph "restarts"
|
7 年前 |
Peter Bay Bastian
|
1f174bad
|
Move GraphEditorPresenter creation into method
|
7 年前 |
Matt Dean
|
0f6b7c44
|
Fixed graph name passed to GetFullShader in Master nodes
|
7 年前 |
Peter Bay Bastian
|
64c9a49b
|
Purge usage of presenters and datawatch from graph inspector
|
7 年前 |
Tim Cooper
|
8a87c992
|
More refactoring.
|
7 年前 |
Tim Cooper
|
354517e6
|
Partially working new master node architecture.
|
7 年前 |
Peter Bay Bastian
|
bec6cdbb
|
New preview system and master node preview in inspector
|
7 年前 |
Tim Cooper
|
95cdeda0
|
Merge remote-tracking branch 'origin/master' into refactor-properties
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/AbstractMaterialGraphEditWindow.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/Presenters/GraphInspectorPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/Presenters/SurfaceMasterNodeEditorPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/Views/GraphInspectorView.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/GraphEditorPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/NodePreviewPresenter.cs
|
7 年前 |
Tim Cooper
|
0818f178
|
temp
|
7 年前 |
Tim Cooper
|
735c401b
|
Working: Properties window + new master node.
|
7 年前 |
Tim Cooper
|
0b56c45b
|
first pass.
|
7 年前 |
Tim Cooper
|
8d5e6fd1
|
texture exposition working
|
7 年前 |
Tim Cooper
|
76430e32
|
Refactored subgraph to abstract subgraph + remap subgraph. This is groundwork to allow for real remap master nodes.
|
7 年前 |
Tim Cooper
|
97cfbe75
|
Working remap node (wood wood) probably still needs a bunch of love. but something is working :)
|
7 年前 |
Peter Bay Bastian
|
6c9cb29a
|
Refactor toolbar (no more presenters, acts a little more like buttons)
|
7 年前 |
Peter Bay Bastian
|
65e94a0c
|
Add rate limiting for preview updates
|
7 年前 |
Tim Cooper
|
f2cae710
|
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
|
7 年前 |
Peter Bay Bastian
|
a3385c0f
|
Undo/redo prototype
|
7 年前 |
Tim Cooper
|
79841e4c
|
Starting to work layer graph
|
7 年前 |
Peter Bay Bastian
|
3930a641
|
Remove GraphEditorPresenter
|
7 年前 |
Tim Cooper
|
2c1b60e0
|
compiling
|
7 年前 |
Tim Cooper
|
24923996
|
misc fixes afer changes
|
7 年前 |
damian
|
20646d1b
|
Removed MaterialNodePresenter.
|
7 年前 |
Peter Bay Bastian
|
c5a7e594
|
Fix integration with Undo by introducing IGraphObject
|
7 年前 |
damian
|
83548475
|
Merging master.
|
7 年前 |
Peter Bay Bastian
|
3b4b0eb6
|
Fix deserialization of SerializableGraphObject (refactor typo)
Rename inMemoryAsset to graphObject
|
7 年前 |
Peter Bay Bastian
|
a8f898e3
|
Fix serialization
|
7 年前 |
damian
|
6a03177d
|
Merge branch 'master' into no-presenters
|
7 年前 |
Peter Bay Bastian
|
e0963bb8
|
More serialization fix
|
7 年前 |
damian
|
1b331496
|
Merge branch 'master' into no-presenters
|
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 年前 |
Tim Cooper
|
6161fea6
|
Fix compiler warnings :)
|
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 年前 |
Patrick Fournier
|
26e0dad5
|
Move copy paste boilerplate and event handling to GraphView.
|
7 年前 |
Patrick Fournier
|
19de8169
|
Move framing shortcuts to GraphView.
|
7 年前 |