144 次代码提交 (4294530e-6f2b-4f99-877e-cd5a302366c8)

作者 SHA1 备注 提交日期
Tim Cooper 1896e42f [Improvements]Change workflow to work with new montreal importer work (scriptable importer) 7 年前
Tim Cooper 8f917469 Fix saving the shader so that it can be used on objects in the scene. 7 年前
Tim Cooper c8eb7c61 Reenable sub graphs 7 年前
bfogerty af4518e0 Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 7 年前
Jennifer Nordwall 475f5e3b Merge branch 'hackweek2017' of https://github.com/stramit/MaterialGraph into hackweek2017 7 年前
Tim Cooper 5e3b99fe working on better workflow (double click shader to open in edit window) 7 年前
Tim Cooper 06b7010b Remove "AnyNode" 7 年前
Tim Cooper 761baa4b Reuse editor window for a graph if the window is already open. 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 8568c86c #28 Set window title to asset name when window is created 7 年前
Peter Bay Bastian 7e160ce8 Run `hg format` on repository 7 年前
Peter Bay Bastian c0b10e8f Update to work with latest graphics/shadergraph 7 年前
Peter Bay Bastian 14564f1e Removed (now) unneeded OnInspectorGUI for shader graph assets 7 年前
Peter Bay Bastian 9fb6ad45 Temporary fix to open sub graphs in correct window class 7 年前
Tim Cooper 8a87c992 More refactoring. 7 年前
Tim Cooper 354517e6 Partially working new master node architecture. 7 年前
Tim Cooper 0818f178 temp 7 年前
GitHub 5f6271d2 Merge pull request #67 from stramit/refactor-properties 7 年前
Tim Cooper 8d5e6fd1 texture exposition working 7 年前
Tim Cooper 76430e32 Refactored subgraph to abstract subgraph + remap subgraph. This is groundwork to allow for real remap master nodes. 7 年前
Tim Cooper 97cfbe75 Working remap node (wood wood) probably still needs a bunch of love. but something is working :) 7 年前
Tim Cooper 4a551695 temp 7 年前
Tim Cooper f2cae710 Merge branch 'exposed-prop-subgraph' 7 年前
Tim Cooper 79841e4c Starting to work layer graph 7 年前
Tim Cooper 98c7f93e Open up the correct graph when double clicked on. 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 年前
Peter Bay Bastian 80fe7520 Remove generic parameter from MaterialGraphEditWindow 7 年前
GitHub 21a946ef Merge pull request #73 from Unity-Technologies/master 7 年前
Peter Bay Bastian f95f8c27 BIG namespace refactor: UnityEngine -> UnityEditor, MaterialGraph -> ShaderGraph 7 年前
Matt Dean abed850e Merge master 7 年前
Tim Cooper 3039671f Merge master 7 年前
Tim Cooper 0063c976 Fix concrete slots not being initialized. 7 年前
Patrick Fournier de93c238 Merge trunk 7 年前
Matt Dean 02c6b58d Merge master 7 年前
Tim Cooper e94975d2 redoing importers 7 年前
Tim Cooper a1cb65d5 Working scripted importer version. 7 年前
Tim Cooper c04a43b4 add [OnOpenAsset] again :) 7 年前
Tim Cooper fba42d48 Use GUID instead of object reference so that we can properly restore object link after assembly reload. 7 年前
mathieum-unity 045d568e Merge remote-tracking branch 'origin/master' into graphview-styling-updates 7 年前
Peter Bay Bastian 3fdee329 ShaderGraph window now loads properly between Editor sessions #49 7 年前
Peter Bay Bastian 09c61d96 Fix bug causing ShaderGraph files to open in IDE rather than ShaderGraph editor (the issue was the plug-in that is bundled with Rider) 7 年前
Tim Cooper ec95c348 Add template path export. 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 年前
Tim Cooper 2f0a0145 Remove layer graph + remap graph for beta1 7 年前
Matt Dean ca5e100b Merge branch 'master' into node-input-scene 7 年前
Jens Holm 67d2fd02 Merge master 7 年前
Tim Cooper 9d765833 Update Shader graph importer to properly register shaders. 7 年前
Tim Cooper e3bd536c Merge branch 'master' into HDMaster 7 年前
Peter Bay Bastian cab03796 Update Shader graph importer to properly register shaders 7 年前
Martin Thorzen 450a5759 [FIX] #88 Added a forcedRedrawPreviews flag that will redraw the graph and update the nodes to reflect changes properly when an external source has been re-imported. 7 年前
Tim Cooper 7d55fdcb Bump pacage to 0.1.12 7 年前
Martin Thorzen f243e1cf [FIX] #157 Removed the check for Master node which casued the Exception. 7 年前
GitHub 2927625a Merge pull request #169 from Unity-Technologies/SRP-0.1.25 7 年前
Tim Cooper 216c2b0a Fix shader template issue + bump release. 7 年前
Matt Dean 97e5473e Merge branch 'master' into node-bugfixes 7 年前
Matt Dean f43e0a6f Merge branch 'master' into node-input 7 年前
Matt Dean 352a061a Merge branch 'master' into compare-and-branch 7 年前
Tim Cooper 8fa9d68a bump versions 7 年前
Jens Holm 55b86ced Merge branch 'master' into inspector-window 7 年前
GitHub 16ddad23 Merge pull request #173 from Unity-Technologies/CreateNodeOnSpace 7 年前
Matt Dean 725a1ea9 Merge branch 'master' into sliders 7 年前
Peter Bay Bastian d00ca780 Merge branch 'master' into blackboard 7 年前
Matt Dean 8984577a Merge branch 'master' into node-input 7 年前
Jens Holm fb49e741 Merge remote-tracking branch 'origin/master' into inspector-window 7 年前
Tim Cooper 7ab634f3 Apply remapping to all serialzied types 7 年前
Matt Dean 9c0b93c1 Merge branch 'master' into node-bugfixes 7 年前
Peter Bay Bastian a65c3ca4 Bump package version 7 年前
Martin Thorzen 29361772 Merge branch 'master' into tidy-master-preview 7 年前
Matt Dean c0c00ec0 Merge branch 'master' into node-matrix 7 年前
Matt Dean 7c973636 Merge branch 'master' into node-bugfixes 6 年前
Peter Bay Bastian 00a8f677 Fixes #242 by initalizing the color space field properly 6 年前
GitHub 3a64dab9 Merge pull request #245 from Unity-Technologies/fix-242 6 年前
Peter Bay Bastian 5399d0b1 Update LW master nodes to work with latest SRP repo 6 年前
Martin Thorzen f5ae4e88 Merge with master 6 年前
Martin Thorzen dbf93edc Updated teh Graph path functionality. It now saves the path and reads it back 6 年前
GitHub 23cc01bd Merge pull request #302 from Unity-Technologies/path-for-shaders 6 年前
Peter Bay Bastian 11c1b9be Fix all Shader Graph tests (including integration graphs) 6 年前
GitHub 6b96c163 Merge pull request #324 from Unity-Technologies/fix-tests 6 年前
Peter Bay Bastian 8076c27e Merge branch 'master' into copy-property-nodes 6 年前
Jens Holm 60639f41 Merge branch 'master' into editable-property-reference-names 6 年前
Peter Bay Bastian 07a3cce6 Move line that initalized the configured textures into the catch block, so that it doesn't do it all the time 6 年前
Peter Bay Bastian 81bf9819 Update SG importer version 6 年前
GitHub fe4b3c81 Merge pull request #1416 from Unity-Technologies/sg/fix-default-textures 6 年前
Peter Bay Bastian e49ccdcc Inline GetShaderText 6 年前
Peter Bay Bastian fce56481 Add dependency interface and importer implementation 6 年前
Peter Bay Bastian 544afac6 Add extra parameter to shader generation functions for master nodes and sub-shaders to track changes to dependencies 6 年前
Peter Bay Bastian 9af82d19 Update Shader Graph Importer version 6 年前
Peter Bay Bastian 4056ba3f Update Sub Graph Importer version 6 年前
GitHub 58fd779d Merge pull request #1435 from Unity-Technologies/sg/import-dependencies 6 年前
GitHub 51a1873e Merge branch 'master' into update-changelog 6 年前
Peter Bay Bastian b4dd9062 Merge remote-tracking branch 'origin/master' into sg/facesign 6 年前
Peter Bay Bastian 4e81af0c Uninline GetShaderText as it broke a test 6 年前
GitHub 2cbde00c Merge pull request #1484 from Unity-Technologies/sg/uninline-getshadertext 6 年前
sebastienlagarde 4a622009 Merge branch 'master' into refactor-shader-variant-per-material 6 年前
Oliver Schnabel 3a15d806 Merge remote-tracking branch 'remotes/origin/master' into StackLit2 6 年前
Remy 7bf53f3c Merge branch 'master' into HDRP-Tests 6 年前
Stephane Laroche 7933fd8d Merge branch 'master' into StackLit2 6 年前
Paul Melamed 797daf79 Merge branch 'master' into decals/ss3_channel_mask 6 年前
sebastienlagarde 6c870111 Merge branch 'master' into FalseColorMode 6 年前
Martin Thorzen 37c00666 Added update title to master preview and blackboard. 6 年前
Thomas 01ee049b Merge branch 'master' into gfx-tests-postfx 6 年前
Martin Thorzen 67f8b052 Removing this, since it has been added into another PR 6 年前
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. 6 年前
Chris Tchou 6408007a Merge branch 'master' into hdrpcleanup 6 年前
GitHub 3a6a4e59 Merge branch 'master' into sg/spheremasknode 6 年前
Nerites 4b5c5d5c Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings 6 年前
GitHub 630691ab Merge pull request #1512 from Unity-Technologies/sg/update-window-title-when-after-file-rename 6 年前
GitHub 0610a60c Merge branch 'master' into sg/error-for-incompatible-pipeline 6 年前
Sebastien Lagarde 34ae5a69 Merge branch 'master' into ios-texture-format 6 年前
Sebastien Lagarde 5196e7ed Merge branch 'master' into EmissiveMeshForAreaLight 6 年前
Antoine Lelievre a452a9db Merge branch 'master' into LightUnits 6 年前
GitHub 1045d10d Merge branch 'master' into sg/fix-duplicate-subgraphs 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 年前
Peter Bay Bastian 358cdac8 Fix texture and boolean property types in subgraphs 6 年前
Stephane Laroche cbb9a885 Merge branch 'master' into StackLit2 6 年前
GitHub 7d8789d6 Merge pull request #1458 from Unity-Technologies/sg/fix-subgraph-properties 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 年前
GitHub 953cdf48 Fix normalizations in Shader Graph with LWRP (#1571) 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 年前