Matt Dean
|
b2d664e0
|
Added matrix common and ops
|
8 年前 |
MingWai
|
3ccadfe5
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
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 年前 |
Florent Guinier
|
fe87f870
|
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 年前 |
ChrisTchou
|
683c517e
|
Merge remote-tracking branch 'origin/hackweek2017' into hackweek2017
|
8 年前 |
Tim Cooper
|
8df91eb4
|
Remove function 1 input and function 4 input
|
8 年前 |
Peter Bay Bastian
|
7e160ce8
|
Run `hg format` on repository
|
7 年前 |
Tim Cooper
|
215e1b6a
|
Refactoring slot types.
|
7 年前 |
Tim Cooper
|
a5c9b0ce
|
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Input/Matrix/Matrix2Node.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Input/Matrix/Matrix3Node.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/SubGraph/AbstractSubGraphIONode.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/SubGraph/AbstractSubGraphIONode.cs.meta
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/AbstractMaterialGraphEditWindow.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialGraphPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/Nodes/SubgraphIONodePresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Runtime/SubGraph/SubGraphOutputNode.cs
|
7 年前 |
Tim Cooper
|
6161fea6
|
Fix compiler warnings :)
|
7 年前 |
GitHub
|
1d08cd88
|
Merge pull request #70 from Unity-Technologies/tidyup
Tidyup
|
7 年前 |
Peter Bay Bastian
|
b75b4c04
|
Merge branch 'master' into no-presenters
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialNodePresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/GraphEditorView.cs
# MaterialGraphProject/Assets/fresnelstuff.ShaderSubGraph.meta
|
7 年前 |
GitHub
|
21a946ef
|
Merge pull request #73 from Unity-Technologies/master
Merge master
|
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 年前 |
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 年前 |
Matt Dean
|
b23f23cb
|
First pass Matrix 4x4 nodes
|
7 年前 |
Matt Dean
|
8697ac36
|
Preliminary work on Dynamic Matrix
- Add other matrix slot value types
|
7 年前 |
Matt Dean
|
14f5c06b
|
Fix Matrix Multiply Vector node
|
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 年前 |
Peter Bay Bastian
|
38e4110f
|
Move static methods out of AbstractMaterialNode
|
7 年前 |
Tim Cooper
|
5c979fc8
|
Merge master
|
7 年前 |
Matt Dean
|
c0c00ec0
|
Merge branch 'master' into node-matrix
|
7 年前 |
Matt Dean
|
3ad21797
|
Fix Matrix Transpose node
- Cleanup and fixes in matrix slots and props
|
7 年前 |
Matt Dean
|
06549ef3
|
Add Matrix Determinant node
|
7 年前 |
Matt Dean
|
394859b7
|
Remove old matrix multiply nodes
|
7 年前 |
Matt Dean
|
dc41a21f
|
Add Matrix Split node
|
7 年前 |
Matt Dean
|
da78abd3
|
Added Matrix Construction node
|
7 年前 |
Matt Dean
|
6298bd34
|
Add axis selection to Matrix Split and Construction nodes
|
7 年前 |
Matt Dean
|
e20fd08b
|
Fix matrix defaults
|
7 年前 |
GitHub
|
9641212d
|
Merge pull request #224 from Unity-Technologies/node-matrix
Node Matrix
|
7 年前 |
Peter Bay Bastian
|
57a0eab1
|
Remove unused imports in entire solution
|
7 年前 |
GitHub
|
cdc03be9
|
Merge pull request #244 from Unity-Technologies/fix-all-warnings
Fix all warnings
|
7 年前 |
Martin Thorzen
|
f5ae4e88
|
Merge with master
|
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 年前 |
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 年前 |