unity-tech-cn
/
ScriptableRenderPipeline
29
0
派生 4
代码 合并请求 版本发布
6212 提交
85 分支
28 Plastic标签
目录树: 36539f3e
分支列表 标签列表
${ item.name }
创建分支 ${ searchTerm }
从 '36539f3e'
${ noResults }

219 次代码提交 (36539f3e-1340-46d3-9c8a-7e16963579b4)

作者 SHA1 备注 提交日期
Tim Cooper 2ea489dd [Material Graph] Tidy view + fix css + add time update nodes in again. 8 年前
Peter Bay Bastian 54caa127 Fixed a bug causing nodes without previews to have zero width 8 年前
Tim Cooper 3093c701 upgrading ui 8 年前
Tim Cooper f6ff69e4 [Mat Graph]More porting to new CSS 8 年前
Tim Cooper f4c0b482 [mat graph]More CSS 8 年前
Peter Bay Bastian 14f32a76 Fix visual selection issue (no border + title disappearing) and extract header into its own drawer 8 年前
Peter Bay Bastian f1abf833 Implemented node collapsing 8 年前
Tim Cooper 313777e5 [Mat Graph] Master Node Inversion refactor 8 年前
Tim Cooper 1c332af5 [mat graph]Fix issue with edges not behaving well 8 年前
Tim Cooper 4dd59714 [mat graph]Fix style sheet issues 8 年前
Tim Cooper 3a45f192 [mat graph]Fix up previews a bit more. 8 年前
GitHub 1172640f Merge pull request #1 from stramit/MasterNode 8 年前
Peter Bay Bastian 190ab48a Improved node collapsing performance a lot 8 年前
Tim Cooper 9ea47ed4 working on shader compiler issues 8 年前
Peter Bay Bastian 38b41ed7 Re-imported MaterialGraph USS 8 年前
Peter Bay Bastian 6f6d8b45 Fixed data watching for HeaderDrawer 8 年前
Peter Bay Bastian e7cb8660 Added collapsing of not-connected slots 8 年前
Tim Cooper 53ae5d47 Merge branch 'fixingshadercompiler' into HEAD 8 年前
julienf-unity 07fa7d87 Fix compilation with runtime merge 8 年前
julienf-unity bb982188 Remove imported.asset files 8 年前
Peter Bay Bastian c90ddfc2 USS clean-up for nodes 8 年前
Peter Bay Bastian 780c7cc1 Updated styling to look like Hugo's mockup + fixes 8 年前
Peter Bay Bastian af604cb5 Set background to constant color 8 年前
Peter Bay Bastian 3457c49b Updated to work after merge with trunk 8 年前
Tim Cooper 0e769105 Merge branch 'hackweek2017' into tidying 8 年前
Peter Bay Bastian 8fd68583 Preview is now actually hidden when inactive or hidden 7 年前
Peter Bay Bastian f2510f42 #35 Move a bunch of files from SerializableGraph folder to MaterialGraph folder (and delete a few unused ones) 7 年前
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 a92b64bb #31 UIElements-based graph inspector 7 年前
Peter Bay Bastian 064bacae Add back surface master node editor in inspector 7 年前
Peter Bay Bastian ed185a44 Preliminary vertex shader support 7 年前
Peter Bay Bastian 25ed3aaf Graph inspector now only shows editor for at most 1 node 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 年前
Tim Cooper 779d0288 [MatGraph]Use generated names for properties so that they do not conflict and are formatted properly. 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 3b205c79 UIElements-based shader properties in inspector 7 年前
Tim Cooper 9557fcee Merge commit '76ff1855a761cc5b39944f12a7456bbed2c79efb' into exposed-prop-subgraph 7 年前
Jens Holm cc2d2e3f Add resize handle withh draggable functionality to MaterialNodeView 7 年前
damian 83548475 Merging master. 7 年前
Peter Bay Bastian 99701f90 UIElements-based controls for color and vector controls 7 年前
Peter Bay Bastian b75b4c04 Merge branch 'master' into no-presenters 7 年前
Peter Bay Bastian 9dbfb5c3 Move slot compatibility check code into MaterialSlot 7 年前
GitHub 21a946ef Merge pull request #73 from Unity-Technologies/master 7 年前
Peter Bay Bastian 347edc88 Colored edges! (also, unify node and edge view creation) 7 年前
Peter Bay Bastian dc8375d3 Gradient edges 7 年前
GitHub fcd97941 Merge pull request #75 from Unity-Technologies/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 年前
Patrick Fournier de93c238 Merge trunk 7 年前
mathieum-unity 536b1737 Preview styling and toggling update 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 年前
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 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 年前
Peter Bay Bastian a00f148d Remove usage of EditorGUILayout.MiniThumbnailObjectField, so that we don't have to make it public 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 92d36ad3 Fix for collapse preview button 7 年前
mathieum-unity 1fda7c7b preview Collapse button only visible when hovering 7 年前
Matt Dean 8e410579 Merge branch 'master' into node-artistic-adjustment 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 年前
Matt Dean dadccc50 Merge branch 'master' into node-channel 7 年前
Matt Dean 1b3ac398 Merge branch 'master' into node-artistic-adjustment 7 年前
Tim Cooper 54ac74c0 Merge branch 'master' into node-input-scene 7 年前
Peter Bay Bastian 02e4d882 Move "update asset" button to blackboard 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 c467fab5 Make color space conversion node controls a bit neater 7 年前
Peter Bay Bastian 2a77bb5f Transparent background for controls 7 年前
Peter Bay Bastian 211cf575 Refactor ColorspaceConversionControl to work on enums in general and implement it for TransformNode 7 年前
Matt Dean 5a69c812 Merge branch 'master' into node-bugfixes 7 年前
Jens Holm 67d2fd02 Merge master 7 年前
Matt Dean fd5fa964 Merge Master 7 年前
Peter Bay Bastian 09db5bd9 - Remove NodeCreator 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 年前
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 年前
GitHub 5546123e Merge branch 'master' into node-bugfixes 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 0b6e4066 Add resize icon to inspector preview and replace preview node resize handle with temporary icon 7 年前
Jens Holm fc09a1d5 Change font-size in inspector window back to 11 7 年前
Jens Holm 4978e50e Put resize handles as invisible bars on edges of inspector window 7 年前
Jens Holm 9e48247a Enlarge preview handle-bar size on 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 年前
Jens Holm e72aef5a Add resize handle class and reuse some resize handle uss styling in inspector window 7 年前
Peter Bay Bastian 2a66a4bf Remove selection stuff from inspector and move properties to the top 7 年前
Jens Holm e1ebec49 Merge master 7 年前
Tim Cooper 5c979fc8 Merge master 7 年前
Peter Bay Bastian 758cf9e6 Inspector window changes (#138) 7 年前
Jens Holm ff694d9c Add resize handles to corner of inspector window 7 年前
Tim Cooper 8aab03fe Merge remote-tracking branch 'origin/master' into HDMaster 7 年前
Jens Holm 55869a0b Make class for adding resize handles along the border of a visual element 7 年前
Jens Holm 9b1d3da9 Make maste node preview a separate window 7 年前
Matt Dean 641ea895 Fix IntegerControlView styling 7 年前
Matt Dean 28df6957 Upgrade Slider UI to UIElements 7 年前
Matt Dean fb18c249 Refactor Channel Mixer UI 7 年前
Matt Dean 7c4730ca PR Fixes 7 年前
Matt Dean 7e22f269 Update ToggleControl to UIElements 7 年前
Martin Thorzen ee72228e [FIX] Matching the color request from the UI team 7 年前
Matt Dean f76d536a Add CubemapControlView to USS 7 年前
Matt Dean 7f9b3b2c Remove eyedropper from Color fields 7 年前
Matt Dean 458bb9ee Update RGBA slot width 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 bfd7b48d Import blackboard to project, still WIP 7 年前
Jens Holm 4e8c00e0 Make reisze handels and window draggable manipulator respect minimum dimensions of target 7 年前
GitHub 16ddad23 Merge pull request #173 from Unity-Technologies/CreateNodeOnSpace 7 年前
Jens Holm fa558b34 Add changes according to PR feedback 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 dfcf6af9 Merge pull request #175 from Unity-Technologies/inspector-window 7 年前
Peter Bay Bastian d60a0f8d Merge with master 7 年前
GitHub 1c0c24b4 Merge pull request #151 from Unity-Technologies/sliders 7 年前
Matt Dean 8984577a Merge branch 'master' into node-input 7 年前
Matt Dean 93aa1de8 Refactor Dielectric Specular node for UI changes 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 年前
Jens Holm 66a70b8f Merge branch 'master' into inspector-window and resolve conflicts 7 年前
GitHub 758a90e4 Merge pull request #170 from Unity-Technologies/node-input 7 年前
Matt Dean 0292ae36 Color control refactor 7 年前
GitHub d2f86285 Merge pull request #192 from Unity-Technologies/node-bugfixes 7 年前
Martin Thorzen 6e895b76 Tidied up the Master Preview View 7 年前
Peter Bay Bastian cab9a4b5 Put preview in a separate pixel cache for performance 7 年前
Peter Bay Bastian 16db0624 * Hunt down code causing pixel cache dirtying every frame 7 年前
Martin Thorzen 2da1b93e Updated with PR feedback 7 年前
GitHub 2b211e7e Merge pull request #205 from Unity-Technologies/tidy-master-preview 7 年前
Matt Dean c0c00ec0 Merge branch 'master' into node-matrix 7 年前
Peter Bay Bastian 56f2361c Merge branch 'master' into peter-fixes 7 年前
GitHub beb99728 Merge pull request #207 from Unity-Technologies/peter-fixes 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 年前
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 年前
Matt Dean 295b3e44 Add type colours for Boolean and Cubemap 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 年前
Peter Bay Bastian a4d1c27d Merge branch 'master' into node-bugfixes 7 年前
GitHub 91b5a7ad Merge pull request #233 from Unity-Technologies/node-bugfixes 7 年前
Peter Bay Bastian e7218ad7 Remove unused variables and classes and rework how master preview resizing is handled 7 年前
GitHub cdc03be9 Merge pull request #244 from Unity-Technologies/fix-all-warnings 7 年前
Jens Holm 532c8de0 Add control view for bound input types 7 年前
Jens Holm 3bff7ec6 Make bound input types have a default slot label that identifies the space of the default input 7 年前
Martin Thorzen f5ae4e88 Merge with master 7 年前
Martin Thorzen 0c19b486 Added the 9_slice image to the settings view. Also added so that the icon looks clicked when clicked. 7 年前
Martin Thorzen 3828d22c removed the label from nodesettings. 7 年前
Jens Holm 5d32dbf0 Delete BoundInputVectorcontrolView which was a dumplicate of LabelSlotControlView 7 年前
Martin Thorzen be031712 Added the new 9slice image that was provided. 7 年前
Peter Bay Bastian 0e95358f Update meta files 7 年前
Martin Thorzen 731a2018 Merge branch 'master' into node-settings 7 年前
Jens Holm 3531f878 Make master preview have a default position similar to the blackboard 7 年前
Martin Thorzen 57b10b82 [FIX] # 288 Updated the ChannelEnum and ChannelEnumMask controls to use their own uss files. This solves the 5pixels extra width on the nodes using them. 7 年前
GitHub 0d17d3ed Merge pull request #291 from Unity-Technologies/uss-for-channel-enum-mask-control 7 年前
Martin Thorzen c4047df5 Fixed the enum control size, so it is now aligning properly in the UI 7 年前
Jens Holm 11eb245d Add acess to master previews texture view and add default size for preveiw in uss 7 年前
GitHub c08093e7 Merge pull request #298 from Unity-Technologies/fix-for-enum-control-size 7 年前
Martin Thorzen 8742fc7b Merge branch 'master' into node-settings 7 年前
Jens Holm adf3203d Fix typo in resizeBorderFrame name 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 2fde6ea5 Moved the node settings menu to the right place. 7 年前
Martin Thorzen ed104fa3 Added titleButtonContainer for buttons. 7 年前
Martin Thorzen b817a5cd Removed unneccessary styling 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 年前
GitHub 246492ed Merge pull request #299 from Unity-Technologies/layout-modifiers-improvements 7 年前
Martin Thorzen e34a3053 Fixed the PR feedback I got. 7 年前
Matt Dean f20e7691 Update Gradient UIs to UIElements 7 年前
Peter Bay Bastian 9cc55c03 Merge branch 'master' into path-for-shaders 7 年前
Matt Dean ee59804c Update ChannelEnumControl to UIElements and USS 7 年前
Jens Holm 2f658454 Make the modified property names bold through uss 7 年前
GitHub 24edf725 Merge pull request #314 from Unity-Technologies/channel-enum-control 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 年前
Martin Thorzen 82aecff4 Needed to add .uss file to make things display correctly 7 年前
Martin Thorzen 11b55c02 Removed the lines from the other .uss file 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 753d4c0f Merge pull request #349 from Unity-Technologies/blackboard-uss-fixes 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 年前
Matt Dean 42b09806 Add first pass Texture2DArray and Texture3D support 7 年前
GitHub f8e5ff57 Merge pull request #1377 from Unity-Technologies/sg/texture-types 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 年前
Martin Thorzen d9a306ac There were some issues on our nodes that needed to be fixed. 7 年前
GitHub 5809781d Merge pull request #1440 from Unity-Technologies/sg/fix-for-ui-issues-on-nodes 7 年前
GitHub 51a1873e Merge branch 'master' into update-changelog 7 年前
Peter Bay Bastian b4dd9062 Merge remote-tracking branch 'origin/master' into sg/facesign 7 年前
Paul Melamed 797daf79 Merge branch 'master' into decals/ss3_channel_mask 7 年前
Aleksandr Kirillov 4695f235 Merge branch 'master' into lw/terrain_optimization 7 年前