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
696062ae
#35 namespace UnityEditor.Graphing.Drawing -> UnityEditor.MaterialGraph.Drawing
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
7e160ce8
Run `hg format` on repository
7 年前
Jens Holm
cc2d2e3f
Add resize handle withh draggable functionality to MaterialNodeView
7 年前
damian
83548475
Merging master.
7 年前
damian
3db84206
Fixed some bugs after master merge.
7 年前
Peter Bay Bastian
d4bf2988
Update to work with latest Editor
7 年前
Peter Bay Bastian
9dbfb5c3
Move slot compatibility check code into MaterialSlot
Validate commands directly in window class, rather than through MaterialGraphPresenter
Move a few things from MaterialGraphPresenter to GraphEditorView
Create manipulator for node creation (NodeCreator), rather than manually doing it in MaterialGraph
Move things from MaterialGraph constructor into GraphEditorView
Completely remove GridBackground, as we were not using it
Remove Clicker manipulator, as it was not used
7 年前
GitHub
21a946ef
Merge pull request #73 from Unity-Technologies/master
Merge master
7 年前
Peter Bay Bastian
81d2a867
Add drag and drop to graph for Texture2D and subgraphs
7 年前
Peter Bay Bastian
e4b6371d
Add undo step for drag and dropping sub-graphs
7 年前
Peter Bay Bastian
f95f8c27
BIG namespace refactor: UnityEngine -> UnityEditor, MaterialGraph -> ShaderGraph
No longer need assembly name in serialized data
7 年前
Matt Dean
abed850e
Merge master
And fix conflicts
7 年前
Tim Cooper
3039671f
Merge master
7 年前
Tim Cooper
e9731703
Move convert to property / inline node to right click menu.
7 年前
Patrick Fournier
de93c238
Merge trunk
7 年前
Matt Dean
02c6b58d
Merge master
7 年前
Peter Bay Bastian
c2d9f15c
Fix undo bug caused by property node -> concrete node conversion happening during undo
7 年前
mathieum-unity
045d568e
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
Matt Dean
f14af0f4
Added Cubemap nodes
7 年前
GitHub
5d9b28af
Merge pull request #90 from Unity-Technologies/node-input-texture
Node input texture
7 年前
Tim Cooper
4eb8bc6a
Misc usability fixes for shadergraph:
-cubmap / texture -> convert to / from properties
-Removing properties not creates inline nodes
-Nicer names for newly created properties
-Drag texture to graph now creates 2d sampler node
-Drat normal map to graph sets up 'normal map' state
-Create shader graph now creats a default PBR node
-
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
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Math/Vector/TransformNode.cs
7 年前
Peter Bay Bastian
e91932f8
Node selector / search
7 年前
Matt Dean
ca5e100b
Merge branch 'master' into node-input-scene
7 年前
Jens Holm
67d2fd02
Merge master
7 年前
Jens Holm
cbc52afe
Add rotation to inspector mesh preview
7 年前
Jens Holm
8acafef9
Add scroll mouse manipulator
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
Inspector preview mesh
7 年前
Peter Bay Bastian
09db5bd9
- Remove NodeCreator
- Derive Port so that we can use our own IEdgeConnectorListener
- Handle element removal event from GraphView
7 年前
Tim Cooper
a197968f
Merge remote-tracking branch 'origin/master' into HDMaster
7 年前
GitHub
5546123e
Merge branch 'master' into node-bugfixes
7 年前
Matt Dean
0fca7431
Rename Texture2D and Cubemap nodes
7 年前
GitHub
e8ae5340
Merge pull request #129 from Unity-Technologies/node-bugfixes
Rename Texture2D and Cubemap nodes
7 年前
Jens Holm
a4e8458d
Remove zooming in inspector preview
7 年前
GitHub
1f3752d8
Merge pull request #133 from Unity-Technologies/inspector-preview-mesh
Inspector preview mesh
7 年前
Jens Holm
8bd7923f
Add check for capture when draggable manipulator releases
7 年前
GitHub
2d290890
Merge pull request #134 from Unity-Technologies/inspector-window
Inspector window
7 年前
Jens Holm
e72aef5a
Add resize handle class and reuse some resize handle uss styling in inspector window
7 年前
Tim Cooper
5c979fc8
Merge master
7 年前
Peter Bay Bastian
758cf9e6
Inspector window changes ( #138 )
* Add resize handle class and reuse some resize handle uss styling in inspector window
* Reigister postlayout callback on graphview rather than inspector view
* Remove resize function from GraphInspectorView
* Add resize handles to corner of inspector window
7 年前
Jens Holm
ff694d9c
Add resize handles to corner of inspector window
7 年前
Peter Bay Bastian
a5f98a7d
Remove log messages when resizing inspector
7 年前
Jens Holm
5c86f77c
Merge master
7 年前
Tim Cooper
8aab03fe
Merge remote-tracking branch 'origin/master' into HDMaster
7 年前
Jens Holm
11b8912f
Make resize side handle determine own uss classes
7 年前
Jens Holm
55869a0b
Make class for adding resize handles along the border of a visual element
7 年前
Jens Holm
682af7b6
Fix uss class for resize top-let hadle in resize handle
7 年前
Jens Holm
5f6443a4
Add draggable manipulator for floating windows
7 年前
Jens Holm
428479b6
Make floating windows dock to closest corner
7 年前
Jens Holm
4e8c00e0
Make reisze handels and window draggable manipulator respect minimum dimensions of target
7 年前
Jens Holm
602ef408
Add callback in resize handles that notifies when the mouse button is released
7 年前
Jens Holm
d51ff20e
Add callback in WindowDraggable to notify when the mouse button is released
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 年前
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 年前
Jens Holm
42cd9d1b
Make resize handels properly stay handle parent layout bounds ( fixes #183 )
7 年前
Peter Bay Bastian
2fc16a9a
Make blackboard only be draggable from the header to avoid conflicts with fields
7 年前
GitHub
653eb828
Merge pull request #185 from Unity-Technologies/inspector-window
Make resize handles remain within bounds of parent element
7 年前
GitHub
e9df888c
Merge pull request #189 from Unity-Technologies/blackboard
Blackboard improvements
7 年前
Jens Holm
e3f843c0
Make WindowDraggable use WindowDockingLayout internally to track closest corner
7 年前
GitHub
86e92a04
Merge pull request #191 from Unity-Technologies/fixes-for-blackboard
Fixes for blackboard
7 年前
GitHub
4df636c0
Merge pull request #188 from Unity-Technologies/window-layout-docking
Change window position serialization to track closest corner
7 年前
Jens Holm
af26c91a
Add flag in resize handle to maintain aspect ratio
7 年前
Jens Holm
b49f21d7
Tidy up resize handle
7 年前
Jens Holm
d54f7422
Fix typo in ResizeHandle
7 年前
Jens Holm
ae1852e9
Merge remote-tracking branch 'origin/master' into master-preview-rendertexture-rescale
7 年前
Matt Dean
9c0b93c1
Merge branch 'master' into node-bugfixes
7 年前
GitHub
a4f6c1fd
Merge pull request #194 from Unity-Technologies/master-preview-rendertexture-rescale
Make rendertexture on master adapt resolution on rescale
7 年前
Martin Thorzen
29361772
Merge branch 'master' into tidy-master-preview
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/MasterPreviewView.cs
7 年前
Matt Dean
c0c00ec0
Merge branch 'master' into node-matrix
7 年前
Jens Holm
f7c18c9a
Add scrollable manipulator
7 年前
GitHub
341a6fc3
Merge pull request #211 from Unity-Technologies/master-preview-zoom
Master preview zoom
7 年前
Jens Holm
9696454d
Make floating windows not rescale when parent window becomes too small to fit them
7 年前
Jens Holm
7ba4ae46
Make ResizeSideHandle be aware of nearest corner
ResizeSideHandles resize function are split into three cases, and the
resize handle is recording which corner it is closest to when the mouse
is preseed. This is to figure out which direction the window should
resize in when maintaining aspect ratio.
7 年前
Jens Holm
40d78c85
Implement aspect ratio maintaining for vertical resize handles
7 年前
jensgholm15@gmail.com
507d1fc8
Add maintained aspect ratio in corner resize side handles
7 年前
Jens Holm
f19eae8b
Split handling of resize in ResizeSideHandle into each direction
7 年前
Matt Dean
3df359f2
Merge branch 'master' into node-matrix
7 年前
Matt Dean
7c973636
Merge branch 'master' into node-bugfixes
7 年前
GitHub
f187d743
Merge pull request #230 from Unity-Technologies/master-preview-rendertexture-rescale
Master preview rendertexture rescale
7 年前
Peter Bay Bastian
6d5e2c25
Merge with master
7 年前
Peter Bay Bastian
57a0eab1
Remove unused imports in entire solution
7 年前
GitHub
cdc03be9
Merge pull request #244 from Unity-Technologies/fix-all-warnings
Fix all warnings
7 年前
Martin Thorzen
f5ae4e88
Merge with master
7 年前
Peter Bay Bastian
714075ca
Update WindowDraggable to work with the latest changes to PostLayoutEvent in Editor code
7 年前
Peter Bay Bastian
5d8933e2
Reflect rename in future Unity versions of class PostLayoutEvent to GeometryChangedEvent (with fallback import for 2018.1)
7 年前
Martin Thorzen
c5f3e96c
Removed unused parameter scaling
7 年前
GitHub
c880667e
Merge pull request #260 from Unity-Technologies/geometrychangedevent
PostLayoutEvent -> GeometryChangedEvent
7 年前
Peter Bay Bastian
0b584564
Merge with master
7 年前
Peter Bay Bastian
a029858d
Merge branch 'master' into fix-postlayoutevent
# Conflicts:
# com.unity.shadergraph/Editor/Drawing/Manipulators/WindowDraggable.cs
7 年前
GitHub
e818e796
Merge pull request #258 from Unity-Technologies/fix-postlayoutevent
Fixes for PostLayoutEvent changes
7 年前
Martin Thorzen
731a2018
Merge branch 'master' into node-settings
# Conflicts:
# com.unity.shadergraph/Editor/Data/MasterNodes/PBRMasterNode.cs
# com.unity.shadergraph/Editor/Util/UIUtilities.cs
7 年前
Jens Holm
839077f9
Refactor WindowDraggable to use posiiton left and position right properties
7 年前
Jens Holm
d411c659
Refactor resize side handels to use absolute position properties
7 年前
Jens Holm
6a079706
Add function in WinowDockingLayout to apply layout position or size
7 年前
Jens Holm
adf3203d
Fix typo in resizeBorderFrame name
7 年前
Jens Holm
f3467681
Make master preview collapse relative to mouse position and afterwards recalculate new docking position
7 年前
Jens Holm
ab80ca3c
Make master preview resize rendertexture continuously
7 年前
Jens Holm
daa8f8ad
Make window draggable able to clamp to the parent window
7 年前
Jens Holm
43f24a85
Remove checks for within parent bonds in resize handles
7 年前
Jens Holm
8e243e0b
Make floating windows serialize layout realtive to correct content area
7 年前
Jens Holm
19a741e4
Switch blackboard layout modifiers to default modifiers
7 年前
GitHub
246492ed
Merge pull request #299 from Unity-Technologies/layout-modifiers-improvements
Layout modifiers improvements
7 年前
Peter Bay Bastian
9cc55c03
Merge branch 'master' into path-for-shaders
7 年前
Martin Thorzen
3a802291
Capturemouse event and trickle down enum has changed and this is a fix for that so it is compatible with older versions.
7 年前
GitHub
d657628e
Merge pull request #361 from Unity-Technologies/fix-obsolete-methods
Fix obsolete warnings
7 年前
Peter Bay Bastian
7b43adb3
Update DoRepaint for UIElements change in trunk
7 年前
Peter Bay Bastian
8c691503
Removed the old Drag and Drop methods
7 年前
Matt Dean
42b09806
Add first pass Texture2DArray and Texture3D support
7 年前
GitHub
df14a156
Merge pull request #1353 from Unity-Technologies/sg/fix-drag-n-drop
Fix drag and 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 年前
GitHub
7f5da648
Merge branch 'master' into sg/show-generated-code
7 年前
Tim Cooper
2c4a517b
Merge remote-tracking branch 'origin/master' into build/automation
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDPBRPass.template
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDPBRPass.template.meta
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template.meta
# ScriptableRenderPipeline/HDRenderPipeline/sub-package.json
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightAssetEditor.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightAssetEditor.cs.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightPipelineAssetEditor.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightPipelineAssetEditor.cs.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightShadowPass.cs.meta
# ScriptableRenderPipeline/Ligh...
7 年前
Tim Cooper
fafb59af
Run code formatter.
7 年前
Frédéric Vauchelles
4d7f78f1
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/BuildPlayer/HDRPVariantStripper.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
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
Remove 2018.1 compatibility code from Shader Graph
7 年前
Aleksandr Kirillov
4695f235
Merge branch 'master' into lw/terrain_optimization
7 年前