MingWai
|
660338f9
|
Gradient node
|
7 年前 |
|
MingWai
|
7d5a2883
|
Gradient node bug-fix and RGBA
|
7 年前 |
Matt Dean
|
718af347
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
|
MingWai
|
fa0213a4
|
Random range
|
7 年前 |
|
MingWai
|
4899df50
|
Color balance
|
7 年前 |
|
Matt Dean
|
34f0ba4b
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
|
MingWai
|
3c115bee
|
Scatter node (not ready for use)
|
7 年前 |
Eduardo Chaves
|
fed2bb39
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
bfogerty
|
995a95bc
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
|
MingWai
|
c7641ce9
|
color balance location to Art/Adjustment
|
7 年前 |
Florent Guinier
|
fe87f870
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
Natasha Tatarchuk
|
419516e8
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
vlad
|
5f08fc4e
|
Changed sampelr2D to Texture2D, added wrappers for HLSL to make decoupled texture samplers work with surface shaders, added a Sampler node, etc.
|
7 年前 |
Jennifer Nordwall
|
b94d71ca
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
|
MingWai
|
d82bb008
|
scatter
|
7 年前 |
|
bfogerty
|
7a9f1ef2
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
ChrisTchou
|
683c517e
|
Merge remote-tracking branch 'origin/hackweek2017' into hackweek2017
|
7 年前 |
|
MingWai
|
db8f399d
|
fix gradient serialization
|
7 年前 |
|
ChrisTchou
|
211cce2b
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
|
Florent Guinier
|
73112c5a
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
|
bfogerty
|
abec21f1
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
|
Florent Guinier
|
6722e7ea
|
fix gradientnode export mode
|
7 年前 |
|
Florent Guinier
|
264cb36f
|
fix gradient node (with more cofee)
|
7 年前 |
|
bfogerty
|
ca642cc1
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
|
MingWai
|
59f4b762
|
graph assets
|
7 年前 |
|
Florent Guinier
|
786455b2
|
dynamic texture demo
|
7 年前 |
|
bfogerty
|
3b03ea1a
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
|
ChrisTchou
|
a6a2d4de
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
|
MingWai
|
b038c97f
|
gradient assets
|
7 年前 |
|
Florent Guinier
|
670f4bf3
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
|
ChrisTchou
|
c19d413a
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
|
Matt Dean
|
98611b46
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
Tim Cooper
|
4b1458e8
|
Remove Function3Input (use code node) :)
|
7 年前 |
|
Tim Cooper
|
8df91eb4
|
Remove function 1 input and function 4 input
|
7 年前 |
|
Tim Cooper
|
5e6630fb
|
Porting more nodes to not be function nodes
|
7 年前 |
|
Tim Cooper
|
d0d60781
|
Texture asset is now a real asset type...
|
7 年前 |
Peter Bay Bastian
|
3457c49b
|
Updated to work after merge with trunk
|
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 年前 |
