bfd7b48d
Import blackboard to project, still WIP
7 年前
1749ff66
A bunch of stuff for blackboard
- Fix SelectionDropper, so that selection of properties work
- Hack in a ContextualMenuManipulator so that context menus work in collaboration with GraphView
- Add a "Delete" option to context menu for properties
- Only show context menu options for nodes if a node or GV is right-clicked
- When adding a new property it is now expanding initially
- Rename a few Action properties to match GraphView convention
- Add a regular Unity toolbar (using IMGUI) to Shader Graph, as it looked weird without one
- Remove old inspector
7 年前
4cfaf738
Add serialization for blackboard layout
7 年前
0534342e
Added support for reordering properties in blackboard
7 年前
abe82146
Added support for drag and dropping properties to the graph
7 年前
84072c18
Add undo actions for blackboard
7 年前
2fc16a9a
Make blackboard only be draggable from the header to avoid conflicts with fields
7 年前
e9df888c
Merge pull request #189 from Unity-Technologies/blackboard
Blackboard improvements
7 年前
86e92a04
Merge pull request #191 from Unity-Technologies/fixes-for-blackboard
Fixes for blackboard
7 年前
5d0155ff
Add Blackboard support for Boolean
7 年前
affdcadf
Add HDR color support to Blackboard
7 年前
484b4f58
* Add individual properties to node search
* Remove dropdown from property node
* Add all compatible slots to node search when dragging into empty space
*
7 年前
78db5ef1
Refactor float based shader properties
7 年前
4ad43705
Vector1 property refactor and types
7 年前
395c3ec5
Merge pull request #193 from Unity-Technologies/properties-in-search
Improvements to node search
7 年前
78f31c8e
Fix adding Slider and Int properties from inline node conversion
7 年前
ae1852e9
Merge remote-tracking branch 'origin/master' into master-preview-rendertexture-rescale
7 年前
9c0b93c1
Merge branch 'master' into node-bugfixes
7 年前
d2f86285
Merge pull request #192 from Unity-Technologies/node-bugfixes
Property type refactor and Blackboard extension
7 年前
d2b1d4db
Fix UXML paths
7 年前
29361772
Merge branch 'master' into tidy-master-preview
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/MasterPreviewView.cs
7 年前
9647fad6
Make blackboard resize handles stay within the parent bounds
7 年前
7c973636
Merge branch 'master' into node-bugfixes
7 年前
f187d743
Merge pull request #230 from Unity-Technologies/master-preview-rendertexture-rescale
Master preview rendertexture rescale
6 年前
e7218ad7
Remove unused variables and classes and rework how master preview resizing is handled
6 年前
6d5e2c25
Merge with master
6 年前
57a0eab1
Remove unused imports in entire solution
6 年前
cdc03be9
Merge pull request #244 from Unity-Technologies/fix-all-warnings
Fix all warnings
6 年前
f5ae4e88
Merge with master
6 年前
b3445484
Add wrapper for `Assembly.GetTypes()` which won't throw an exception
6 年前
df788737
Merge pull request #275 from Unity-Technologies/integrate-sg-subshaders
Move lightweight sub-shaders and templates to SRP repository
6 年前
0b584564
Merge with master
6 年前
a029858d
Merge branch 'master' into fix-postlayoutevent
# Conflicts:
# com.unity.shadergraph/Editor/Drawing/Manipulators/WindowDraggable.cs
6 年前
fecfaaea
Fix compile errors on trunk by introducing various compatibility extensions
6 年前
0e49b142
* Fix Serializable(Cubemap|Mesh|Texture) classes
* Add back in blackboard classes to work with 2018.1
* Wrap some things in `#if UNITY_2018_1`s
6 年前
dba26376
Merge pull request #283 from Unity-Technologies/fix-trunk-compatibility
Fix trunk compatibility
6 年前
731a2018
Merge branch 'master' into node-settings
# Conflicts:
# com.unity.shadergraph/Editor/Data/MasterNodes/PBRMasterNode.cs
# com.unity.shadergraph/Editor/Util/UIUtilities.cs
6 年前
13a428be
More trunk compatibility fixes
6 年前
685fecd6
Merge pull request #286 from Unity-Technologies/trunk-compatibility
More trunk compatibility fixes
6 年前
b0ebffa3
Started the work on adding path functionality to shaders.
6 年前
dbf93edc
Updated teh Graph path functionality. It now saves the path and reads it back
6 年前
8742fc7b
Merge branch 'master' into node-settings
6 年前
88b45aa5
Added functionality so that you cannot have properties with the same name. It appends (*) to your property where * is just the next sequential number.
6 年前
9c29a0c6
Added functionality to search window and made the path's sanitized.
6 年前
ad7f7e58
Ignore the subjected property when sanitizing name
6 年前
bea679f1
Fixed an extra line whch was not needed
6 年前
43f24a85
Remove checks for within parent bonds in resize handles
6 年前
19a741e4
Switch blackboard layout modifiers to default modifiers
6 年前
246492ed
Merge pull request #299 from Unity-Technologies/layout-modifiers-improvements
Layout modifiers improvements
6 年前
c268bca4
Merge pull request #303 from Unity-Technologies/fix-empty-strings-blackboard
Blackboard Property fixes.
6 年前
9cc55c03
Merge branch 'master' into path-for-shaders
6 年前
23cc01bd
Merge pull request #302 from Unity-Technologies/path-for-shaders
Change path for graphs
6 年前
082d7d93
Replacing soon-to-be deprecated API Resources.Load(string) for Resources.Load<T>(string)
6 年前
03c0b504
Remove uses of .NET 4+ only API
6 年前
09124350
Merge pull request #309 from Unity-Technologies/fix-net35
Fix legacy scripting backend compatibility
6 年前
b68215c9
Add text field on properties to allow a custom reference name
6 年前
26deb2a4
Merge pull request #308 from Unity-Technologies/fixes/update-deprecated-resources-api
Update deprecated Resources API
6 年前
ed5436e4
Make custom property names dirty the graph
6 年前
42451460
Make reference names editable throught text field and add reference name sanitation
6 年前
82435f05
Enforce underscore in overriden property names and allow rest by supplying empty string
6 年前
2e2f5f9e
Simplify regex for checking valid property reference
6 年前
6aca31dc
Check property referecne name when the property is created
6 年前
1703288d
Make the property name text field delayed
6 年前
7f9416d0
Make use of the generic duplicate name handling funciton when editing property and reference names
6 年前
2f658454
Make the modified property names bold through uss
6 年前
f86ab019
Add toggle for whether properties are exposed or not
6 年前
8076c27e
Merge branch 'master' into copy-property-nodes
6 年前
82aecff4
Needed to add .uss file to make things display correctly
6 年前
60639f41
Merge branch 'master' into editable-property-reference-names
6 年前
753d4c0f
Merge pull request #349 from Unity-Technologies/blackboard-uss-fixes
Fix font sizes in blackboard
6 年前
9696a5d1
Merge pull request #326 from Unity-Technologies/editable-property-reference-names
Editable property reference names
6 年前
8fcaa92a
Merge branch 'master' into warning-incompatible-pipeline
6 年前
7b43adb3
Update DoRepaint for UIElements change in trunk
6 年前
42b09806
Add first pass Texture2DArray and Texture3D support
6 年前
f8e5ff57
Merge pull request #1377 from Unity-Technologies/sg/texture-types
Texture2D Array and Texture 3D
6 年前
2c4a517b
Merge remote-tracking branch 'origin/master' into build/automation
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDPBRPass.template
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDPBRPass.template.meta
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template.meta
# ScriptableRenderPipeline/HDRenderPipeline/sub-package.json
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightAssetEditor.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightAssetEditor.cs.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightPipelineAssetEditor.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightPipelineAssetEditor.cs.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightShadowPass.cs.meta
# ScriptableRenderPipeline/Ligh...
6 年前
fafb59af
Run code formatter.
6 年前
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
6 年前
f9b16024
Remove 2018.1 compatibility code from Shader Graph
6 年前
29b369e0
Merge pull request #1399 from Unity-Technologies/sg/remove-2018.1-ifdefs
Remove 2018.1 compatibility code from Shader Graph
6 年前
37c00666
Added update title to master preview and blackboard.
cleaned up assetName parameter and dded it as a property instead
Made a seperate shader graph post processor file
6 年前
31db4b9f
Fix core changes to UIElements Toggle with compatibility layer
6 年前
ba8fbc25
Merge pull request #1522 from Unity-Technologies/sg/fix-toggle-changes
Compatibility with Toggle changes in core Unity
6 年前
516b896c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
a49a696e
Merge branch 'master' into StackLit2
6 年前
9db2a137
Merge branch 'master' into HDRP-Tests
6 年前
3a6a4e59
Merge branch 'master' into sg/spheremasknode
6 年前
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
630691ab
Merge pull request #1512 from Unity-Technologies/sg/update-window-title-when-after-file-rename
Update window title
6 年前
0610a60c
Merge branch 'master' into sg/error-for-incompatible-pipeline
6 年前
34ae5a69
Merge branch 'master' into ios-texture-format
6 年前
5196e7ed
Merge branch 'master' into EmissiveMeshForAreaLight
6 年前
a452a9db
Merge branch 'master' into LightUnits
6 年前
1045d10d
Merge branch 'master' into sg/fix-duplicate-subgraphs
6 年前
141afc6f
Merge branch 'master' into decals/v2/per_channel_mask
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs.hlsl
6 年前
540d190a
Merge branch 'master' into HDRP-Tests
# Conflicts:
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1102_Unlit_Distortion.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1103_Unlit_Distortion_DepthTest.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1202_Lit_DoubleSideNormalMode.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1204_Lit_Transparent_Fog.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1208_Lit_Displacement_POM.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1209_Lit_Displacement_Vertex.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1210_Lit_BentNormal.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1302_SSS_MaxRadius.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/Window...
6 年前
1b3f1ca2
Merge branch 'master' into sg/fix-hd-meta-code-cuplication
6 年前
1c4c0d09
Merge branch 'master' into sg/fix-dielectric-specular-control
6 年前
cbb9a885
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
6 年前
8406655d
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
6 年前
9b69a952
Merge xrconfig branch into xrsettings
6 年前
9bf79289
Backport pull request #1529
6 年前
86a99323
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
7281fe31
Merge branch 'HDRP/staging' into decals/v2/per_channel_mask_new_ui
6 年前
73aab246
Merge branch 'hdrp/staging' into StackLit2_TrunkTest
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs
6 年前
Peter Bay Bastian
GitHub
Matt Dean
Jens Holm
Martin Thorzen
JavDevGames
Tim Cooper
Frédéric Vauchelles
Antoine Lelievre
Stephane Laroche
Remy
Nerites
Sebastien Lagarde
Paul Melamed
Aleksandr Kirillov