Peter Bay Bastian
|
3bcd87d8
|
Add progress bar during shader compilation
|
7 年前 |
Tim Cooper
|
6161fea6
|
Fix compiler warnings :)
|
7 年前 |
|
Peter Bay Bastian
|
145b4d5f
|
Get rid of presenter for graph inspector
|
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 年前 |
|
Peter Bay Bastian
|
a15cfa1d
|
Minor changes to VectorControl
|
7 年前 |
Matt Dean
|
25f091c2
|
Missed file
|
7 年前 |
|
Peter Bay Bastian
|
39d3dc25
|
Undo support for all node controls
|
7 年前 |
|
Matt Dean
|
31068f89
|
More PR fixes
|
7 年前 |
|
Peter Bay Bastian
|
99701f90
|
UIElements-based controls for color and vector controls
|
7 年前 |
|
Matt Dean
|
9772a011
|
More PR fixes
|
7 年前 |
|
Peter Bay Bastian
|
d4bf2988
|
Update to work with latest Editor
|
7 年前 |
|
Matt Dean
|
b4599393
|
Fix merge conflicts for PR
|
7 年前 |
|
Peter Bay Bastian
|
e3cb9212
|
Undo handling for adding/removing shader properties
|
7 年前 |
|
Matt Dean
|
3ca3abee
|
Maths Part 2
- Maths/Interpolation
- Maths/Round
- Fix merge conflict for PR
|
7 年前 |
|
Peter Bay Bastian
|
1b46d517
|
More robust undo/redo by removing and adding nodes
|
7 年前 |
|
Matt Dean
|
4ec6fe3b
|
Maths Part 1
- Maths/Basic
- Maths/Advanced
- Maths/Range
- Add HLSL safe conversion for node name
|
7 年前 |
|
Peter Bay Bastian
|
b7975d8f
|
Reflection based undo deserialization
|
7 年前 |
damian
|
1b331496
|
Merge branch 'master' into no-presenters
|
7 年前 |
|
Peter Bay Bastian
|
e0963bb8
|
More serialization fix
|
7 年前 |
|
damian
|
6a03177d
|
Merge branch 'master' into no-presenters
|
7 年前 |
|
Peter Bay Bastian
|
a8f898e3
|
Fix serialization
|
7 年前 |
|
damian
|
3db84206
|
Fixed some bugs after master merge.
|
7 年前 |
|
Peter Bay Bastian
|
3b4b0eb6
|
Fix deserialization of SerializableGraphObject (refactor typo)
Rename inMemoryAsset to graphObject
|
7 年前 |
|
damian
|
83548475
|
Merging master.
|
7 年前 |
|
Peter Bay Bastian
|
c5a7e594
|
Fix integration with Undo by introducing IGraphObject
|
7 年前 |
|
Peter Bay Bastian
|
9f5fba90
|
Merge branch 'attribute-controls'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
|
7 年前 |
|
Peter Bay Bastian
|
3790252c
|
Remove last node presenters and also type mapper in MaterialGraphPresenter
|
7 年前 |
|
damian
|
7e977d50
|
Fixed inspector and node position is now saved.
|
7 年前 |
|
damian
|
20646d1b
|
Removed MaterialNodePresenter.
|
7 年前 |
|
damian
|
17b67cdf
|
More cleanup of presenter code.
|
7 年前 |
|
damian
|
d9e85fdf
|
Cleaning up presenter code.
|
7 年前 |
|
Tim Cooper
|
3da19296
|
missed files
|
7 年前 |
|
Tim Cooper
|
98c7f93e
|
Open up the correct graph when double clicked on.
|
7 年前 |
|
Tim Cooper
|
24923996
|
misc fixes afer changes
|
7 年前 |
|
Tim Cooper
|
2c1b60e0
|
compiling
|
7 年前 |
|
Tim Cooper
|
215e1b6a
|
Refactoring slot types.
|
7 年前 |
|
Tim Cooper
|
cfc92bad
|
update package def.
|
7 年前 |
|
Tim Cooper
|
e9f10553
|
Fix dependency
|
7 年前 |
|
Tim Cooper
|
b16686d0
|
strip hd pipe for now when in package.
|
7 年前 |
|
Tim Cooper
|
1094a25f
|
move HD using class data from core.
|
7 年前 |
GitHub
|
59c35fd3
|
Merge pull request #484 from Unity-Technologies/Recreate-light-list-PR
Recreate light list pr
|
7 年前 |
Sebastien Lagarde
|
2b49d121
|
Re add sample scene
|
7 年前 |
|
Sebastien Lagarde
|
d36f89ad
|
add files
|
7 年前 |
|
GitHub
|
9d30417f
|
Merge pull request #482 from Unity-Technologies/Unity-2017.3
Unity 2017.3
|
7 年前 |
|
GitHub
|
39471547
|
Merge pull request #480 from Unity-Technologies/revert-477-revert-475-lightlists
Revert "Revert "light/probe lists reference implementation""
|
7 年前 |
|
GitHub
|
aca7c5b3
|
Revert "Revert "light/probe lists reference implementation""
|
7 年前 |
|
GitHub
|
be80c8a3
|
Merge pull request #477 from Unity-Technologies/revert-475-lightlists
Revert "light/probe lists reference implementation"
|
7 年前 |
|
GitHub
|
377ca98b
|
Revert "light/probe lists reference implementation"
|
7 年前 |
|
GitHub
|
bd6266f8
|
Merge pull request #475 from Unity-Technologies/lightlists
light/probe lists reference implementation
|
7 年前 |
|
GitHub
|
17bdc932
|
Merge pull request #476 from Unity-Technologies/Unity-2017.3
Merge 2017.3
|
7 年前 |
