Tim Cooper
|
d88535a5
|
tidy up new nodes for upgrading.
|
7 年前 |
|
Tim Cooper
|
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 年前 |
Peter Bay Bastian
|
0dccf931
|
Added medium-ish shader graph for performance testing
|
7 年前 |
|
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
|
f52ba9a6
|
Minor changes to MaterialNodeDrawer
|
7 年前 |
|
Tim Cooper
|
0d9b1e6a
|
Remove things added during hack week that should not be in the repo (next step is scan + tidy new nodes)
|
7 年前 |
|
Peter Bay Bastian
|
6e2d612e
|
Update to latest GraphView
|
7 年前 |
|
Tim Cooper
|
06b7010b
|
Remove "AnyNode"
|
7 年前 |
|
Peter Bay Bastian
|
3457c49b
|
Updated to work after merge with trunk
|
7 年前 |
|
Tim Cooper
|
d0d60781
|
Texture asset is now a real asset type...
|
7 年前 |
|
Tim Cooper
|
eac70c08
|
Graph edit window now survives serialization.
|
8 年前 |
|
Tim Cooper
|
5e3b99fe
|
working on better workflow (double click shader to open in edit window)
|
8 年前 |
|
Tim Cooper
|
5e6630fb
|
Porting more nodes to not be function nodes
|
8 年前 |
|
Tim Cooper
|
8df91eb4
|
Remove function 1 input and function 4 input
|
8 年前 |
|
Tim Cooper
|
4b1458e8
|
Remove Function3Input (use code node) :)
|
8 年前 |
|
Tim Cooper
|
3198bd43
|
Remove Function2Input node as it is no longer needed.
|
8 年前 |
|
Tim Cooper
|
08ce57cd
|
Fix bugs in blend node after port.
|
8 年前 |
|
Tim Cooper
|
eb2f7590
|
fix error in uv rotate node.
|
8 年前 |
|
Tim Cooper
|
77179d91
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
|
Tim Cooper
|
0336445f
|
fix node adaption so casting works as expected
|
8 年前 |
RinaldoTjan
|
180cba0c
|
Threshold Blending material Sample.
Threshold Blending material Sample.
|
8 年前 |
|
Tim Cooper
|
e8c71321
|
converting nodes to new system.
|
8 年前 |
|
Tim Cooper
|
96cdde05
|
Add node that 'just does' HLSL and can convert to shader node based on API.
|
8 年前 |
vlad
|
d0c30f9a
|
Rewrote triplanar to work with the Sampler Asset (some master node issue where Texture2D would fail with no errors). Graphs which don't seem to work should have TriPlanar, SamplerAsset, and TextureAsset deleted and re-added.
|
8 年前 |
|
Tim Cooper
|
2e183994
|
Add time checkbox
Make shorter GUIDs
|
8 年前 |
Matt Dean
|
98611b46
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
ChrisTchou
|
c19d413a
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Andre McGrail
|
525120da
|
Lava tweaks
Slope shader
|
8 年前 |
Florent Guinier
|
670f4bf3
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
|
Andre McGrail
|
b061e067
|
Lava and some stuff.
Fixed screen pos
|
8 年前 |
MingWai
|
bdfd3b5f
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
|
vlad
|
b247c311
|
Texture assets and related notes work now (Thanks Tim!)
|
8 年前 |
|
MingWai
|
b038c97f
|
gradient assets
|
8 年前 |
bfogerty
|
7d92d077
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
|
Matt Dean
|
2c09193d
|
Updated eye master
|
8 年前 |
|
ChrisTchou
|
5c5083d0
|
Adding 3d checkerboard & 3d output from sphere dent
|
8 年前 |
|
bfogerty
|
8033e041
|
A buldge now comes from the Cellular shader.
|
8 年前 |
|
Matt Dean
|
eed9ee0e
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
|
ChrisTchou
|
a6a2d4de
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
|
bfogerty
|
3b03ea1a
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
|
MingWai
|
c0a0fd0b
|
custom texture use case
|
8 年前 |
|
Matt Dean
|
4781b571
|
Added anisotropy demo shader
|
8 年前 |
|
Florent Guinier
|
786455b2
|
dynamic texture demo
|
8 年前 |
|
Matt Dean
|
1ddad83f
|
Added character rendering scene
|
8 年前 |
|
MingWai
|
59f4b762
|
graph assets
|
8 年前 |
|
bfogerty
|
ea8e9875
|
Added the Unity Logo to the Cellular texture
|
8 年前 |
|
Florent Guinier
|
c94e9640
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
|
bfogerty
|
7ac6f978
|
Repositioned the center ball in the shader.
|
8 年前 |
|
bfogerty
|
ca642cc1
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
|
Florent Guinier
|
264cb36f
|
fix gradient node (with more cofee)
|
8 年前 |
