Felipe Lira
|
a6a01a17
|
Fixed merge errors in the scene lightweight lights scene.
|
7 年前 |
|
Felipe Lira
|
9c00a86c
|
Merge branch 'LightweightPipeline'
# Conflicts:
# Assets/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/Shaders/StandardBlinnPhongShader/LightweightLights.unity
|
7 年前 |
GitHub
|
34abb246
|
Merge pull request #384 from EvgeniiG/volumetrics
Merge volumetrics code (WIP)
|
7 年前 |
Peter Bay Bastian
|
9a0518a6
|
Add render pipeline switcher component to test scenes, such that the relevant render pipeline is selected when the scene is opened
|
7 年前 |
|
GitHub
|
6b3902c9
|
Merge pull request #382 from Unity-Technologies/Branch_NewLayeredFix
Fixes for updated LayeredLit shader
|
7 年前 |
Julien Ignace
|
f0d202b1
|
Fixed UV Mapping mask for layered shader.
|
7 年前 |
|
Julien Ignace
|
beb12b20
|
Small UI improvement for Lit/Layered
|
7 年前 |
Tim Cooper
|
994119c6
|
Add showing invalid materials to HDpipe
|
7 年前 |
|
GitHub
|
cac3c47f
|
Merge pull request #381 from EvgeniiG/master
Add additional shader passes + clean-up
|
7 年前 |
|
Peter Bay Bastian
|
a4ea9ff8
|
Merge branch 'master' into prepare-filtering
# Conflicts:
# Assets/ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs
|
7 年前 |
|
Peter Bay Bastian
|
a00f148d
|
Remove usage of EditorGUILayout.MiniThumbnailObjectField, so that we don't have to make it public
|
7 年前 |
|
Tim Cooper
|
00dbcd47
|
Clear shader errors before updating.
|
7 年前 |
|
Tim Cooper
|
c04a43b4
|
add [OnOpenAsset] again :)
|
7 年前 |
|
Tim Cooper
|
a1cb65d5
|
Working scripted importer version.
|
7 年前 |
|
Tim Cooper
|
e94975d2
|
redoing importers
|
7 年前 |
|
Peter Bay Bastian
|
cc654bc4
|
Fix picking mode on outside-node-input container, so that invisible stuff doesn't block click events
Match slot colors for outside-node-inputs
|
7 年前 |
|
Peter Bay Bastian
|
4d07b648
|
Edges for outside node controls
|
7 年前 |
|
Peter Bay Bastian
|
972596ff
|
Remove unneeded event handling (handled elsewhere now)
|
7 年前 |
|
Peter Bay Bastian
|
c2d9f15c
|
Fix undo bug caused by property node -> concrete node conversion happening during undo
|
7 年前 |
|
Peter Bay Bastian
|
59ca63f8
|
Remove defaults value section in inspector
|
7 年前 |
|
Peter Bay Bastian
|
4f983742
|
Update type in dynamic slot names when they change
|
7 年前 |
Matt Dean
|
82ab3813
|
Removed GeneratedShader
|
7 年前 |
|
Peter Bay Bastian
|
7b9315c4
|
Outside node control for UV slots
|
7 年前 |
|
Matt Dean
|
a8cf2f2b
|
Added Projection Parameters to Camera Node
|
7 年前 |
|
Peter Bay Bastian
|
ac179c90
|
Outside node controls for vector types
|
7 年前 |
|
Matt Dean
|
02c6b58d
|
Merge master
|
7 年前 |
|
Peter Bay Bastian
|
4f1b32b9
|
Undo fix
|
7 年前 |
|
Matt Dean
|
bbb186d6
|
Remove Gradient nodes and asset type :(
|
7 年前 |
|
GitHub
|
e10be928
|
Merge pull request #81 from patrickfournier/graph-view-copy-paste
Graph view copy paste, for trunk cfe3ca666188 and later
|
7 年前 |
|
Matt Dean
|
e44629cb
|
Fixes for PR
- Rename Tangent/Normal/Bitangent nodes
- Make GetHLSLSafeNAme static
- Rename MatrixCommonNode > TransformationMatrixNode
- Rename enums for Log and Exponential base
- String interpolation > Switch statement
- Full names for all Trigonometry nodes
- Rename Reflect/Project/Reject > Reflection/Projection/Rejection
- Rename Fresnel/FresnelEffect
- Rename unit enum in RotateNode (remove duplicate in UVTransform)
- Add min/max clamp to Gradient2D evaluation
|
7 年前 |
|
GitHub
|
a7d3058a
|
Merge branch 'master' into graph-view-copy-paste
|
7 年前 |
|
Matt Dean
|
a63160cc
|
UV Nodes
- Minor fixes to Natalies commits
|
7 年前 |
|
GitHub
|
849d3ecb
|
Merge branch 'master' into graph-view-copy-paste
|
7 年前 |
|
Peter Bay Bastian
|
d50eb6bb
|
Outside node controls for texture slots + various fixes
|
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 年前 |
Jens Holm
|
d2b246fa
|
Allow mesh in preview to be null / none selected as default sphere mesh
|
7 年前 |
|
Natalie Burke
|
e92749db
|
changing input order to increase consistency. Added center input for rotate node
|
7 年前 |
|
Jens Holm
|
35d08f0d
|
Add OnVlaueChanged callback to preview mesh picker for master node
|
7 年前 |
|
Natalie Burke
|
dc3b9dcd
|
Merge branch 'node-validation' of https://github.com/Unity-Technologies/ShaderGraph into node-validation
|
7 年前 |
Patrick Fournier
|
20c7f686
|
Update changes following merge with master.
|
7 年前 |
|
Peter Bay Bastian
|
e408be90
|
Handle remove events from GraphView
|
7 年前 |
|
Natalie Burke
|
9650733e
|
changing result to out - cutting transfrom - adding Tiling Offset. Some functionality may change based on Tiling Offset UV input/texture node changes
|
7 年前 |
|
Patrick Fournier
|
de93c238
|
Merge trunk
|
7 年前 |
|
Tim Cooper
|
e9731703
|
Move convert to property / inline node to right click menu.
|
7 年前 |
|
Matt Dean
|
c27b2a9e
|
Rename Texture2DAssetNode
|
7 年前 |
|
Natalie Burke
|
11e072f9
|
Merge branch 'node-validation' of https://github.com/Unity-Technologies/ShaderGraph into node-validation
|
7 年前 |
|
Tim Cooper
|
0addad32
|
Fix stack overflow
|
7 年前 |
|
Matt Dean
|
324ba49c
|
Input Part 6 (Gradient)
- Merge branch Gradient
- Added Gradient MaterialSlot and ShaderProperty
- Added defaulty handling
- Fixed SamplerState variable name bug
|
7 年前 |
|
Tim Cooper
|
92a955c3
|
Add converter from v1,v2,v3,v4,col nodes -> properties.
|
7 年前 |
|
Matt Dean
|
c86f6166
|
Input Part 5
Fixed sampler state
|
7 年前 |
