Eduardo Chaves
|
91c14c31
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
Andre McGrail
|
b6182225
|
Menu reorg: All math nodes organised and cleaned
|
7 年前 |
vlad
|
500e0026
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
RinaldoTjan
|
41da8598
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
|
Andre McGrail
|
503b7b62
|
Remap node fix, beginning of toggle node
|
7 年前 |
bfogerty
|
0d1ac07f
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
Florent Guinier
|
ec474be5
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
Jennifer Nordwall
|
72252143
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
|
Andre McGrail
|
22cf545d
|
Fixed math in remap node
Added second output for screenPos that is pure XY UVs
|
7 年前 |
Matt Dean
|
c09d8226
|
Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017
|
7 年前 |
ChrisTchou
|
683c517e
|
Merge remote-tracking branch 'origin/hackweek2017' into hackweek2017
|
7 年前 |
Tim Cooper
|
e8c71321
|
converting nodes to new system.
|
7 年前 |
|
Tim Cooper
|
4b1458e8
|
Remove Function3Input (use code node) :)
|
7 年前 |
|
Tim Cooper
|
8df91eb4
|
Remove function 1 input and function 4 input
|
7 年前 |
|
Tim Cooper
|
5e6630fb
|
Porting more nodes to not be function nodes
|
7 年前 |
Peter Bay Bastian
|
7e160ce8
|
Run `hg format` on repository
|
7 年前 |
|
Matt Dean
|
4ec6fe3b
|
Maths Part 1
- Maths/Basic
- Maths/Advanced
- Maths/Range
- Add HLSL safe conversion for node name
|
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
|
39a5af4a
|
Fix to RandomRangeNode
- Changed the seed input format from Vector1 to Vector2.
- Changed the way of applying Min/Max.
|
7 年前 |
|
GitHub
|
b3f61fbc
|
Merge pull request #213 from keijiro/fix-range
Improvements to RandomRangeNode
|
7 年前 |
|
Matt Dean
|
3df359f2
|
Merge branch 'master' into node-matrix
|
7 年前 |
|
Matt Dean
|
7c973636
|
Merge branch 'master' into node-bugfixes
|
7 年前 |
|
Matt Dean
|
98f88207
|
Update documentation links
Math/Derivatives
Math/Interpolation
Math/Range
|
7 年前 |
|
GitHub
|
6dfcd844
|
Merge pull request #227 from Unity-Technologies/node-bugfixes
Update documentation links
|
7 年前 |
Martin Thorzen
|
7b5ca064
|
Merge with master
|
7 年前 |
|
Martin Thorzen
|
f5ae4e88
|
Merge with master
|
7 年前 |
