Eduardo Chaves
91c14c31
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Matt Dean
eeaa57f9
Menu Reorg: Channel & Procedural
8 年前
bfogerty
9d1506f2
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
bfogerty
ae510b9e
Added a Voronoi Noise Node
8 年前
RinaldoTjan
41da8598
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
RinaldoTjan
180f53e2
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
bfogerty
1780d88e
The Voronoi Noise can now be animated.
8 年前
bfogerty
6ff47f50
Repeating Dot Procedural Node
8 年前
bfogerty
ee8f0ea6
Added a spherize node and fixed a bug in the checkerboatd node.
8 年前
Florent Guinier
ec474be5
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
RinaldoTjan
ea69972e
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
bfogerty
a82b356e
Added a Pulse Node
8 年前
bfogerty
f0331f23
Added a procedural box node and made a few changes to the inputs of the pulse node.
8 年前
Eduardo Chaves
20f9d0ca
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Florent Guinier
fac62848
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 年前
bfogerty
5dbc06ce
Voronoi noise now outputs different different effects.
8 年前
Matt Dean
718af347
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
bfogerty
a20b7720
Added a Twist UV node and moved the Noise Node into the correct directory.
8 年前
Eduardo Chaves
8938908f
Adding more output variations to voronoi noise
8 年前
bfogerty
995a95bc
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 年前
Eduardo Chaves
bd162e6b
Added default value to the checkerboard node
8 年前
Florent Guinier
fe87f870
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
8 年前
Natasha Tatarchuk
419516e8
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
e8c71321
converting nodes to new system.
8 年前
Tim Cooper
4b1458e8
Remove Function3Input (use code node) :)
8 年前
Tim Cooper
8df91eb4
Remove function 1 input and function 4 input
8 年前
Tim Cooper
5e6630fb
Porting more nodes to not be function nodes
8 年前
Peter Bay Bastian
7e160ce8
Run `hg format` on repository
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 年前
Patrick Fournier
de93c238
Merge trunk
7 年前
Natalie Burke
f9118863
reordering and sorting of procedural nodes, created temp make shadergraph category and added nodes that should become shader graphs there. Fixed broken procedural nodes, added useful inputs, unified stylization
7 年前
Tim Cooper
fc3caa89
Merge commit '0a54bdcf00befab61d3a0bbec18c543478eb086d' into fixing
7 年前
mathieum-unity
045d568e
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
Matt Dean
65348a87
Rename Checkboard Node
7 年前
Matt Dean
73639f15
Fix Checkerboard node
- Rename class
- Rename method
- Change color slots to Color type
- Adjust UVs to align checker to boundaries
- Use precision value
- Comment out old node (using the Checkerboard name)
7 年前
GitHub
35129ab8
Merge pull request #91 from Unity-Technologies/node-bugfixes
Node Bugfixes
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
5ce62a7e
Move old procedural to WIP
7 年前
Matt Dean
3157dc84
Move Noise nodes to Noise folder
7 年前
Matt Dean
7017122a
Fixes to noise nodes
7 年前
Matt Dean
e1814d28
Renamed noise nodes
7 年前
GitHub
0eec5e4e
Merge pull request #95 from Unity-Technologies/node-validate-current
Validate all current nodes
7 年前
Matt Dean
e7f2c3a5
Add Polygon node
7 年前
Matt Dean
9717c2d8
Move Box node
7 年前
Matt Dean
2fc3d22e
Rename Box node > Square node
7 年前
Matt Dean
5b4a28ab
Fix Square node
7 年前
Matt Dean
ca5e100b
Merge branch 'master' into node-input-scene
7 年前
Matt Dean
278cfacc
Renamed Square node > Rectangle node
7 年前
Matt Dean
e348b11e
Moved Repeating Dot node
7 年前
Matt Dean
afc52ffa
Fixes to polygon and ellipse nodes
7 年前
Matt Dean
68dcee06
Renamed Repeating Dot node > Ellipse node
7 年前
Matt Dean
4512dff0
Started work on Rounded Rectangle node
7 年前
Matt Dean
0364097d
Fix Rounded Rectangle
7 年前
Jens Holm
67d2fd02
Merge master
7 年前
Matt Dean
00d8b6e8
Rename ColorMaterialSlot > ColorRGBAMaterialSlot and add ColorRGB slot
7 年前
GitHub
ef9bd86c
Merge pull request #124 from Unity-Technologies/color-rgb
Color RGB
7 年前
Tim Cooper
a197968f
Merge remote-tracking branch 'origin/master' into HDMaster
7 年前
GitHub
5546123e
Merge branch 'master' into node-bugfixes
7 年前
GitHub
6f046031
Merge pull request #127 from Unity-Technologies/procedural-shape
Procedural Shape
7 年前
Peter Bay Bastian
41e06942
Change IGeneratesFunction such that a name is provided to a registry, which only allows 1 implementation per name. Includes a validation mode that checks that multiple given functions with the same name are actually the same.
7 年前
Tim Cooper
5c979fc8
Merge master
7 年前
Matt Dean
c0c00ec0
Merge branch 'master' into node-matrix
7 年前
Keijiro Takahashi
746b96e3
Added Gradient Noise node.
7 年前
GitHub
02682528
Merge pull request #216 from keijiro/gradient-noise-node
Addition of Gradient Noise node.
7 年前
Matt Dean
3df359f2
Merge branch 'master' into node-matrix
7 年前
Matt Dean
7c973636
Merge branch 'master' into node-bugfixes
7 年前
Keijiro Takahashi
bcc36851
Antialiasing with procedural shapes.
7 年前
GitHub
0f41473d
Merge pull request #248 from keijiro/shapes-aa
Antialiasing with procedural shapes.
7 年前
Matt Dean
394320a1
Add documentation links for all nodes
7 年前
GitHub
bad5cbcd
Merge pull request #277 from Unity-Technologies/doc-links
Add documentation links for all nodes
7 年前
Peter Bay Bastian
0b584564
Merge with master
7 年前
Peter Bay Bastian
a029858d
Merge branch 'master' into fix-postlayoutevent
# Conflicts:
# com.unity.shadergraph/Editor/Drawing/Manipulators/WindowDraggable.cs
7 年前
Martin Thorzen
731a2018
Merge branch 'master' into node-settings
# Conflicts:
# com.unity.shadergraph/Editor/Data/MasterNodes/PBRMasterNode.cs
# com.unity.shadergraph/Editor/Util/UIUtilities.cs
7 年前
Peter Bay Bastian
6cdf82d9
Further ShaderStageCapability work
- Add to slot compatibility check (fix create node menu generation)
- Add ShaderStageCapability to CodeFunctionNode slot attribute
- Move SampleTexture2D, NormalCreate, Checkerboard and Triplanar to fragment stage only
7 年前
Peter Bay Bastian
77dc0df1
Make all procedural shape nodes fragment stage only
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
26a4b39a
HD subshaders branch rebuild
7 年前
GitHub
cd218826
Merge pull request #1376 from Unity-Technologies/sg/hdsubshaders
HD Master Node Support
7 年前
Alex Lian
0d975dea
Merge remote-tracking branch 'origin/master' into build/automation
7 年前
Matt Dean
36a0484f
Merge remote-tracking branch 'origin/master' into sg/texture-types
7 年前
sebastienlagarde
c0461407
Merge branch 'master' into Add-support-of-per-light-shadow-mask-control
7 年前
GitHub
7f5da648
Merge branch 'master' into sg/show-generated-code
7 年前
Tim Cooper
fafb59af
Run code formatter.
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 年前
Peter Bay Bastian
88b60892
Fixing AA of procedural checkerboard node
7 年前
Peter Bay Bastian
6e2cae42
Fixing frequency limiter to allow the lerp values to actually hit their endpoints. Also switching to a slightly cheaper calculation that gives nearly identical results.
7 年前
Chris Tchou
929feabf
Merge remote-tracking branch 'origin/sg/fix-checkerboard' into vertexAnimHDRP2
7 年前
GitHub
f4d8c338
Merge pull request #1449 from Unity-Technologies/vertexAnimHDRP2
Vertex anim HDRP
7 年前
Peter Bay Bastian
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
7 年前
sebastienlagarde
4a622009
Merge branch 'master' into refactor-shader-variant-per-material
7 年前
Oliver Schnabel
3a15d806
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
7 年前
Stephane Laroche
7933fd8d
Merge branch 'master' into StackLit2
7 年前
Paul Melamed
797daf79
Merge branch 'master' into decals/ss3_channel_mask
7 年前
sebastienlagarde
6c870111
Merge branch 'master' into FalseColorMode
7 年前
Thomas
01ee049b
Merge branch 'master' into gfx-tests-postfx
7 年前
GitHub
3a6a4e59
Merge branch 'master' into sg/spheremasknode
6 年前
Nerites
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
Aleksandr Kirillov
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
Matt Dean
91d80f85
Small Node Fixes ( #1670 )
* unroll simple noise loop and add overwrite blend mode to blend node
* updated changelog
* fixed polygon node caluclations
* put overwrite blend mode at the end of the enum
* updates to changelog
* fixing z calculation on normal strength node
6 年前
Sebastien Lagarde
cd85f0d3
Merge branch 'master' into HDRP/staging
6 年前
Antoine Lelievre
d5e69c03
Merge HDRP/staging
6 年前
sebastienlagarde
72687aa9
Merge branch 'HDRP/staging' into HDRP/fix/reflection-probe-offset-with-rotation
6 年前
GitHub
b400b1c1
Merge branch 'master' into lw/terrain_optimization
6 年前
Sebastien Lagarde
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
GitHub
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
Paul Melamed
9dbd8998
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
# Conflicts:
# com.unity.render-pipelines.high-definition/CHANGELOG.md
# com.unity.render-pipelines.high-definition/HDRP/RenderPipelineResources/RenderPipelineResources.cs
6 年前
Yao Xiao Ling
cfd45cf1
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
GitHub
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前