85744e59
Local merge
8 年前
3b50be5f
stub in basic transparencys
8 年前
dda281fd
Merge branch 'master' into classicDeferredMobile
8 年前
c29dfe78
Add more GLES3 and Vulkan shader libraries.
8 年前
8fd68583
Preview is now actually hidden when inactive or hidden
7 年前
b1e5c75f
Update shader generation tests.
7 年前
e3f06249
Shader name is now the name of the file.
7 年前
8f5cab45
[fixes]Fix broken unit tests.
7 年前
ea281f24
Merge pull request #41 from stramit/crash-fixes
Crash fixes
7 年前
a1e42ea7
Fixed the shortcut problem in a proper way.
7 年前
f0b691e4
* Fixed keyboard shortcuts.
* Reverted crash on node deletion fix as it's fixed in the latest GraphView.
7 年前
34657a4b
Update Unity branch in README.md
7 年前
77e26863
Merge branch 'master' into crash-fixes
7 年前
f9b09347
remove testable suffix (not needed)
7 年前
28cf7cb6
Upgrade to trunk based graph view.
7 年前
870f055f
Remove graph view.
7 年前
3ff875cf
minor tidy of files
7 年前
daa21fd3
Fixed a crash when deleting nodes from the graph.
7 年前
c54ee0eb
String compare for generated shader tests should not care about whitespace (we use platform native when generating so there can be differences between windows / mac)
7 年前
761baa4b
Reuse editor window for a graph if the window is already open.
7 年前
d2627032
Start work on 'unit testing' each node.
7 年前
3ecf6537
Cleaned up MaterialGraphPreviewGenerator
7 年前
87be495a
Getting rid of PreviewRenderUtility
Still a bit draft like. Needs to be properly checked for disposing of
data correctly.
Added checkboard background to preview. B
Bug: checkerboard disappears after windows loses and regains focus and
the node is moved around.
7 年前
bdd1ae34
Make MaterialGraphPreviewGenerator disposable
7 年前
edd8c41d
Now using RMS for texture compare
Added Assert Fail if text template doesn't exist.
7 年前
f4f2a2f8
Fixed graph image comparison test and added graph shader text comparison in test
7 年前
defd6784
[fix]Partial fix to rendering not being updated. Not complete but getting there.
7 年前
16043416
update graph view.
7 年前
b1c4e62a
Post merge tidy.
7 年前
90ca6558
remove old meta data files.
7 年前
b37655bd
Update to latest version of graph view.
7 年前
d88535a5
tidy up new nodes for upgrading.
7 年前
0e769105
Merge branch 'hackweek2017' into tidying
# Conflicts:
# MaterialGraphProject/Assets/GraphFramework/SerializableGraph/Editor/Drawing/AbstractGraphEditWindow.cs
# MaterialGraphProject/Assets/_MingWai/GeneratedTextureDemo/0-UnityLogo-Texture.asset.meta
# MaterialGraphProject/Assets/_MingWai/Gradient.asset.meta
7 年前
0dccf931
Added medium-ish shader graph for performance testing
7 年前
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 年前
f52ba9a6
Minor changes to MaterialNodeDrawer
7 年前
0d9b1e6a
Remove things added during hack week that should not be in the repo (next step is scan + tidy new nodes)
7 年前
6e2d612e
Update to latest GraphView
7 年前
06b7010b
Remove "AnyNode"
7 年前
3457c49b
Updated to work after merge with trunk
7 年前
d0d60781
Texture asset is now a real asset type...
7 年前
eac70c08
Graph edit window now survives serialization.
8 年前
5e3b99fe
working on better workflow (double click shader to open in edit window)
8 年前
5e6630fb
Porting more nodes to not be function nodes
8 年前
8df91eb4
Remove function 1 input and function 4 input
8 年前
4b1458e8
Remove Function3Input (use code node) :)
8 年前
3198bd43
Remove Function2Input node as it is no longer needed.
8 年前
08ce57cd
Fix bugs in blend node after port.
8 年前
eb2f7590
fix error in uv rotate node.
8 年前
77179d91
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
David Rogers
Filip Iliescu
Peter Bay Bastian
Tim Cooper
GitHub
Yuanxing Cai
Mads Ronnow