Tim Cooper
|
f62762b2
|
[mat graph]Move material options into the master node they exist for + add GUID support for selected master node.
|
8 年前 |
Paul Demeulenaere
|
2c0192a0
|
Add VertexColorNode & Fix missing bitangent in AbstractSurfaceMasterNode.cs
|
8 年前 |
Paul Demeulenaere
|
8592d7d0
|
Add an index to RequiresMeshUV, allows require UV1 to UV3
|
8 年前 |
Tim Cooper
|
7ee96660
|
[mat graph]Start work on remapper
|
8 年前 |
Tim Cooper
|
112ae744
|
[mat graph]Really rough, but working! remap nodes.
|
8 年前 |
Tim Cooper
|
c11fe3b4
|
[Material graph]Tidy up node remapper. It now does not emit nodes but passes through.
|
8 年前 |
Tim Cooper
|
e6cc7289
|
Merge branch 'RemapAndSubshader'
|
8 年前 |
Tim Cooper
|
0a990a6d
|
allow specifying the UV channel on the UV node.
|
8 年前 |
ChrisTchou
|
9ac0408c
|
Adding support for IMayRequireViewDirectionTangentSpace, and a simple Parallax node to use it. Node seems to have the correct behavior, but not fully tested.
|
8 年前 |
Florent Guinier
|
ec474be5
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
bfogerty
|
82da97c0
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
MingWai
|
4c1c61da
|
ExportTexture MasterNode
|
8 年前 |
RinaldoTjan
|
ea69972e
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Florent Guinier
|
17d6c4b6
|
Fix compilation error in ExportTextureMasterNode
|
8 年前 |
Florent Guinier
|
9f32c80b
|
ExportTextureMasterNode fix + cleanup
|
8 年前 |
Florent Guinier
|
a861a405
|
export texture compatible with CustomTexture (wip)
|
8 年前 |
Matt Dean
|
7968bfa6
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Jennifer Nordwall
|
72252143
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
ChrisTchou
|
45eedc86
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Florent Guinier
|
8012f9e3
|
Fix CustomTexture preview
|
8 年前 |
bfogerty
|
1f0971d6
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Eduardo Chaves
|
c3b50c34
|
Adding Vertex position to master node and vertex position input node
|
8 年前 |
Andre McGrail
|
c99dc5e2
|
REPO FIX
|
8 年前 |
Matt Dean
|
718af347
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Jennifer Nordwall
|
475f5e3b
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Florent Guinier
|
fe87f870
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
vlad
|
5f08fc4e
|
Changed sampelr2D to Texture2D, added wrappers for HLSL to make decoupled texture samplers work with surface shaders, added a Sampler node, etc.
|
8 年前 |
Jennifer Nordwall
|
b94d71ca
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
RinaldoTjan
|
c5984a7b
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
bfogerty
|
7a9f1ef2
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
ChrisTchou
|
683c517e
|
Merge remote-tracking branch 'origin/hackweek2017' into hackweek2017
|
8 年前 |
Tim Cooper
|
d0d60781
|
Texture asset is now a real asset type...
|
7 年前 |
Tim Cooper
|
06b7010b
|
Remove "AnyNode"
|
7 年前 |
Tim Cooper
|
e3f06249
|
Shader name is now the name of the file.
|
7 年前 |
Peter Bay Bastian
|
7e160ce8
|
Run `hg format` on repository
|
7 年前 |
Peter Bay Bastian
|
ed185a44
|
Preliminary vertex shader support
|
7 年前 |
Tim Cooper
|
8a87c992
|
More refactoring.
|
7 年前 |
GitHub
|
5f6271d2
|
Merge pull request #67 from stramit/refactor-properties
Refactor properties
|
7 年前 |
Tim Cooper
|
29754ac3
|
Working light weight unlit master node
|
7 年前 |
Peter Bay Bastian
|
f95f8c27
|
BIG namespace refactor: UnityEngine -> UnityEditor, MaterialGraph -> ShaderGraph
No longer need assembly name in serialized data
|
7 年前 |
Matt Dean
|
abed850e
|
Merge master
And fix conflicts
|
7 年前 |
Tim Cooper
|
3039671f
|
Merge master
|
7 年前 |
Tim Cooper
|
497d1891
|
Fix merge issues.
|
7 年前 |
Matt Dean
|
41b314d2
|
Merge branch 'master' into node-validation
|
7 年前 |
Natalie Burke
|
11e072f9
|
Merge branch 'node-validation' of https://github.com/Unity-Technologies/ShaderGraph into node-validation
|
7 年前 |
Patrick Fournier
|
de93c238
|
Merge trunk
|
7 年前 |
Tim Cooper
|
0ceca805
|
Add transparency modes.
|
7 年前 |
GitHub
|
81859b60
|
Merge pull request #92 from Unity-Technologies/pass-architecture
Pass architecture
|
7 年前 |
Matt Dean
|
1b3ac398
|
Merge branch 'master' into node-artistic-adjustment
|
7 年前 |
Tim Cooper
|
54ac74c0
|
Merge branch 'master' into node-input-scene
|
7 年前 |
Tim Cooper
|
16640c42
|
Run code format tool
|
7 年前 |
Tim Cooper
|
2731487c
|
Merge branch 'master' into node-input-scene
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Math/Vector/TransformNode.cs
|
7 年前 |
Peter Bay Bastian
|
1cf9ffde
|
Update node titles to use new array-based grouping `[Title("UV/Flipbook")]` -> `[Title("UV", "Flipbook")]`
|
7 年前 |
Matt Dean
|
ca5e100b
|
Merge branch 'master' into node-input-scene
|
7 年前 |
Jens Holm
|
67d2fd02
|
Merge master
|
7 年前 |
Tim Cooper
|
f799dd40
|
Really Rough working HD Unlit master node.
|
7 年前 |
GitHub
|
c3ae833e
|
Merge pull request #144 (Upgrade to use new shader library)
Also includes WIP HD Unlit Master Node
|
7 年前 |
Jens Holm
|
93fa2455
|
Merge remote-tracking branch 'origin/master' into inspector-window
|
7 年前 |
Matt Dean
|
c0c00ec0
|
Merge branch 'master' into node-matrix
|
7 年前 |
Peter Bay Bastian
|
a107a23e
|
Major shader generation refactor part 1
|
7 年前 |
GitHub
|
ae1dff05
|
Merge pull request #1358 from Unity-Technologies/sg/vertex-modification
Vertex Modification
|
7 年前 |
Alex Lian
|
3be7d580
|
Merge remote-tracking branch 'origin/master' into build/automation
|
7 年前 |
Stephane Laroche
|
9498fe0b
|
Merge branch 'master' into stacklit
|
7 年前 |
Matt Dean
|
36a0484f
|
Merge remote-tracking branch 'origin/master' into sg/texture-types
|
7 年前 |
GitHub
|
7f5da648
|
Merge branch 'master' into sg/show-generated-code
|
7 年前 |
Peter Bay Bastian
|
d94fc511
|
Make HD Shader Graph sub-shader specify RenderPipeline so that it doesn't break LW support
|
7 年前 |
Frédéric Vauchelles
|
4d7f78f1
|
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/BuildPlayer/HDRPVariantStripper.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
|
7 年前 |