466 次代码提交 (cc5c2a31-2dfa-4014-be23-e831510fa6b1)

作者 SHA1 备注 提交日期
Peter Bay Bastian 485654b6 #31 Graph inspector now lives inside graph editor window (also, it works again!) 7 年前
Peter Bay Bastian 45e02be9 Rename *Drawer to *View 7 年前
Peter Bay Bastian 693b0aa5 Remove `elements` from MaterialNodePresenter. Sub-presenters are accessed through independent properties now. 7 年前
Peter Bay Bastian b057a909 Clean-up MaterialNodeView a bit 7 年前
Peter Bay Bastian 9dd4edeb #11 #43 Copy, paste & duplicate now works properly and is handled by the window rather than GraphView 7 年前
Peter Bay Bastian 04fedafb Support "Cut" command 7 年前
Peter Bay Bastian 78c22505 Handle delete via window and presenter rather than `MaterialGraphView` 7 年前
Peter Bay Bastian 8bfc6985 Remove needless inheritance from MaterialNodePresenter in GraphControlPresenter 7 年前
Peter Bay Bastian 4fa0de6e Remove NodePreviewView as it is no longer used 7 年前
Tim Cooper 34cc0f15 Start work on making 'sub-graph' work again in an expected way. 7 年前
Peter Bay Bastian 4b24135e #29 Window now tells `MaterialGraphPresenter` to update previews, rather than using schedulers per node 7 年前
Tim Cooper 793887f9 Working 'convert to subgraph' 7 年前
Peter Bay Bastian f516d811 Merge remote-tracking branch 'origin/subgraph' 7 年前
Peter Bay Bastian 7e160ce8 Run `hg format` on repository 7 年前
Peter Bay Bastian d465f37d #43 Handle keyboard shortcuts in window rather than GraphView 7 年前
Peter Bay Bastian a92b64bb #31 UIElements-based graph inspector 7 年前
Peter Bay Bastian 8e1d62b6 Add presenter for GraphEditorView, such that the presenter hierarchy makes more sense (also, pass through asset name to graph inspector #31) 7 年前
Peter Bay Bastian c0b10e8f Update to work with latest graphics/shadergraph 7 年前
Peter Bay Bastian 262456fb Remove legacy code from MaterialGraphView, which was causing the selection to be cleared when zooming/panning (#45) 7 年前
Peter Bay Bastian 10cced5d Log error instead of warning when failing to instantiate node instance 7 年前
Peter Bay Bastian 2b96084b Move GraphInspector{Presenter,View} into Inspector folder 7 年前
Peter Bay Bastian ff2d3ef8 Change namespace of GraphInspector{Presenter,View} 7 年前
Peter Bay Bastian a76aadd7 Remove a few todos in code 7 年前
Peter Bay Bastian ed185a44 Preliminary vertex shader support 7 年前
Peter Bay Bastian 5b7af74e Fix node repainting 7 年前
Peter Bay Bastian 3ffdcd59 Right click no longer deselects nodes 7 年前
Peter Bay Bastian a39f97cc Update to work with latest GraphView 7 年前
Peter Bay Bastian 64c9a49b Purge usage of presenters and datawatch from graph inspector 7 年前
Matt Dean fc0d26d6 Merge remote-tracking branch 'refs/remotes/origin/master' into lt-pipeline-masters 7 年前
Peter Bay Bastian bec6cdbb New preview system and master node preview in inspector 7 年前
Tim Cooper 95cdeda0 Merge remote-tracking branch 'origin/master' into refactor-properties 7 年前
Peter Bay Bastian d0f20689 Add initial preview hiding (still being rendered behind the scenes) 7 年前
Peter Bay Bastian 6c9cb29a Refactor toolbar (no more presenters, acts a little more like buttons) 7 年前
Peter Bay Bastian 65e94a0c Add rate limiting for preview updates 7 年前
Peter Bay Bastian a3385c0f Undo/redo prototype 7 年前
Tim Cooper 9557fcee Merge commit '76ff1855a761cc5b39944f12a7456bbed2c79efb' into exposed-prop-subgraph 7 年前
Peter Bay Bastian 513db118 Fix updating of node positions until we get rid of presenters 7 年前
Peter Bay Bastian 3930a641 Remove GraphEditorPresenter 7 年前
damian 73ca4594 No-presenters works: Fractal and Vector1 node creation and deletion. 7 年前
damian 815e2106 Fixed compatibale anchor finding. 7 年前
Jens Holm cc2d2e3f Add resize handle withh draggable functionality to MaterialNodeView 7 年前
Peter Bay Bastian ff8de4d3 New attribute-based system for node controls 7 年前
damian e9b2550a Added support for checking compatible no-presenter anchors. 7 年前
Jens Holm ddc1113a Resize handle added only to preview node 7 年前
damian 33ee05ff Fixed compatibleAnchors checks for when starting on a no-presenter anchor. 7 年前
damian a4a72ae8 Added support for connecting edges between 2 no-presenter nodes. 7 年前
Peter Bay Bastian 336d2f81 Rename variable in MaterialNodeView 7 年前
damian 591d8820 Fixed MaterialNodeView.OnModified() after no-presenters change. 7 年前
damian 20646d1b Removed MaterialNodePresenter. 7 年前
damian 7e977d50 Fixed inspector and node position is now saved. 7 年前
Peter Bay Bastian 3790252c Remove last node presenters and also type mapper in MaterialGraphPresenter 7 年前
Peter Bay Bastian 9f5fba90 Merge branch 'attribute-controls' 7 年前
damian 83548475 Merging master. 7 年前
damian 3db84206 Fixed some bugs after master merge. 7 年前
Peter Bay Bastian 145b4d5f Get rid of presenter for graph inspector 7 年前
Tim Cooper 6161fea6 Fix compiler warnings :) 7 年前
Tim Cooper 209da78a Merge remote-tracking branch 'origin/master' into tidyup 7 年前
GitHub 1d08cd88 Merge pull request #70 from Unity-Technologies/tidyup 7 年前
Peter Bay Bastian b75b4c04 Merge branch 'master' into no-presenters 7 年前
GitHub 5363a614 Merge pull request #71 from Unity-Technologies/no-presenters 7 年前
Patrick Fournier 26e0dad5 Move copy paste boilerplate and event handling to GraphView. 7 年前
Jens Holm cd7aa840 Add fixed aspect ratio and initial size to PreviewNode 7 年前
Patrick Fournier f1bea6cf Update following the RFC 7 年前
Patrick Fournier 19de8169 Move framing shortcuts to GraphView. 7 年前
Patrick Fournier 2f6fe8fb Remove values that are set by default on parent class. 7 年前
Peter Bay Bastian 43fda89f Remove `INode.onReplaced` (leftover from previous redo impl) 7 年前
Jens Holm 9c92399a Add copy to clipboard toolbar button 7 年前
Peter Bay Bastian 95a87cde Clean up MaterialNodeView after merge with presenter 7 年前
Tim Cooper ccf49055 Merge remote-tracking branch 'origin/master' 7 年前
Peter Bay Bastian 80fe7520 Remove generic parameter from MaterialGraphEditWindow 7 年前
Peter Bay Bastian c88791bb Duplication/insert etc. now selects the new elements 7 年前
Peter Bay Bastian 9dbfb5c3 Move slot compatibility check code into MaterialSlot 7 年前
Peter Bay Bastian c6b895e7 Remove command handling from MaterialGraphPresenter 7 年前
Peter Bay Bastian a97628f1 Work around UIElements bug causing VisualElement.Sort to throw a NullReferenceException if the element is childless 7 年前
Peter Bay Bastian 46b505fb Move more stuff from MaterialGraphPresenter, also introduce proper constructor 7 年前
Peter Bay Bastian c43005a1 Remove last bit of presenters YAY 7 年前
Peter Bay Bastian b6a4d98d Fix preview rendering bugs (causing re-use of previous texture and disapperance of checkerboard background) and persistence (remembers zoom etc. between assembly reloads, scene changes, even play mode!) 7 年前
Peter Bay Bastian 9cbe42fb Fix bug causing collapsed nodes to not have slots visible that should be visible 7 年前
GitHub 21a946ef Merge pull request #73 from Unity-Technologies/master 7 年前
Peter Bay Bastian 8407756d Workaround sRGB issue in UIElements such that previews are now rendered correctly 7 年前
Jens Holm 2ecc2e08 Add copy to clipboard for selected node 7 年前
Peter Bay Bastian 867e4ea2 Replace OnGraphChange with polling-based change tracking system 7 年前
Peter Bay Bastian 17a5050c Fix hanging edges for collapsed nodes after undo/redo 7 年前
Peter Bay Bastian 73c2bce4 Properly dispose of MaterialNodeViews 7 年前
Peter Bay Bastian 347edc88 Colored edges! (also, unify node and edge view creation) 7 年前
Peter Bay Bastian dc8375d3 Gradient edges 7 年前
Peter Bay Bastian 0b1c506d Fix direction on some gradients 7 年前
GitHub fcd97941 Merge pull request #75 from Unity-Technologies/master 7 年前
Peter Bay Bastian 3f1df674 PreviewSystem -> PreviewManager 7 年前
Peter Bay Bastian 81d2a867 Add drag and drop to graph for Texture2D and subgraphs 7 年前
Peter Bay Bastian f95f8c27 BIG namespace refactor: UnityEngine -> UnityEditor, MaterialGraph -> ShaderGraph 7 年前
Peter Bay Bastian 4391569c Use asset name for sub-graph nodes 7 年前
Matt Dean abed850e Merge master 7 年前
Peter Bay Bastian 4be8c24e Update preview toggle button to mostly match design 7 年前
Matt Dean 52b69b3c Merge branch 'master' into node-validation 7 年前
Tim Cooper 3039671f Merge master 7 年前
Tim Cooper 5a5f791f Working on improving texture node: 7 年前
GitHub 713f6000 Merge pull request #79 from Unity-Technologies/improve-texture-node 7 年前
Matt Dean 41b314d2 Merge branch 'master' into node-validation 7 年前
Tim Cooper 8e5b0d9b First pass inlining property nodes. 7 年前
Tim Cooper 92a955c3 Add converter from v1,v2,v3,v4,col nodes -> properties. 7 年前
Natalie Burke 11e072f9 Merge branch 'node-validation' of https://github.com/Unity-Technologies/ShaderGraph into node-validation 7 年前
Tim Cooper e9731703 Move convert to property / inline node to right click menu. 7 年前
Patrick Fournier de93c238 Merge trunk 7 年前
Peter Bay Bastian e408be90 Handle remove events from GraphView 7 年前
mathieum-unity 536b1737 Preview styling and toggling update 7 年前
Patrick Fournier 20c7f686 Update changes following merge with master. 7 年前
Peter Bay Bastian d50eb6bb Outside node controls for texture slots + various fixes 7 年前
GitHub 849d3ecb Merge branch 'master' into graph-view-copy-paste 7 年前
GitHub e10be928 Merge pull request #81 from patrickfournier/graph-view-copy-paste 7 年前
Matt Dean 02c6b58d Merge master 7 年前
Peter Bay Bastian ac179c90 Outside node controls for vector types 7 年前
Peter Bay Bastian 7b9315c4 Outside node control for UV slots 7 年前
Peter Bay Bastian 4f983742 Update type in dynamic slot names when they change 7 年前
Peter Bay Bastian 972596ff Remove unneeded event handling (handled elsewhere now) 7 年前
Peter Bay Bastian 4d07b648 Edges for outside node controls 7 年前
Peter Bay Bastian cc654bc4 Fix picking mode on outside-node-input container, so that invisible stuff doesn't block click events 7 年前
Tim Cooper 9e5cc1af rename anchor > port 7 年前
Tim Cooper 67c85cbe Fix preview dirty'ing 7 年前
Tim Cooper ec2df61b Fix preview position in 2D previews 7 年前
Tim Cooper f9ccf9f9 Update slot names on topological change 7 年前
Tim Cooper fba42d48 Use GUID instead of object reference so that we can properly restore object link after assembly reload. 7 年前
Tim Cooper bfe3f5fc Fix null ref on exit 7 年前
Peter Bay Bastian 69616da6 Color slots (a vec4 slot with a different input control) 7 年前
Peter Bay Bastian 95cfcc60 Move actual preview rendering into PreviewManager 7 年前
mathieum-unity 045d568e Merge remote-tracking branch 'origin/master' into graphview-styling-updates 7 年前
Matt Dean b14c1f98 Merge branch 'master' into node-artistic-adjustment 7 年前
Peter Bay Bastian 406da125 Add INodeModificationListener which allows control views to be notified of node change 7 年前
Matt Dean 6c7ced70 Merge branch 'master' into node-artistic-mask 7 年前
mathieum-unity bd9683ea Merge branch 'master' of github.com:Unity-Technologies/ShaderGraph into graphview-styling-updates 7 年前
Peter Bay Bastian 2fa06117 Implemented uber shader 7 年前
Peter Bay Bastian af2552b3 Enable pixel cache for nodes again 7 年前
mathieum-unity dd6f9d47 Merge remote-tracking branch 'origin/master' into graphview-styling-updates 7 年前
Peter Bay Bastian 61fab094 Update to work with trunk 7 年前
Peter Bay Bastian f615cb37 Work with new GraphView slot coloring 7 年前
Peter Bay Bastian 066bcccb Remove unneeded GV capability code 7 年前
mathieum-unity d7f591a9 Merge remote-tracking branch 'origin/master' into graphview-styling-updates 7 年前
Peter Bay Bastian abe8b7b6 Remove pixel cache disables in a few places 7 年前
mathieum-unity 4e0aa7d7 Fixed default expanded state 7 年前
Peter Bay Bastian 016d19e2 Enable pixel cache on PortInputView 7 年前
Matt Dean 8e410579 Merge branch 'master' into node-artistic-adjustment 7 年前
Peter Bay Bastian 14bcb1d7 Full-resolution preview in blackboard 7 年前
GitHub 8d403174 Merge pull request #83 from mathieum-unity/graphview-styling-updates 7 年前
Peter Bay Bastian 7fd5c8ef Merge branch 'master' of github.com:Unity-Technologies/ShaderGraph 7 年前
Peter Bay Bastian e1281f8c Fixes for new node style 7 年前
Peter Bay Bastian cd4618e1 Add field dragger to vector inputs 7 年前
Tim Cooper da15e457 dirty first pass pass architecture. 7 年前
Matt Dean dadccc50 Merge branch 'master' into node-channel 7 年前
Tim Cooper 6f035d8a hack and slash. 7 年前
Peter Bay Bastian fe10dc56 Fix bug causing preview to be now shown after creating a node 7 年前
Tim Cooper f559320c 'working' previews. 7 年前
Matt Dean f14af0f4 Added Cubemap nodes 7 年前
Tim Cooper 1d641fec For final shader generation use the master node. 7 年前
GitHub 81859b60 Merge pull request #92 from Unity-Technologies/pass-architecture 7 年前
Matt Dean 1b3ac398 Merge branch 'master' into node-artistic-adjustment 7 年前
GitHub 5d9b28af Merge pull request #90 from Unity-Technologies/node-input-texture 7 年前
Tim Cooper 4eb8bc6a Misc usability fixes for shadergraph: 7 年前
Tim Cooper 54ac74c0 Merge branch 'master' into node-input-scene 7 年前
Tim Cooper 16640c42 Run code format tool 7 年前
Tim Cooper 2731487c Merge branch 'master' into node-input-scene 7 年前
Tim Cooper e26f02bc remove non needed logs 7 年前
Peter Bay Bastian e91932f8 Node selector / search 7 年前
Peter Bay Bastian 2c5ae2d4 Move "Copy shader" into context menu 7 年前
Peter Bay Bastian b4404ee6 Remove preview rate limitation button 7 年前
Peter Bay Bastian 90868fe3 Move "convert to subgraph" to context menu 7 年前
Peter Bay Bastian 02e4d882 Move "update asset" button to blackboard 7 年前
Peter Bay Bastian 4a06bed4 Remove last bit of toolbar 7 年前
Peter Bay Bastian c421de0a Update use of EdgeControl to non-obsolete properties 7 年前
Tim Cooper d2e30d64 Update right click menu. 7 年前
Matt Dean 00f3fcff Merge branch 'master' into node-validate-current 7 年前
Matt Dean ca5e100b Merge branch 'master' into node-input-scene 7 年前
Peter Bay Bastian 508ec3ef Workarounds for float formatting (e.g. 0.6 becoming a mess of decimal points) and label draggers (dragging not working on anything but first label on slot control) 7 年前
Peter Bay Bastian ab14181b Make PortInputView use pre-multiplied alpha background color and put its edge behind itself and node (still need to make it render behind other nodes) 7 年前
Peter Bay Bastian 0b1d9efe Minor style changes to fix spacing between node controls 7 年前
Peter Bay Bastian 72c4bdea Move contextual actions from node search menu into actual context menu 7 年前
Jens Holm 67d2fd02 Merge master 7 年前
Matt Dean fd5fa964 Merge Master 7 年前
Peter Bay Bastian 09db5bd9 - Remove NodeCreator 7 年前
Peter Bay Bastian 8c82d94e - Dropping edge on graph (specifically not on a slot) now pops up the add node menu and auto-connects to the first compatible slot (only shows nodes where a slot is compatible) 7 年前
Peter Bay Bastian eed09312 When creating nodes by dropping edge, reposition the node after creating it such that the edge stays at the same position 7 年前
Peter Bay Bastian 178bcf2b Save correct position to node drawState 7 年前
Peter Bay Bastian 53517148 Even better node repositioning 7 年前
Matt Dean 00d8b6e8 Rename ColorMaterialSlot > ColorRGBAMaterialSlot and add ColorRGB slot 7 年前
GitHub ef9bd86c Merge pull request #124 from Unity-Technologies/color-rgb 7 年前
Tim Cooper a197968f Merge remote-tracking branch 'origin/master' into HDMaster 7 年前
Peter Bay Bastian 02c12a94 Fix order of things when adding slots (fixes #111) 7 年前
Tim Cooper e3bd536c Merge branch 'master' into HDMaster 7 年前
GitHub 5546123e Merge branch 'master' into node-bugfixes 7 年前
Peter Bay Bastian 890a9ece More correct order of things in MaterialNodeView initialization 7 年前
Tim Cooper 1f9b882d Fix up linar / gamma state of color nodes when they get inlined. 7 年前
GitHub d1d69177 Merge pull request #131 from Unity-Technologies/LinearColorFix 7 年前
Jens Holm 22adea01 Make graph inspector window not pinned to the right side of the editor window 7 年前
Jens Holm 82f3473f Add resize handle to inspector window 7 年前
Jens Holm 0ff2964b Improve resize handling of inspector window 7 年前
Jens Holm f0203715 Ensure inspector winow to stay in editor window rect after window resize 7 年前
GitHub 2d290890 Merge pull request #134 from Unity-Technologies/inspector-window 7 年前
Peter Bay Bastian 2a66a4bf Remove selection stuff from inspector and move properties to the top 7 年前
Jens Holm ec88c9f3 Reigister postlayout callback on graphview rather than inspector view 7 年前
GitHub eb5b5a85 Shader source mapping for node functions (#137) 7 年前
Jens Holm e1ebec49 Merge master 7 年前
Tim Cooper 5c979fc8 Merge master 7 年前
Peter Bay Bastian 758cf9e6 Inspector window changes (#138) 7 年前
GitHub 09d669c8 Various refactorings and improvements (#139) 7 年前
Peter Bay Bastian e1f95448 Various bug fixes 7 年前
Jens Holm 5c86f77c Merge master 7 年前
Tim Cooper 8aab03fe Merge remote-tracking branch 'origin/master' into HDMaster 7 年前
Jens Holm 9b1d3da9 Make maste node preview a separate window 7 年前
Jens Holm 5f6443a4 Add draggable manipulator for floating windows 7 年前
Martin Thorzen b73f8bc1 Created the functionality of creating Nodes directly when hitting spacebar. Simplified to not have to right click and click create node. 7 年前
GitHub b3954895 Merge pull request #155 from Unity-Technologies/CreateNodeOnSpace 7 年前
Matt Dean 7c4730ca PR Fixes 7 年前
Matt Dean 7f9b3b2c Remove eyedropper from Color fields 7 年前
Matt Dean 97e5473e Merge branch 'master' into node-bugfixes 7 年前
GitHub c763baf4 Merge pull request #163 from Unity-Technologies/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 年前
Peter Bay Bastian d41f2281 Fix hanging edges (fixes #142, fixes #152, fixes #158) 7 年前
GitHub 29adf637 Merge pull request #172 from Unity-Technologies/fix-hanging-edges 7 年前
Tim Cooper 64df08f0 [fix]Fix preview blending when you have alpha 7 年前
Jens Holm d7635005 Remove unused function in GraphEditrorView 7 年前
Martin Thorzen c1697dc5 [FIX] fixes #166 Changed the Quad to use the build in resource from Unity 7 年前
Peter Bay Bastian bfd7b48d Import blackboard to project, still WIP 7 年前
GitHub e9689ade Merge pull request #178 from Unity-Technologies/fix-preview-after-playmode 7 年前
Peter Bay Bastian 1749ff66 A bunch of stuff for blackboard 7 年前
Tim Cooper e9757253 Feedback from PR 7 年前
Jens Holm 530a769c Serialize layout of floating windows in GraphEditorView 7 年前
Jens Holm fa558b34 Add changes according to PR feedback 7 年前
GitHub 8e8beb43 Merge pull request #174 from Unity-Technologies/tim-bug-fixes 7 年前
Matt Dean 725a1ea9 Merge branch 'master' into sliders 7 年前
GitHub b72d0466 Merge pull request #150 from Unity-Technologies/compare-and-branch 7 年前
Peter Bay Bastian d00ca780 Merge branch 'master' into blackboard 7 年前
Matt Dean 739c124a Merge branch 'master' into sliders 7 年前
Jens Holm 46fe1f23 Change window layout serialization to happen when resize or dragging of master preview finished changing 7 年前
Jens Holm ed016425 Chnage name of master preview VisualElement to reflect prevuious name update 7 年前
GitHub dfcf6af9 Merge pull request #175 from Unity-Technologies/inspector-window 7 年前
Peter Bay Bastian d60a0f8d Merge with master 7 年前
Jens Holm e3d84f9b Add option in resize handels to make it staty in the bounds of the parent element 7 年前
Peter Bay Bastian 4cfaf738 Add serialization for blackboard layout 7 年前
Matt Dean 8984577a Merge branch 'master' into node-input 7 年前
Peter Bay Bastian abe82146 Added support for drag and dropping properties to the graph 7 年前
Peter Bay Bastian 03e99ce6 Remove debug messages 7 年前
Jens Holm fb49e741 Merge remote-tracking branch 'origin/master' into inspector-window 7 年前
GitHub 927b9dac Merge pull request #180 from Unity-Technologies/blackboard 7 年前
Martin Thorzen f2b52952 [FIX] fixes #96 Needed to put the input and output of the edge to Null. 7 年前
Jens Holm 66a70b8f Merge branch 'master' into inspector-window and resolve conflicts 7 年前
GitHub 653eb828 Merge pull request #185 from Unity-Technologies/inspector-window 7 年前
GitHub a3c9f868 Merge pull request #186 from Unity-Technologies/fix-nodes-are-still-filled-after-edge-deletion 7 年前
GitHub e9df888c Merge pull request #189 from Unity-Technologies/blackboard 7 年前
Jens Holm 358c118c Change floating window serialization to track offset to closest corner rather than just position 7 年前
Jens Holm 12be2cf3 Update master preview rendertexture size when layout has finished changeing 7 年前
GitHub 4df636c0 Merge pull request #188 from Unity-Technologies/window-layout-docking 7 年前
Jens Holm af26c91a Add flag in resize handle to maintain aspect ratio 7 年前
Jens Holm ae1852e9 Merge remote-tracking branch 'origin/master' into master-preview-rendertexture-rescale 7 年前
Martin Thorzen 058f5c05 [FIX] Fixed an issue where openening up an empty shadergraph without any nodes caused an error. 7 年前
Matt Dean 9c0b93c1 Merge branch 'master' into node-bugfixes 7 年前
Jens Holm de57de9e Add function in master preview to update rendertexture size after next layout change 7 年前
GitHub f59e7806 Merge pull request #195 from Unity-Technologies/fix-ondisposed-empty-shadergraph 7 年前
GitHub a4f6c1fd Merge pull request #194 from Unity-Technologies/master-preview-rendertexture-rescale 7 年前
Peter Bay Bastian 49fe52c4 Fix bug causing selection outlines to disappear when zoomed out 7 年前
Jens Holm 546a460b Make preview node change in width as well as height (fixes #121) 7 年前
GitHub df78da56 Merge pull request #203 from Unity-Technologies/bugfix-preview-node 7 年前
Peter Bay Bastian cab9a4b5 Put preview in a separate pixel cache for performance 7 年前
Martin Thorzen 29361772 Merge branch 'master' into tidy-master-preview 7 年前
Martin Thorzen 3778ba92 Hide and Unhide Previews for Material Graph 7 年前
Peter Bay Bastian 16db0624 * Hunt down code causing pixel cache dirtying every frame 7 年前
Martin Thorzen 95fba761 Added undo actions 7 年前
Matt Dean c0c00ec0 Merge branch 'master' into node-matrix 7 年前
Peter Bay Bastian 56f2361c Merge branch 'master' into peter-fixes 7 年前
Matt Dean 41740d78 First pass dynamic Multiply node 7 年前
GitHub beb99728 Merge pull request #207 from Unity-Technologies/peter-fixes 7 年前
Martin Thorzen 24300f52 Adding documentation functionality on the nodes. 7 年前
Matt Dean 22c13f89 Cleanup and fixes (part 1) 7 年前
Martin Thorzen 54af42c8 Adding documentation functionality on the nodes. 7 年前
GitHub af192f3f Merge pull request #208 from Unity-Technologies/hide-unhide-all-previews 7 年前
GitHub 545de289 Merge pull request #209 from Unity-Technologies/goto-documentation-per-node 7 年前
Keijiro Takahashi 02a50c76 Small fixes to "Open Documentation" menu item. 7 年前
GitHub f44e12ea Merge pull request #212 from keijiro/fix-docmenuitem 7 年前
Jens Holm 7ba4ae46 Make ResizeSideHandle be aware of nearest corner 7 年前
Keijiro Takahashi 28918b9a Clear node selection when deleting nodes. 7 年前
GitHub 0a42bbd9 Merge pull request #214 from keijiro/fix-delete-node 7 年前
Matt Dean e20fd08b Fix matrix defaults 7 年前
Martin Thorzen 4334f8e2 Split up MaterialGraph.USS file into multiple USS files for better organization. 7 年前
Keijiro Takahashi de7e2997 Addition of ScreenPositionSlotControlView 7 年前
Martin Thorzen 77b49204 Added a Settings menu for Nodes. Implementation of IHasSettings. Nodes can derive from this interface and implement their own VisualElement as their settings menu. 7 年前
Matt Dean 3df359f2 Merge branch 'master' into node-matrix 7 年前
GitHub d2945014 Merge pull request #219 from keijiro/screenspace-slot 7 年前
Martin Thorzen 324ad522 Updated the settings visual element for nodes 7 年前
Matt Dean 7c973636 Merge branch 'master' into node-bugfixes 7 年前
Martin Thorzen e1d9b584 Added a Settings Menu for Nodes. 7 年前
Tim Cooper 8dc99cbc *Fefactor subshader / master node generation to be more uniform 7 年前
Martin Thorzen bf9b4a4c Updated the Settings UI. 7 年前
Martin Thorzen 6456ff21 Updated Unlit settings master node to also have the new stylish settings view 7 年前
GitHub e986db46 Merge pull request #223 from Unity-Technologies/tim-fixes 7 年前
Peter Bay Bastian c9173f20 Replace `onNodeModified` with methods for registering and deregistering to avoid direct access to the delegate. 7 年前
GitHub a1c15f0d Merge pull request #229 from Unity-Technologies/safer-callbacks 7 年前
Martin Thorzen 7b5ca064 Merge with master 7 年前
Martin Thorzen 6ad87d77 Split up ScreenPositionSlotControl into its own .USS file 7 年前
GitHub caaf7a64 Merge pull request #236 from Unity-Technologies/splitting-up-uss-files 7 年前
Martin Thorzen 5f331eda [FIX] Disabled the resizing of preview node. 7 年前
Peter Bay Bastian a4d1c27d Merge branch 'master' into node-bugfixes 7 年前
GitHub f39faa6c Merge pull request #237 from Unity-Technologies/disable-resizing-in-preview-node 7 年前
Martin Thorzen 50036920 Added functionality to double click on a subgraph node to open it up in a new shader graph window 7 年前
GitHub 9641212d Merge pull request #224 from Unity-Technologies/node-matrix 7 年前
Martin Thorzen 5833e245 Added Right click context menu to open sub graph 7 年前
GitHub f187d743 Merge pull request #230 from Unity-Technologies/master-preview-rendertexture-rescale 7 年前
Martin Thorzen 5dd3e527 Updated so it is only left mouse click that can open using the double click 7 年前
Peter Bay Bastian e7218ad7 Remove unused variables and classes and rework how master preview resizing is handled 7 年前
Peter Bay Bastian 57a0eab1 Remove unused imports in entire solution 7 年前
GitHub cdc03be9 Merge pull request #244 from Unity-Technologies/fix-all-warnings 7 年前
GitHub 75dadc74 Merge pull request #239 from Unity-Technologies/double-click-to-open-subgraph 7 年前
Jens Holm 532c8de0 Add control view for bound input types 7 年前
Martin Thorzen f5ae4e88 Merge with master 7 年前
Martin Thorzen 0a72fe97 When saving a sub graph, we now go through all the shader graphs and updated them if they are using this sub graph. 7 年前
Martin Thorzen 584d2bb4 [FIX] #251 Nodes are now selected again after pasted 7 年前
Martin Thorzen 0c19b486 Added the 9_slice image to the settings view. Also added so that the icon looks clicked when clicked. 7 年前
Peter Bay Bastian 5d8933e2 Reflect rename in future Unity versions of class PostLayoutEvent to GeometryChangedEvent (with fallback import for 2018.1) 7 年前
Jens Holm 5d32dbf0 Delete BoundInputVectorcontrolView which was a dumplicate of LabelSlotControlView 7 年前
GitHub c880667e Merge pull request #260 from Unity-Technologies/geometrychangedevent 7 年前
GitHub 96c8a0c7 Merge pull request #257 from Unity-Technologies/copy-paste-fix 7 年前
Peter Bay Bastian 0b584564 Merge with master 7 年前
Peter Bay Bastian 010106aa Make cancelling "delete property" cancel the entire operation 7 年前
GitHub 3de3ae25 Merge pull request #262 from Unity-Technologies/rebuild-all-dependant-shaders-from-subgraph 7 年前
Peter Bay Bastian a029858d Merge branch 'master' into fix-postlayoutevent 7 年前
GitHub e818e796 Merge pull request #258 from Unity-Technologies/fix-postlayoutevent 7 年前
Martin Thorzen 166af912 [FIX] #271 Making sure that the new inports are modifiable after saving the subgraph 7 年前
Peter Bay Bastian fecfaaea Fix compile errors on trunk by introducing various compatibility extensions 7 年前
Martin Thorzen a323085a Updated with the feedback from PR 7 年前
GitHub 5d5824ef Merge pull request #281 from Unity-Technologies/fix-subshader-property-update 7 年前
Peter Bay Bastian 0e49b142 * Fix Serializable(Cubemap|Mesh|Texture) classes 7 年前
GitHub dba26376 Merge pull request #283 from Unity-Technologies/fix-trunk-compatibility 7 年前
Martin Thorzen 731a2018 Merge branch 'master' into node-settings 7 年前
Martin Thorzen 9720e0dc Added input fields to the vector nodes 7 年前
Martin Thorzen d36a05a1 Fix issues after merge with master 7 年前
Martin Thorzen cfd61180 New node settings. Moved the createsettingselement to the master node 7 年前
GitHub eae8c0fc Merge pull request #293 from Unity-Technologies/vector-input-fields 7 年前
Jens Holm cfaa488d Make serialized window layout serialize abosulte position properties 7 年前
Martin Thorzen 8742fc7b Merge branch 'master' into node-settings 7 年前
Matt Dean 589cb99a Add changes from previous branch 7 年前
Martin Thorzen a53fbcc2 Updated with new property sheet and row functionality plus added the .css files for them 7 年前
Jens Holm b1e38c12 Add collapse button on master preview 7 年前
Martin Thorzen 2ff4fbd7 Added new settings files for the common settings on the master nodes, PBR and Unlit Master 7 年前
Matt Dean 348a9654 Change GetPreviewProperty to return list for multiple properties from one slot 7 年前
Jens Holm ab80ca3c Make master preview resize rendertexture continuously 7 年前
Matt Dean 15328c1d Add support for Fixed gradient mode 7 年前
Jens Holm daa8f8ad Make window draggable able to clamp to the parent window 7 年前
Martin Thorzen ed104fa3 Added titleButtonContainer for buttons. 7 年前
Jens Holm 8e243e0b Make floating windows serialize layout realtive to correct content area 7 年前
Martin Thorzen 3868cb59 Fixed so that the preview is not drawn ontop of the Settings Menu 7 年前
Jens Holm 19a741e4 Switch blackboard layout modifiers to default modifiers 7 年前
Martin Thorzen 962fc981 Removed the dependency on SRP so this is now self contained within Shadergraph. 7 年前
Jens Holm 7061787f Add docking layout to blackbourd via GeometryChangedEvent on GraphView 7 年前
GitHub 246492ed Merge pull request #299 from Unity-Technologies/layout-modifiers-improvements 7 年前
Martin Thorzen e34a3053 Fixed the PR feedback I got. 7 年前
Peter Bay Bastian a2b1f9e5 Fix warnings 7 年前
Matt Dean f20e7691 Update Gradient UIs to UIElements 7 年前
Peter Bay Bastian 9cc55c03 Merge branch 'master' into path-for-shaders 7 年前
Jens Holm a7cb2893 Allow GraphView to copy when only elements of type BlackboardField are selected 7 年前
Matt Dean 67827c5c Remove unnecessary serialized properties 7 年前
Jens Holm 74039530 Allow sahder properties to be copied and pasted between graphs 7 年前
Jens Holm 74c313c2 Add copy function in IShaderProperty, and implement this in all property classes 7 年前
Jens Holm 8201871e Add meta properties in the CopyPasteGraph 7 年前
Jens Holm 02587bed Add conditional includes in MaterialGraphWindow and MaterialGraphView 7 年前
Peter Bay Bastian 6ec339e3 Forwardport pull request #336 7 年前
GitHub f6380703 Merge pull request #310 from Unity-Technologies/gradient-nodes 7 年前
Martin Thorzen 3c602bad Added base functionality to give an error on incompatible render pipeline 7 年前
Peter Bay Bastian 83dbd5d0 Add change callback to controls when edge changes 7 年前
Martin Thorzen 34997ed9 Cleaned up the code 7 年前
GitHub a49aec2e Merge pull request #343 from Unity-Technologies/control-edge-callback 7 年前
Peter Bay Bastian 8076c27e Merge branch 'master' into copy-property-nodes 7 年前
GitHub a3897b8c Merge pull request #317 from Unity-Technologies/copy-property-nodes 7 年前
Jens Holm 60639f41 Merge branch 'master' into editable-property-reference-names 7 年前
GitHub c833d39e Merge pull request #325 from Unity-Technologies/node-settings 7 年前
Peter Bay Bastian 8fcaa92a Merge branch 'master' into warning-incompatible-pipeline 7 年前
GitHub 8a2e5a5e Merge pull request #347 from Unity-Technologies/warning-incompatible-pipeline 7 年前
jensgholm15@gmail.com ed51c9ec Make nodes spawn in the center of the view when copied from another graph 7 年前
GitHub 36539f3e Merge pull request #359 from Unity-Technologies/node-placement-copy 7 年前
Martin Thorzen aa3df588 Removed old interface that wasn't used anymore, IDropTarget 7 年前
Martin Thorzen 02c75c93 Fixed the drag and drop functionality (for 18.2+) for Blackboard 7 年前
GitHub e615b99e Merge pull request #373 from Unity-Technologies/fix-drag-and-drop 7 年前
Peter Bay Bastian e7f9893d Rebuild previous branch (see comments) 7 年前
Peter Bay Bastian fe56266d Ensure the blackboard remains in view after deserialization 7 年前
GitHub 2b11377f Merge pull request #1352 from Unity-Technologies/sg/blackboard-deserialization-safeguard 7 年前
Peter Bay Bastian 10d61e23 Started the functionality for opening shader code in user set, text editor 7 年前
Peter Bay Bastian 529163c8 Fixed drag and drop for texture2d, cubemap, subgraph and updated the blackboardfield drag and drop 7 年前
Peter Bay Bastian 3eef43d8 Added name to abstract material graph. This one is the name from the materialgraph on disk. Added a write file and open file in graph utils. Changed the converttoshader functionality to return a string so it could be re-used in implementation for writing a file. 7 年前
Peter Bay Bastian 8c691503 Removed the old Drag and Drop methods 7 年前
Stephane Laroche b3ee7f83 Merge branch 'master' into stacklit 7 年前
Matt Dean 42b09806 Add first pass Texture2DArray and Texture3D support 7 年前
Martin Thorzen 7688ce53 Updated with the PR feedback 7 年前
GitHub ae1dff05 Merge pull request #1358 from Unity-Technologies/sg/vertex-modification 7 年前
Alex Lian 3be7d580 Merge remote-tracking branch 'origin/master' into build/automation 7 年前
Stephane Laroche 9498fe0b Merge branch 'master' into stacklit 7 年前
Matt Dean 36a0484f Merge remote-tracking branch 'origin/master' into sg/texture-types 7 年前
GitHub df14a156 Merge pull request #1353 from Unity-Technologies/sg/fix-drag-n-drop 7 年前
Peter Bay Bastian 927000b8 Merge branch 'master' into sg/texture-types 7 年前
sebastienlagarde c0461407 Merge branch 'master' into Add-support-of-per-light-shadow-mask-control 7 年前
Peter Bay Bastian 55a261e5 Fix drag and drop support 7 年前
GitHub 7f5da648 Merge branch 'master' into sg/show-generated-code 7 年前
GitHub f8e5ff57 Merge pull request #1377 from Unity-Technologies/sg/texture-types 7 年前
GitHub 57c37d06 Merge pull request #1355 from Unity-Technologies/sg/show-generated-code 7 年前
Tim Cooper 2c4a517b Merge remote-tracking branch 'origin/master' into build/automation 7 年前
Tim Cooper 99d825bc first pass fixing paths 7 年前
Tim Cooper fafb59af Run code formatter. 7 年前
Frédéric Vauchelles 4d7f78f1 Merge branch 'master' into feature/SSR 7 年前
Peter Bay Bastian 804a560f Fix Shader Graph toolbar not showing up 7 年前
Peter Bay Bastian f9b16024 Remove 2018.1 compatibility code from Shader Graph 7 年前
GitHub 29b369e0 Merge pull request #1399 from Unity-Technologies/sg/remove-2018.1-ifdefs 7 年前
Martin Thorzen 11cbbe0d Removed the ObjectControl and added ( sub) to the name of the sub graph node 7 年前
Martin Thorzen 05d6a1be Removed old unneccessary code that prevented the spacebar to create node functionality to work as intended. 7 年前
GitHub b3577726 Merge pull request #1424 from Unity-Technologies/sg/fix-create-node-using-spacebar 7 年前
GitHub 2274ce9d Merge branch 'master' into sg/fix-for-subgraphs-inside-main-graph 7 年前
GitHub 8f9bff6a Merge pull request #1423 from Unity-Technologies/sg/fix-for-subgraphs-inside-main-graph 7 年前
Peter Bay Bastian 8cec3344 Fix a compile warning in GraphEditorView 7 年前
GitHub 1ee9283d Merge pull request #1442 from Unity-Technologies/sg/fix-compile-warning 7 年前
Martin Thorzen 848b6b57 fix for case #987330 now the preview is behind the outline. 7 年前
GitHub 51a1873e Merge branch 'master' into update-changelog 7 年前
GitHub 3a4763ba Merge pull request #1467 from Unity-Technologies/sg/fix-for-preview-being-infront-of-outliner 7 年前
Peter Bay Bastian b4dd9062 Merge remote-tracking branch 'origin/master' into sg/facesign 7 年前
sebastienlagarde 4a622009 Merge branch 'master' into refactor-shader-variant-per-material 7 年前
Oliver Schnabel 3a15d806 Merge remote-tracking branch 'remotes/origin/master' into StackLit2 7 年前
Remy 7bf53f3c Merge branch 'master' into HDRP-Tests 7 年前
Stephane Laroche 7933fd8d Merge branch 'master' into StackLit2 7 年前
Paul Melamed 797daf79 Merge branch 'master' into decals/ss3_channel_mask 7 年前
sebastienlagarde 6c870111 Merge branch 'master' into FalseColorMode 7 年前
Martin Thorzen 37c00666 Added update title to master preview and blackboard. 7 年前
Martin Thorzen 93058019 Re-added this functionality since I will remove it in another PR 7 年前
Thomas 01ee049b Merge branch 'master' into gfx-tests-postfx 7 年前
Martin Thorzen b283a847 Fixed a small issue where the path was the name. We only want the last name of the shader and not the path to it. 7 年前
Martin Thorzen 9cccf3fb Updated with feedback 7 年前
Chris Tchou 6408007a Merge branch 'master' into hdrpcleanup 7 年前
Peter Bay Bastian 31db4b9f Fix core changes to UIElements Toggle with compatibility layer 7 年前
GitHub ba8fbc25 Merge pull request #1522 from Unity-Technologies/sg/fix-toggle-changes 7 年前
Antoine Lelievre 516b896c Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline 7 年前
Peter Bay Bastian 549996da Allow sub-shaders to tell whether they are compatible with a given render pipeline, and hook it up with the UI support for that such that an error is shown in the event that it's _not_ compatible. 7 年前
Stephane Laroche a49a696e Merge branch 'master' into StackLit2 7 年前
Remy 9db2a137 Merge branch 'master' into HDRP-Tests 7 年前
GitHub 3a6a4e59 Merge branch 'master' into sg/spheremasknode 7 年前
Nerites 4b5c5d5c Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings 7 年前
GitHub 630691ab Merge pull request #1512 from Unity-Technologies/sg/update-window-title-when-after-file-rename 7 年前
GitHub 0610a60c Merge branch 'master' into sg/error-for-incompatible-pipeline 7 年前
GitHub 86a4970b Merge pull request #1535 from Unity-Technologies/sg/error-for-incompatible-pipeline 7 年前
Sebastien Lagarde 34ae5a69 Merge branch 'master' into ios-texture-format 7 年前
Sebastien Lagarde 5196e7ed Merge branch 'master' into EmissiveMeshForAreaLight 7 年前
Antoine Lelievre a452a9db Merge branch 'master' into LightUnits 7 年前
GitHub 1045d10d Merge branch 'master' into sg/fix-duplicate-subgraphs 7 年前
Paul Melamed 141afc6f Merge branch 'master' into decals/v2/per_channel_mask 7 年前
Remy 540d190a Merge branch 'master' into HDRP-Tests 7 年前
Matt Dean 1b3f1ca2 Merge branch 'master' into sg/fix-hd-meta-code-cuplication 7 年前
Matt Dean 1c4c0d09 Merge branch 'master' into sg/fix-dielectric-specular-control 7 年前
Stephane Laroche cbb9a885 Merge branch 'master' into StackLit2 7 年前
Tim Cooper 8406655d Merge branch 'master' into ShaderGraphTests 7 年前
Nerites 9b69a952 Merge xrconfig branch into xrsettings 7 年前
Tim Cooper 9bf79289 Backport pull request #1529 6 年前
Nerites 86a99323 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings 6 年前
Peter Bay Bastian c4fb2e1e Fix TextureSlotControl not accepting Render Textures (#1569) 6 年前
sebastienlagarde 05f36802 Merge branch 'master' into HDRP/staging 6 年前
Remy 1bce3600 Merge branch 'master' into tests/hdrp/distortion 6 年前
Aleksandr Kirillov 4695f235 Merge branch 'master' into lw/terrain_optimization 6 年前
GitHub 7281fe31 Merge branch 'HDRP/staging' into decals/v2/per_channel_mask_new_ui 6 年前
Stephane Laroche 73aab246 Merge branch 'hdrp/staging' into StackLit2_TrunkTest 6 年前
Nerites 4c6e512a Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings 6 年前
Nerites 7a18f28e Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings" 6 年前
Nerites 5182ab18 Revert "Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings"" 6 年前
Yao Xiaoling 4d7a5d51 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain 6 年前
GitHub 01fdbb38 Merge branch 'master' into fix/coupling-hdlight-workflow 6 年前