Eduardo Chaves
|
91c14c31
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Andre McGrail
|
b6182225
|
Menu reorg: All math nodes organised and cleaned
|
8 年前 |
vlad
|
500e0026
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
RinaldoTjan
|
41da8598
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Florent Guinier
|
ec474be5
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
8 年前 |
Tim Cooper
|
e8c71321
|
converting nodes to new system.
|
8 年前 |
|
Tim Cooper
|
8df91eb4
|
Remove function 1 input and function 4 input
|
8 年前 |
Peter Bay Bastian
|
7e160ce8
|
Run `hg format` on repository
|
7 年前 |
Matt Dean
|
3ca3abee
|
Maths Part 2
- Maths/Interpolation
- Maths/Round
- Fix merge conflict for PR
|
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 年前 |
|
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 年前 |
|
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
|
fe197d85
|
Update Math node defaults
|
7 年前 |
GitHub
|
c763baf4
|
Merge pull request #163 from Unity-Technologies/node-bugfixes
Node bugfixes
|
7 年前 |
|
Matt Dean
|
f43e0a6f
|
Merge branch 'master' into node-input
|
7 年前 |
|
Matt Dean
|
352a061a
|
Merge branch 'master' into compare-and-branch
|
7 年前 |
|
Jens Holm
|
55b86ced
|
Merge branch 'master' into inspector-window
|
7 年前 |
|
Matt Dean
|
725a1ea9
|
Merge branch 'master' into sliders
|
7 年前 |
|
Matt Dean
|
c0c00ec0
|
Merge branch 'master' into node-matrix
|
7 年前 |
Keijiro Takahashi
|
2dfb9d77
|
Easy-to-understand names for step function arguments.
|
7 年前 |
|
GitHub
|
e6be5cc8
|
Merge pull request #232 from keijiro/step-args
Easy-to-understand slot names for Step node.
|
7 年前 |
Martin Thorzen
|
7b5ca064
|
Merge with master
|
7 年前 |
|
Peter Bay Bastian
|
a4d1c27d
|
Merge branch 'master' into node-bugfixes
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Resources/Styles/MaterialGraph.uss
|
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 年前 |
