410 次代码提交 (b283a847-9adc-46a4-a151-99eedd0609d9)

作者 SHA1 备注 提交日期
Tim Cooper 26c129c0 [Material Graph] Sub graph / subgraph input nodes are can be added now, need to work on slots still 9 年前
Tim Cooper 0dd596bf [Material Graph] change nodes property to GetNodes<T> where you can get nodes of a given type 9 年前
Tim Cooper 62377747 [Material graph] Working subGraph now. Copies function / properties etc. 8 年前
Tim Cooper 607a2f9e [material graph]Add button to convert selection into subGraph 8 年前
Tim Cooper 553fedbf [Format]Run code formatting 8 年前
Tim Cooper 5055d67e [Material graph]More testing + fix things that are broken with the tests. 8 年前
Tim Cooper 31fa7c60 [Material Graph]Readd export button. Fix issue with sub graph exports. 8 年前
Tim Cooper d759e955 [Material Graph]Tidy up integration testing. 8 年前
Tim Cooper c565a8d4 fix formatting 8 年前
Tim Cooper 1b049752 [Material Graph] Rename and reorganise the repository. 8 年前
Tim Cooper 39086dd7 [Mat Graph]Remove light functions and instead have multiple master nodes. 8 年前
GitHub dc7e686b Merge pull request #2 from stramit/NewUI 8 年前
Tim Cooper bc6130d7 Fix nodes so that the master node now can do a mapping from vertex input to usage by the master node. 8 年前
Tim Cooper f62762b2 [mat graph]Move material options into the master node they exist for + add GUID support for selected master node. 8 年前
Tim Cooper 9f1103ac [mat graph] Nested shader now lives inside graph asset. This is used by the material inspector :) 8 年前
Tim Cooper 7ee96660 [mat graph]Start work on remapper 8 年前
Tim Cooper e6cc7289 Merge branch 'RemapAndSubshader' 8 年前
Peter Bay Bastian 22ea3bd8 It is now possible to mark a master node as active in a shader graph (but not in others like sub graphs or remap graphs) 8 年前
Peter Bay Bastian 5960f11a Added basic inspector for graph editor and added the selected nodes to the graph asset 8 年前
Peter Bay Bastian 0d1c4d7e Extracted common parts of MaterialGraphAsset, MaterialRemapAsset and MaterialSubGraphAsset into abstract class 8 年前
Tim Cooper 1896e42f [Improvements]Change workflow to work with new montreal importer work (scriptable importer) 8 年前
Tim Cooper 3094ee75 Merge branch 'new-importer-workflow' into hackweek2017 8 年前
Florent Guinier 6edcd801 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 8 年前
Tim Cooper 2e183994 Add time checkbox 8 年前
Tim Cooper eac70c08 Graph edit window now survives serialization. 8 年前
Tim Cooper 0d9b1e6a Remove things added during hack week that should not be in the repo (next step is scan + tidy new nodes) 7 年前
Tim Cooper b44a8aea Fix some bugs in new nodes (bad conversion to HLSLSnippet node) + Add ability to hide slots at the slot level (i.e. hide implicit inputs for function node) 7 年前
Tim Cooper e3f06249 Shader name is now the name of the file. 7 年前
Tim Cooper 34cc0f15 Start work on making 'sub-graph' work again in an expected way. 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 fbc6eeac Fix node compatibility check (#58) 7 年前
Peter Bay Bastian ed185a44 Preliminary vertex shader support 7 年前
Tim Cooper f6fa3513 Starting to extract properties. 7 年前
Tim Cooper 8a87c992 More refactoring. 7 年前
Tim Cooper 354517e6 Partially working new master node architecture. 7 年前
Tim Cooper be067cc2 first real working shader in the 'new' model. 7 年前
Tim Cooper 0818f178 temp 7 年前
Tim Cooper 735c401b Working: Properties window + new master node. 7 年前
GitHub 5f6271d2 Merge pull request #67 from stramit/refactor-properties 7 年前
Tim Cooper fb21bff8 Working lightweight metallic master node. 7 年前
Tim Cooper 0b56c45b first pass. 7 年前
Tim Cooper 8d5e6fd1 texture exposition working 7 年前
Tim Cooper 52d5558a do not throw errors on default sampler slots, nodes need to handle this case. 7 年前
Tim Cooper 779d0288 [MatGraph]Use generated names for properties so that they do not conflict and are formatted properly. 7 年前
Tim Cooper 76430e32 Refactored subgraph to abstract subgraph + remap subgraph. This is groundwork to allow for real remap master nodes. 7 年前
Tim Cooper e5c78ee9 Separate usage of 'graph requirements' from 'model requirements' to not pollute the surface input structure. 7 年前
Tim Cooper 97cfbe75 Working remap node (wood wood) probably still needs a bunch of love. but something is working :) 7 年前
Tim Cooper 1229aaef Use slot defaults for master nodes. 7 年前
Tim Cooper 97674d1f Remap graph handling for textures. 7 年前
Tim Cooper 4a551695 temp 7 年前
Peter Bay Bastian 314ba653 Add change notifications for shader properties 7 年前
Tim Cooper f2cae710 Merge branch 'exposed-prop-subgraph' 7 年前
Tim Cooper 19ff14c7 remove c#4 features. 7 年前
Peter Bay Bastian a3385c0f Undo/redo prototype 7 年前
Tim Cooper 9557fcee Merge commit '76ff1855a761cc5b39944f12a7456bbed2c79efb' into exposed-prop-subgraph 7 年前
Tim Cooper 79841e4c Starting to work layer graph 7 年前
Tim Cooper 7809cfe9 refactoring material graph to allow for layered materials. 7 年前
Peter Bay Bastian c002d689 Move graph things from Runtime to Editor 7 年前
Tim Cooper 4e26b4fc First pass working layered graph :) 7 年前
Tim Cooper 215e1b6a Refactoring slot types. 7 年前
Tim Cooper 2c1b60e0 compiling 7 年前
Tim Cooper 24923996 misc fixes afer changes 7 年前
Tim Cooper 3da19296 missed files 7 年前
damian 83548475 Merging master. 7 年前
Peter Bay Bastian 1b46d517 More robust undo/redo by removing and adding nodes 7 年前
Tim Cooper a5c9b0ce Merge branch 'exposed-prop-subgraph' 7 年前
Tim Cooper 6161fea6 Fix compiler warnings :) 7 年前
GitHub 1d08cd88 Merge pull request #70 from Unity-Technologies/tidyup 7 年前
Peter Bay Bastian b75b4c04 Merge branch 'master' into no-presenters 7 年前
Tim Cooper 66cf728c Tidy up transforms so that graphs have a 'prefered' space to work in. 7 年前
Tim Cooper b2eceafe Improve 'geometry' based nodes so they can do space translations internally. 7 年前
Peter Bay Bastian 9dbfb5c3 Move slot compatibility check code into MaterialSlot 7 年前
Tim Cooper 52f89bea Merge branch 'spacetranslation' into master2 7 年前
GitHub 21a946ef Merge pull request #73 from Unity-Technologies/master 7 年前
Tim Cooper 9ff93cdb Add specific material slot types and port code generation node to use them. 7 年前
Peter Bay Bastian 867e4ea2 Replace OnGraphChange with polling-based change tracking system 7 年前
GitHub fcd97941 Merge pull request #75 from Unity-Technologies/master 7 年前
Matt Dean f3353a02 Input Part 2 7 年前
Peter Bay Bastian f95f8c27 BIG namespace refactor: UnityEngine -> UnityEditor, MaterialGraph -> ShaderGraph 7 年前
Peter Bay Bastian d284676f Fix duplicate type parenthesis on sub-graph nodes 7 年前
Matt Dean abed850e Merge master 7 年前
Tim Cooper 3039671f Merge master 7 年前
Matt Dean 516051d4 First pass Gradient Nodes 7 年前
Tim Cooper 497d1891 Fix merge issues. 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 0063c976 Fix concrete slots not being initialized. 7 年前
Tim Cooper 8e5b0d9b First pass inlining property nodes. 7 年前
Matt Dean c86f6166 Input Part 5 7 年前
Matt Dean 324ba49c Input Part 6 (Gradient) 7 年前
Natalie Burke 11e072f9 Merge branch 'node-validation' of https://github.com/Unity-Technologies/ShaderGraph into node-validation 7 年前
Patrick Fournier de93c238 Merge trunk 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 年前
Matt Dean e44629cb Fixes for PR 7 年前
Matt Dean bbb186d6 Remove Gradient nodes and asset type :( 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 c2d9f15c Fix undo bug caused by property node -> concrete node conversion happening during undo 7 年前
Tim Cooper fc3caa89 Merge commit '0a54bdcf00befab61d3a0bbec18c543478eb086d' into fixing 7 年前
Peter Bay Bastian 69616da6 Color slots (a vec4 slot with a different input control) 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 f7b7c84f Replace repeated code with loop in surface description generation 7 年前
Peter Bay Bastian 5d2c7e65 Fix typo 7 年前
Matt Dean 6c7ced70 Merge branch 'master' into node-artistic-mask 7 年前
Peter Bay Bastian b48b4340 Make `GetRequirements` work with a list of nodes, rather than doing a depth first collect itself 7 年前
Peter Bay Bastian b63c4c28 Prepare shader generation for uber shader 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 年前
mathieum-unity dd6f9d47 Merge remote-tracking branch 'origin/master' into graphview-styling-updates 7 年前
Peter Bay Bastian b5df720c Move output selection in uber shader to an earlier place, to benefit from less register usage and early exit 7 年前
mathieum-unity d7f591a9 Merge remote-tracking branch 'origin/master' into graphview-styling-updates 7 年前
Peter Bay Bastian b2ec0ce4 Don't use `GetVariableNameForSlot` for surface description struct field, such that nodes that override this to an expression (i.e. not a variable name) can have a preview 7 年前
Matt Dean 8e410579 Merge branch 'master' into node-artistic-adjustment 7 年前
Matt Dean 874bec55 Depth Texture Node 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 年前
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 年前
Matt Dean b510d6f4 Fixes for PR 7 年前
Peter Bay Bastian 7386944f DynamicVectorMaterialSlot now becomes an appropriately sized vector during shader generation (or float if vec1) 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 1eba56e9 run reformat tool 7 年前
Jens Holm d52d83b7 Add SerializableMesh 7 年前
Jens Holm e5a6f66e Serialize preview mesh in graph asset instead of through GraphInspectorView persistent data 7 年前
Peter Bay Bastian da0d10c8 Massively decreased amount of allocations in preview rendering (~440 kB -> ~23 kB per frame) 7 年前
Matt Dean 00f3fcff Merge branch 'master' into node-validate-current 7 年前
Matt Dean ca5e100b Merge branch 'master' into node-input-scene 7 年前
Matt Dean 5c0e0f70 Fixes for PR 7 年前
Matt Dean f48335e0 Renamed files 7 年前
Matt Dean 1c91fd60 Remove uneeded class 7 年前
Matt Dean 10685e95 Fixes for PR 7 年前
Matt Dean 1f9fe754 Move Scene Depth to WIP 7 年前
Jens Holm 67d2fd02 Merge master 7 年前
Matt Dean f716bede Add Vertex Input generator 7 年前
Tim Cooper 16406a1d Working on conversion to new library 7 年前
Matt Dean c827f632 Fix non-modifiable cubemap data 7 年前
Jens Holm 682d177b Add zoom/scale to preview mesh and refactor preview data into seperate class 7 年前
GitHub a5b781b9 Merge pull request #93 from Unity-Technologies/inspector-preview-mesh 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 年前
Tim Cooper ae8e0962 starting to update nodes to new library. 7 年前
Peter Bay Bastian 27c461e8 Make sure that new properties do not alias the names of other properties (#fix 102) 7 年前
Tim Cooper e3bd536c Merge branch 'master' into HDMaster 7 年前
GitHub 5546123e Merge branch 'master' into node-bugfixes 7 年前
GitHub 6a80fdeb Merge pull request #122 from Unity-Technologies/node-bugfixes 7 年前
Tim Cooper 7a9a255f More work on porting node library across to new shader library. 7 年前
Tim Cooper 7995a0e9 upgrading to new shader library. 7 年前
Peter Bay Bastian 24b03e7c Don't convert property nodes to inline nodes during undo/redo (fixes #125) 7 年前
Jens Holm 8a16933b Minor refactor of preview mesh rotation and scale according to PR comments 7 年前
Matt Dean 8697ac36 Preliminary work on Dynamic Matrix 7 年前
Tim Cooper 1f9b882d Fix up linar / gamma state of color nodes when they get inlined. 7 年前
Matt Dean 1a08b1b1 Add DynamicMatrixMaterialSlot and fix all Matrix input types 7 年前
Matt Dean 056c4c90 Update serialization upgrader 7 年前
GitHub e8ae5340 Merge pull request #129 from Unity-Technologies/node-bugfixes 7 年前
GitHub f4e6a374 Merge pull request #130 from Unity-Technologies/inspector-preview-mesh 7 年前
GitHub d1d69177 Merge pull request #131 from Unity-Technologies/LinearColorFix 7 年前
Peter Bay Bastian f9685e94 Revert use of internal method 7 年前
Jens Holm 8454398a Center rotationin of preveiw mesh and fix serialization of preview mesh 7 年前
Peter Bay Bastian 11a83d08 Squash SerializableGraph into AbstractMaterialGraph 7 年前
Jens Holm a4e8458d Remove zooming in inspector preview 7 年前
Peter Bay Bastian 5fe33b9e Squash `SerializableSlot` into `MaterialSlot` 7 年前
GitHub 1ebe97b0 Merge pull request #132 from Unity-Technologies/squash-serializablegraph 7 年前
GitHub 8e31e809 Merge branch 'master' into inspector-preview-mesh 7 年前
GitHub 1f3752d8 Merge pull request #133 from Unity-Technologies/inspector-preview-mesh 7 年前
Peter Bay Bastian 83c052cb Various clean-ups to make code a bit more neat 7 年前
Peter Bay Bastian 409a35e4 Add LegacyAttribute for declaring old class names directly on the node class 7 年前
Peter Bay Bastian d5813d06 Move legacy type remapping code outside of AbstractMaterialGraph and cache the result in a static field 7 年前
Peter Bay Bastian 5ef7f04d Move GetRequirements into ShaderGraphRequirements and give it a nicer name 7 年前
Peter Bay Bastian c2183225 Make GetChannelCount return an integer rather than a number enum thingie 7 年前
Peter Bay Bastian 1a6d34eb Output shader errors to console when uber shader has error 7 年前
GitHub eb5b5a85 Shader source mapping for node functions (#137) 7 年前
Jens Holm e1ebec49 Merge master 7 年前
Tim Cooper 5c979fc8 Merge master 7 年前
Tim Cooper 25b66c4b fixing merge 7 年前
GitHub 09d669c8 Various refactorings and improvements (#139) 7 年前
Tim Cooper ad906af4 Creating mini shader graph library / fixing gamma -> linear colours 7 年前
Jens Holm 5c86f77c Merge master 7 年前
Tim Cooper 8aab03fe Merge remote-tracking branch 'origin/master' into HDMaster 7 年前
Tim Cooper a13c3ee9 Use helper function to figure out if we have warnings or errors. 7 年前
GitHub c3ae833e Merge pull request #144 (Upgrade to use new shader library) 7 年前
Tim Cooper 259c7ce1 Changing sub graphs to use functions instead of inlining. 7 年前
Tim Cooper 8342aa12 Finish refactoring subgraphs. 7 年前
Tim Cooper 2888f1c2 -When we validate a subgraph node we also need to validate the subgraph (generates the concrete values). 7 年前
GitHub 455b4075 Merge pull request #145 from Unity-Technologies/FixingSubGraphs 7 年前
Matt Dean 8f22e3a7 Boolean node and type (part 1) 7 年前
Jens Holm 93fa2455 Merge remote-tracking branch 'origin/master' into inspector-window 7 年前
Matt Dean 2f6e839e Add Integer 7 年前
Matt Dean e24aafae Boolean node and type (part 2) 7 年前
Matt Dean 8ea43935 Add HDR Color 7 年前
Matt Dean cfb57499 Add Slider 7 年前
Matt Dean bbd475d5 Add Branch node 7 年前
Matt Dean 333ded2e Remove IntegerMaterialSlot 7 年前
Matt Dean fd575df7 Fixes for PR 7 年前
Martin Thorzen 29920efb [FIX] #159 Added a utility node method for converting float to shader value. To catch Infinity text string. 7 年前
Matt Dean 7c4730ca PR Fixes 7 年前
Martin Thorzen fc1154db [FIX] #162 Checking if the texture has changed or not and updating accordingly. 7 年前
Matt Dean e36e1fc8 Fix Sampler State property 7 年前
Matt Dean 25109a19 Extend PBR master functionality 7 年前
Matt Dean 8deedb5f Add missing Sampler State types 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 年前
GitHub 16ddad23 Merge pull request #173 from Unity-Technologies/CreateNodeOnSpace 7 年前
Martin Thorzen 878e4c49 [FIX] fixes #176 When validating the graph we check if the outputslot and the input slot are compatible. If not, then we do not create the edge. 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 年前
GitHub 1c0c24b4 Merge pull request #151 from Unity-Technologies/sliders 7 年前
Peter Bay Bastian 0534342e Added support for reordering properties in blackboard 7 年前
Matt Dean 8984577a Merge branch 'master' into node-input 7 年前
GitHub 317f1cac Merge pull request #182 from Unity-Technologies/fix-master-preview-switch-prop-node 7 年前
Matt Dean 01fb5620 Fixes for PR 7 年前
Jens Holm fb49e741 Merge remote-tracking branch 'origin/master' into inspector-window 7 年前
GitHub e9df888c Merge pull request #189 from Unity-Technologies/blackboard 7 年前
GitHub 758a90e4 Merge pull request #170 from Unity-Technologies/node-input 7 年前
Matt Dean affdcadf Add HDR color support to Blackboard 7 年前
Matt Dean 0292ae36 Color control refactor 7 年前
Tim Cooper 7ab634f3 Apply remapping to all serialzied types 7 年前
Matt Dean 78db5ef1 Refactor float based shader properties 7 年前
Matt Dean 4ad43705 Vector1 property refactor and types 7 年前
Matt Dean 9c0b93c1 Merge branch 'master' into node-bugfixes 7 年前
Matt Dean 3dae07c8 Add FormerName tag to Vector1ShaderProperty 7 年前
Matt Dean bd973f81 Rename Vector1ShaderProperty.cs 7 年前
GitHub d2f86285 Merge pull request #192 from Unity-Technologies/node-bugfixes 7 年前
Matt Dean 02d1b5dd Fix UV material slot serialization 7 年前
Peter Bay Bastian 891d3537 Possible fix for #154 - UV channel was not being serialized 7 年前
GitHub 92a10806 Merge pull request #202 from Unity-Technologies/peter-fixes 7 年前
Peter Bay Bastian c118b914 Insert missing remove method call in remove method (fixes #200) 7 年前
Martin Thorzen 29361772 Merge branch 'master' into tidy-master-preview 7 年前
Matt Dean c0c00ec0 Merge branch 'master' into node-matrix 7 年前
Matt Dean 41740d78 First pass dynamic Multiply node 7 年前
Matt Dean 3ad21797 Fix Matrix Transpose node 7 年前
Matt Dean e5591143 Add declaration overrides for matrix shader properties 7 年前
Jens Holm 625ddde1 Add zoom to master preview 7 年前
GitHub 341a6fc3 Merge pull request #211 from Unity-Technologies/master-preview-zoom 7 年前
Matt Dean e20fd08b Fix matrix defaults 7 年前
Keijiro Takahashi de7e2997 Addition of ScreenPositionSlotControlView 7 年前
Matt Dean 3df359f2 Merge branch 'master' into node-matrix 7 年前
GitHub d2945014 Merge pull request #219 from keijiro/screenspace-slot 7 年前
Matt Dean 7c973636 Merge branch 'master' into node-bugfixes 7 年前
Keijiro Takahashi a3b44dd5 Fix for issue #222 7 年前
GitHub e621117d Merge pull request #231 from keijiro/fix-222 7 年前
Martin Thorzen 7b5ca064 Merge with master 7 年前
Peter Bay Bastian a4d1c27d Merge branch 'master' into node-bugfixes 7 年前
GitHub 9641212d Merge pull request #224 from Unity-Technologies/node-matrix 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 年前
Peter Bay Bastian e7ecacd5 Rename package folder to match package name 7 年前
GitHub 286d82a6 Merge pull request #249 from Unity-Technologies/submodularize 7 年前
Jens Holm 3bff7ec6 Make bound input types have a default slot label that identifies the space of the default input 7 年前
Jens Holm bcf4854e Change normal slot in PBR Master node to display default space binding rather than a vector3 control 7 年前
Martin Thorzen f5ae4e88 Merge with master 7 年前
Martin Thorzen 584d2bb4 [FIX] #251 Nodes are now selected again after pasted 7 年前
Jens Holm 27242a3d Add slot type for bound types to be used in PBR Master node 7 年前
Jens Holm 12543f9b Add vertex color input label to bound input type 7 年前
Jens Holm 5d32dbf0 Delete BoundInputVectorcontrolView which was a dumplicate of LabelSlotControlView 7 年前
Jens Holm a83bd958 Make PBR master node be able to require normal and remove BoundVector3MaterialSlot 7 年前
Peter Bay Bastian 8de769dd Move lightweight sub-shaders and templates to SRP repository 7 年前
GitHub df788737 Merge pull request #275 from Unity-Technologies/integrate-sg-subshaders 7 年前
GitHub 998d8e22 Merge pull request #250 from Unity-Technologies/bound-type-defualt-slots 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 a029858d Merge branch 'master' into fix-postlayoutevent 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 年前
Peter Bay Bastian c27172ce Fix warnings from about unused variables that are kept there for legacy deserialization 7 年前
GitHub 03f44061 Merge pull request #285 from Unity-Technologies/fix-serializable-warnings 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 年前
GitHub eae8c0fc Merge pull request #293 from Unity-Technologies/vector-input-fields 7 年前
Martin Thorzen dbf93edc Updated teh Graph path functionality. It now saves the path and reads it back 7 年前
Martin Thorzen 8742fc7b Merge branch 'master' into node-settings 7 年前
Matt Dean 589cb99a Add changes from previous branch 7 年前
Jens Holm 392166aa Add labels in Vector4MaterialSlot constructor 7 年前
Martin Thorzen 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. 7 年前
Matt Dean ff7c4856 Fix serialisation of preview properties in Gradient Asset node 7 年前
Peter Bay Bastian ad7f7e58 Ignore the subjected property when sanitizing name 7 年前
Matt Dean 348a9654 Change GetPreviewProperty to return list for multiple properties from one slot 7 年前
Matt Dean 2a3637d0 Override GradientShaderProperty declaration for preview rendering 7 年前
Matt Dean 15328c1d Add support for Fixed gradient mode 7 年前
Matt Dean 70436083 Remove GC allocations on preview property collection 7 年前
Matt Dean 88372b5f Add ref keyword (fix) 7 年前
Matt Dean eda467e3 Remove ref keywords 7 年前
GitHub c268bca4 Merge pull request #303 from Unity-Technologies/fix-empty-strings-blackboard 7 年前
Matt Dean 90f19e2e Rename Gradient Asset Node > Gradient Node 7 年前
GitHub 312d23e1 Merge pull request #304 from Unity-Technologies/sub-graph-preview-fix 7 年前
Peter Bay Bastian 9cc55c03 Merge branch 'master' into path-for-shaders 7 年前
GitHub 23cc01bd Merge pull request #302 from Unity-Technologies/path-for-shaders 7 年前
Jens Holm 74c313c2 Add copy function in IShaderProperty, and implement this in all property classes 7 年前
Jens Holm b68215c9 Add text field on properties to allow a custom reference name 7 年前
Martin Thorzen 3d65bbd2 Fixes for decimal issues. comma and period could be wrong / different on different machines, this should now have been fixed 7 年前
Jens Holm ed5436e4 Make custom property names dirty the graph 7 年前
Jens Holm af05fcf1 Make properties into concrete nodes when copied if the propery value is not in the blackboard in the target graph 7 年前
GitHub 1536b7ef Merge pull request #316 from Unity-Technologies/fix-for-decimal-issue 7 年前
Jens Holm 42451460 Make reference names editable throught text field and add reference name sanitation 7 年前
Jens Holm 1ba516e7 Make reset reference menu appear only when reference name is overridden 7 年前
Jens Holm c5caad3e Make edges preserved when copying a property node that is converted to a concrete node 7 年前
Jens Holm 810ea255 Fix the node edges not being preserved when the property is actually copied along with the property node 7 年前
Jens Holm 2e2f5f9e Simplify regex for checking valid property reference 7 年前
Jens Holm 7f9416d0 Make use of the generic duplicate name handling funciton when editing property and reference names 7 年前
GitHub f6380703 Merge pull request #310 from Unity-Technologies/gradient-nodes 7 年前
Peter Bay Bastian 8076c27e Merge branch 'master' into copy-property-nodes 7 年前
Peter Bay Bastian abdeff3a Implement Copy() for GradientShaderProperty 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 年前
GitHub 9696a5d1 Merge pull request #326 from Unity-Technologies/editable-property-reference-names 7 年前
Peter Bay Bastian 8fcaa92a Merge branch 'master' into 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 年前
Peter Bay Bastian e7f9893d Rebuild previous branch (see comments) 7 年前
Peter Bay Bastian 4dfbc988 Fix per-stage requirements and translations part 1 7 年前
Peter Bay Bastian 6cdf82d9 Further ShaderStageCapability work 7 年前
Peter Bay Bastian 495c97b8 Search window respects shader stage 7 年前
Peter Bay Bastian b5379b4b Fixed float value to string error and truncation warning for normal create node 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 年前
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 年前
GitHub 92542c54 Merge pull request #1354 from Unity-Technologies/sg/fix-error-float-value-to-string 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 26a4b39a HD subshaders branch rebuild 7 年前
GitHub cd218826 Merge pull request #1376 from Unity-Technologies/sg/hdsubshaders 7 年前
Alex Lian 0d975dea Merge remote-tracking branch 'origin/master' into build/automation 7 年前
Matt Dean 36a0484f Merge remote-tracking branch 'origin/master' into sg/texture-types 7 年前
sebastienlagarde c0461407 Merge branch 'master' into Add-support-of-per-light-shadow-mask-control 7 年前
Peter Bay Bastian 6db9deb9 Make PreviewProperty check a bit nicer and fix a warning 7 年前
Peter Bay Bastian a958b031 Rename PropertyType.Texture to Texture2D 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 年前
Matt Dean ad13e4b0 Add Face Sign functionality to LWRP, HDRP and preview subshaders 7 年前
Chris Tchou f37d6cf2 First pass HDRP lit vertex anim 7 年前
Peter Bay Bastian 544afac6 Add extra parameter to shader generation functions for master nodes and sub-shaders to track changes to dependencies 7 年前
GitHub 58fd779d Merge pull request #1435 from Unity-Technologies/sg/import-dependencies 7 年前
Chris Tchou 7777e6e0 Merge branch 'vertexAnimHDRP' into vertexAnimHDRP2 7 年前
Peter Bay Bastian d2afb9db Separate class and struct fields in PreviewProperty union, such that they do not overlap 7 年前
GitHub 2b137c18 Merge pull request #1479 from Unity-Technologies/sg/fix-gc-bug 7 年前
GitHub 51a1873e Merge branch 'master' into update-changelog 7 年前
GitHub f4d8c338 Merge pull request #1449 from Unity-Technologies/vertexAnimHDRP2 7 年前
Peter Bay Bastian b4dd9062 Merge remote-tracking branch 'origin/master' into sg/facesign 7 年前
GitHub 900da40e Merge pull request #1430 from Unity-Technologies/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 年前
GitHub 13b0e098 Removed unnecessary space 7 年前
Chris Tchou 6408007a Merge branch 'master' into hdrpcleanup 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 年前
Matt Dean b7161c18 Fix initialization of vector properties when duplicating subgraphs 7 年前
Matt Dean 1f85b9a1 Fixes for PR 7 年前
GitHub 540a8964 Merge pull request #1579 from Unity-Technologies/sg/fix-duplicate-subgraphs 6 年前
sebastienlagarde 7934a87a Merge branch 'master' into LightUnits 6 年前
Paul Melamed 141afc6f Merge branch 'master' into decals/v2/per_channel_mask 6 年前
Remy 540d190a Merge branch 'master' into HDRP-Tests 6 年前
Matt Dean 1b3f1ca2 Merge branch 'master' into sg/fix-hd-meta-code-cuplication 6 年前
Matt Dean 1c4c0d09 Merge branch 'master' into sg/fix-dielectric-specular-control 6 年前
Stephane Laroche cbb9a885 Merge branch 'master' into StackLit2 6 年前
Tim Cooper 893f84e9 Add warnings as errors to test projects + fix issues 6 年前
Tim Cooper 8406655d Merge branch 'master' into ShaderGraphTests 6 年前
Nerites cc9ae6f7 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings 6 年前
Nerites 9b69a952 Merge xrconfig branch into xrsettings 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 年前
Matt Dean e5de9e5a Added Texel Size Node (#1527) 6 年前
Remy 2883e443 Merge branch 'master' into tests/hdrp/distortion 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 年前
GitHub 74d0a872 Merge pull request #1745 from Unity-Technologies/master 6 年前
Julien Ignace 5bfcc8cd Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking 6 年前
Yao Xiaoling 4d7a5d51 Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain 6 年前
GitHub b400b1c1 Merge branch 'master' into lw/terrain_optimization 6 年前
Sebastien Lagarde 72141169 Merge branch 'master' into lighting-arealigh-fixup 6 年前
GitHub 01fdbb38 Merge branch 'master' into fix/coupling-hdlight-workflow 6 年前
GitHub 8908da09 Pipeline specific graph functions and nodes (#1673) 6 年前
GitHub d3224f75 Fix for system locales (#1593) 6 年前
egomeh 93afc87c Merge remote-tracking branch 'origin/master' into lw/light-attenuation 6 年前
Yao Xiao Ling 5eed6e3a Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain 6 年前
Thomas 468989ad Merge branch 'master' into pyramid-rework 6 年前
GitHub aae1a458 Merge branch 'master' into lw/no_front_to_back_sorting_of_opaques_on_gpu_with_hsr 6 年前