Peter Bay Bastian
a92b64bb
#31 UIElements-based graph inspector
7 年前
Peter Bay Bastian
c0b10e8f
Update to work with latest graphics/shadergraph
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
f6a7d3b4
Remove ScriptableObjectFactory and make fallback type optional in TypeMapper
7 年前
Peter Bay Bastian
c884fe33
Make TypeMapper data-driven rather than generic and remove old inspector things from GraphInspectorPresenter
7 年前
Peter Bay Bastian
064bacae
Add back surface master node editor in inspector
7 年前
Peter Bay Bastian
34d1b3f1
Make preview re-generate when changing master node options
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 年前
Peter Bay Bastian
4f6745e0
Add utility function for calculating hash codes
7 年前
Tim Cooper
f6fa3513
Starting to extract properties.
7 年前
Peter Bay Bastian
64c9a49b
Purge usage of presenters and datawatch from graph inspector
7 年前
Tim Cooper
8a87c992
More refactoring.
7 年前
Peter Bay Bastian
960a174b
Move stuff out from Views and Presenters in Drawing/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 年前
Peter Bay Bastian
a93f2736
Add change notifications for graph, used for managing previews better
7 年前
Tim Cooper
95cdeda0
Merge remote-tracking branch 'origin/master' into refactor-properties
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/AbstractMaterialGraphEditWindow.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/Presenters/GraphInspectorPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/Presenters/SurfaceMasterNodeEditorPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/Views/GraphInspectorView.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/GraphEditorPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/NodePreviewPresenter.cs
7 年前
Tim Cooper
699f1e8d
temp commit
7 年前
Tim Cooper
9e0273b3
Fixing with help from peter
7 年前
Tim Cooper
0818f178
temp
7 年前
GitHub
5f6271d2
Merge pull request #67 from stramit/refactor-properties
Refactor properties
7 年前
Peter Bay Bastian
609307fe
MaterialGraphPresenter now relies on change notifications rather than diffing
7 年前
Tim Cooper
779d0288
[MatGraph]Use generated names for properties so that they do not conflict and are formatted properly.
7 年前
Peter Bay Bastian
3b205c79
UIElements-based shader properties in inspector
7 年前
Tim Cooper
f2cae710
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
7 年前
Tim Cooper
19ff14c7
remove c#4 features.
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 年前
Tim Cooper
4e26b4fc
First pass working layered graph :)
7 年前
Tim Cooper
2c1b60e0
compiling
7 年前
Peter Bay Bastian
e3cb9212
Undo handling for adding/removing shader properties
7 年前
Tim Cooper
a5c9b0ce
Merge branch 'exposed-prop-subgraph'
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Input/Matrix/Matrix2Node.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/Nodes/Input/Matrix/Matrix3Node.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/SubGraph/AbstractSubGraphIONode.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Data/SubGraph/AbstractSubGraphIONode.cs.meta
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/AbstractMaterialGraphEditWindow.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialGraphPresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/Nodes/SubgraphIONodePresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Runtime/SubGraph/SubGraphOutputNode.cs
7 年前
Peter Bay Bastian
145b4d5f
Get rid of presenter for graph inspector
7 年前
Tim Cooper
209da78a
Merge remote-tracking branch 'origin/master' into tidyup
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Inspector/GraphInspectorView.cs
7 年前
GitHub
1d08cd88
Merge pull request #70 from Unity-Technologies/tidyup
Tidyup
7 年前
Peter Bay Bastian
b75b4c04
Merge branch 'master' into no-presenters
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Presenters/MaterialNodePresenter.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/GraphEditorView.cs
# MaterialGraphProject/Assets/fresnelstuff.ShaderSubGraph.meta
7 年前
Peter Bay Bastian
3d3acb64
Fix bug causing inspector preview to stop working after undo/redo
7 年前
Peter Bay Bastian
ab269bcc
Fix issues that should have caused compile errors
7 年前
GitHub
21a946ef
Merge pull request #73 from Unity-Technologies/master
Merge master
7 年前
Peter Bay Bastian
8407756d
Workaround sRGB issue in UIElements such that previews are now rendered correctly
7 年前
Peter Bay Bastian
867e4ea2
Replace OnGraphChange with polling-based change tracking system
7 年前
Jens Holm
0f07c1c0
Add mesh selection for master node preveiw
7 年前
GitHub
fcd97941
Merge pull request #75 from Unity-Technologies/master
Update from master
7 年前
Peter Bay Bastian
3f1df674
PreviewSystem -> PreviewManager
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 年前
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:
*Default texture inputs
*Works via subgraph :)
7 年前
GitHub
713f6000
Merge pull request #79 from Unity-Technologies/improve-texture-node
Improve texture node
7 年前
Matt Dean
41b314d2
Merge branch 'master' into node-validation
7 年前
Tim Cooper
8e5b0d9b
First pass inlining property nodes.
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 年前
Jens Holm
35d08f0d
Add OnVlaueChanged callback to preview mesh picker for master node
7 年前
Jens Holm
d2b246fa
Allow mesh in preview to be null / none selected as default sphere mesh
7 年前
GitHub
849d3ecb
Merge branch 'master' into graph-view-copy-paste
7 年前
Matt Dean
02c6b58d
Merge master
7 年前
Peter Bay Bastian
59ca63f8
Remove defaults value section in inspector
7 年前
Tim Cooper
a1cb65d5
Working scripted importer version.
7 年前
Peter Bay Bastian
a00f148d
Remove usage of EditorGUILayout.MiniThumbnailObjectField, so that we don't have to make it public
7 年前
Jens Holm
c3f4ae78
Store master node preview mesh in GraphInspectorView persistent data
7 年前
mathieum-unity
045d568e
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
Peter Bay Bastian
4f1955f3
Fix preview dirty'ing in inspector
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 年前
mathieum-unity
d7f591a9
Merge remote-tracking branch 'origin/master' into graphview-styling-updates
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Resources/Styles/MaterialGraph.uss
# MaterialGraphProject/UnityPackageManager/manifest.json
7 年前
Matt Dean
8e410579
Merge branch 'master' into node-artistic-adjustment
7 年前
Peter Bay Bastian
14bcb1d7
Full-resolution preview in blackboard
7 年前
Tim Cooper
da15e457
dirty first pass pass architecture.
7 年前
Matt Dean
dadccc50
Merge branch 'master' into node-channel
7 年前
Matt Dean
f14af0f4
Added Cubemap nodes
7 年前
GitHub
81859b60
Merge pull request #92 from Unity-Technologies/pass-architecture
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
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 年前
Jens Holm
e5a6f66e
Serialize preview mesh in graph asset instead of through GraphInspectorView persistent data
7 年前
Peter Bay Bastian
02e4d882
Move "update asset" button to blackboard
7 年前
Peter Bay Bastian
4a06bed4
Remove last bit of toolbar
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 年前
Jens Holm
016cdba4
Remove mesh from preview render data and check for preview mesh in preview manager
7 年前
Jens Holm
cbc52afe
Add rotation to inspector mesh preview
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 年前
Tim Cooper
a197968f
Merge remote-tracking branch 'origin/master' into HDMaster
7 年前
GitHub
5546123e
Merge branch 'master' into node-bugfixes
7 年前
Jens Holm
8a16933b
Minor refactor of preview mesh rotation and scale according to PR comments
7 年前
Jens Holm
2ce394e7
Trigger OnModified on master node when preview is rotated or scaled
7 年前
GitHub
f4e6a374
Merge pull request #130 from Unity-Technologies/inspector-preview-mesh
Inspector preview mesh
7 年前
Jens Holm
8454398a
Center rotationin of preveiw mesh and fix serialization of preview mesh
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
82f3473f
Add resize handle to inspector window
7 年前
Jens Holm
89613602
Move addition of resize handle higher in inspector prevewi window to cause it to overlay other elements
7 年前
Jens Holm
4978e50e
Put resize handles as invisible bars on edges of inspector window
7 年前
Jens Holm
429a5f71
Make resizeing from left and top not move the inspector window when reaching minimum size
7 年前
Jens Holm
0ff2964b
Improve resize handling of inspector window
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 年前
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 )
* 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
2587263f
Remove resize function from GraphInspectorView
7 年前
GitHub
09d669c8
Various refactorings and improvements ( #139 )
* Move previewMode to RenderData instead of ShaderData (still some to do here, as apparently there's still a RenderData _and a_ ShaderData per node, but the intention was to have a RenderData per node and then share ShaderData between those)
* Introduce a temporary identifier for nodes. The first part of this identifier is an index (`int`) which is assigned linearly. When a node is deleted, its identifier as added to a free list. Each identifier also contains a version (`int`), which is incremented when the identifier is re-used. This allows us to replace usage of Dictionary with List in a lot of places.
* Introduce IndexSet for efficiently storing and manipulating a list of indices (e.g. from temp IDs). Internally this stores a list of 32-bit integers and uses each bit to represent 1 index. The operations of `ISet<int>` are implemented for this type, although that interface does not exist in Unity. The operations are very fast and cac...
7 年前
Jens Holm
ff694d9c
Add resize handles to corner of inspector window
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
9b1d3da9
Make maste node preview a separate window
7 年前
Matt Dean
8f22e3a7
Boolean node and type (part 1)
7 年前
Matt Dean
2f6e839e
Add Integer
Node, ShaderProperty, MaterialSlot
Update Property node and properties list
7 年前
Jens Holm
50adcc7c
Remove old functions from GraphInspectorView
7 年前
Matt Dean
8ea43935
Add HDR Color
- Add HDR Color node
- Add new constructor to ColorShaderProperty
- Add hdr flag to ColorControl
- Add HDR Color property to GraphInspectorView
7 年前
Matt Dean
2ed31ce4
Add Comparison node
- Add boolean field for property list
- Fix missing ConcreteValueTypeToString entry
7 年前
Jens Holm
5f6443a4
Add draggable manipulator for floating windows
7 年前
Matt Dean
cfb57499
Add Slider
ShaderProperty, Control, Node and property list entry
7 年前
Matt Dean
81985612
Fix/change slider property view UI
7 年前
Jens Holm
6f373878
Remove unused function in MasterNodeView
7 年前
Jens Holm
fa558b34
Add changes according to PR feedback
7 年前
GitHub
b72d0466
Merge pull request #150 from Unity-Technologies/compare-and-branch
Comparison, Branch and Boolean
7 年前
Peter Bay Bastian
d00ca780
Merge branch 'master' into blackboard
7 年前
Matt Dean
739c124a
Merge branch 'master' into sliders
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 年前
GitHub
1c0c24b4
Merge pull request #151 from Unity-Technologies/sliders
Sliders, Integers and HDR Color
7 年前
Matt Dean
8984577a
Merge branch 'master' into node-input
7 年前
Jens Holm
fb49e741
Merge remote-tracking branch 'origin/master' into inspector-window
7 年前
Jens Holm
c35229be
Add class for holding window docking layout
7 年前
Jens Holm
a4c6f50d
Add functions in WindowDockingLayout to compute relative corner offset and get back layout relative to parent layout
7 年前
Jens Holm
12be2cf3
Update master preview rendertexture size when layout has finished changeing
7 年前
Matt Dean
affdcadf
Add HDR color support to Blackboard
7 年前
Jens Holm
6b956d8e
Add dimension check when master preview is resized
When themaster review is resized, the new size is checked, and if it has not changed, the rendertexture is not changed.
7 年前
GitHub
4df636c0
Merge pull request #188 from Unity-Technologies/window-layout-docking
Change window position serialization to track closest corner
7 年前
Matt Dean
78db5ef1
Refactor float based shader properties
7 年前
Matt Dean
4ad43705
Vector1 property refactor and types
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 年前
Jens Holm
de57de9e
Add function in master preview to update rendertexture size after next layout change
7 年前
GitHub
d2f86285
Merge pull request #192 from Unity-Technologies/node-bugfixes
Property type refactor and Blackboard extension
7 年前
Martin Thorzen
6e895b76
Tidied up the Master Preview View
Uni-36221
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 年前
GitHub
2b211e7e
Merge pull request #205 from Unity-Technologies/tidy-master-preview
Tidied up the Master Preview View
7 年前
Matt Dean
c0c00ec0
Merge branch 'master' into node-matrix
7 年前
Peter Bay Bastian
56f2361c
Merge branch 'master' into peter-fixes
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Drawing/Views/MaterialNodeView.cs
7 年前
Jens Holm
625ddde1
Add zoom to master preview
7 年前
GitHub
341a6fc3
Merge pull request #211 from Unity-Technologies/master-preview-zoom
Master preview zoom
7 年前
Martin Thorzen
4334f8e2
Split up MaterialGraph.USS file into multiple USS files for better organization.
7 年前
Matt Dean
3df359f2
Merge branch 'master' into node-matrix
7 年前
Matt Dean
7c973636
Merge branch 'master' into node-bugfixes
7 年前
Tim Cooper
8dc99cbc
*Fefactor subshader / master node generation to be more uniform
*Add subshader generator as a 'real' thing, need to hook up UI now so that these can be added and removed.
7 年前
GitHub
e986db46
Merge pull request #223 from Unity-Technologies/tim-fixes
Tim fixes
7 年前
Martin Thorzen
7b5ca064
Merge with master
7 年前
GitHub
caaf7a64
Merge pull request #236 from Unity-Technologies/splitting-up-uss-files
Splitting up uss files
7 年前
Peter Bay Bastian
a4d1c27d
Merge branch 'master' into node-bugfixes
# Conflicts:
# MaterialGraphProject/Assets/UnityShaderEditor/Editor/Resources/Styles/MaterialGraph.uss
7 年前
Jens Holm
82db6687
Make master preview dirty when mouse wheel is scrolled (zoom changes)
7 年前
Jens Holm
d3b6cb07
Make master preview dirty after rendertexture is resized ( fixes #235 )
7 年前
Jens Holm
dd879e77
Make master preview refresh rendertexture on play mode change and check if rendertexture is null
7 年前
Peter Bay Bastian
e7218ad7
Remove unused variables and classes and rework how master preview resizing is handled
7 年前
Jens Holm
9c44af93
Add hide flags to master preview rendertexture ( fixed #225 )
7 年前
GitHub
f57c8cab
Merge pull request #238 from Unity-Technologies/master-preview-fixes
Master preview missing RenderTexture fixes
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 年前
Keijiro Takahashi
7aa1b896
Added null-checks to master preview.
7 年前
GitHub
f7374d45
Merge pull request #247 from keijiro/fix-null-preview
Fix for NullReferenceException in master preview.
7 年前
Martin Thorzen
f5ae4e88
Merge with master
7 年前
Peter Bay Bastian
5d8933e2
Reflect rename in future Unity versions of class PostLayoutEvent to GeometryChangedEvent (with fallback import for 2018.1)
7 年前
GitHub
c880667e
Merge pull request #260 from Unity-Technologies/geometrychangedevent
PostLayoutEvent -> GeometryChangedEvent
7 年前
Peter Bay Bastian
b3445484
Add wrapper for `Assembly.GetTypes()` which won't throw an exception
7 年前
GitHub
df788737
Merge pull request #275 from Unity-Technologies/integrate-sg-subshaders
Move lightweight sub-shaders and templates to SRP repository
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 年前
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
6a079706
Add function in WinowDockingLayout to apply layout position or size
7 年前
Jens Holm
11eb245d
Add acess to master previews texture view and add default size for preveiw in uss
7 年前
Jens Holm
b1e38c12
Add collapse button on master preview
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
f7274b83
Make the master preview dirty output nodes in subgraphs
7 年前
Jens Holm
43f24a85
Remove checks for within parent bonds in resize handles
7 年前
GitHub
246492ed
Merge pull request #299 from Unity-Technologies/layout-modifiers-improvements
Layout modifiers improvements
7 年前
GitHub
312d23e1
Merge pull request #304 from Unity-Technologies/sub-graph-preview-fix
Sub graph preview fix
7 年前
Peter Bay Bastian
9cc55c03
Merge branch 'master' into path-for-shaders
7 年前
Peter Bay Bastian
6ec339e3
Forwardport pull request #336
7 年前
Peter Bay Bastian
8076c27e
Merge branch 'master' into copy-property-nodes
7 年前
Jens Holm
60639f41
Merge branch 'master' into editable-property-reference-names
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 年前
Martin Thorzen
37c00666
Added update title to master preview and blackboard.
cleaned up assetName parameter and dded it as a property instead
Made a seperate shader graph post processor file
7 年前
GitHub
630691ab
Merge pull request #1512 from Unity-Technologies/sg/update-window-title-when-after-file-rename
Update window title
7 年前
GitHub
0610a60c
Merge branch 'master' into sg/error-for-incompatible-pipeline
7 年前
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
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs.hlsl
6 年前
Remy
540d190a
Merge branch 'master' into HDRP-Tests
# Conflicts:
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1102_Unlit_Distortion.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1103_Unlit_Distortion_DepthTest.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1202_Lit_DoubleSideNormalMode.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1204_Lit_Transparent_Fog.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1208_Lit_Displacement_POM.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1209_Lit_Displacement_Vertex.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1210_Lit_BentNormal.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1302_SSS_MaxRadius.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/Window...
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
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
6 年前
Tim Cooper
8406655d
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
6 年前
Nerites
9b69a952
Merge xrconfig branch into xrsettings
6 年前
Tim Cooper
9bf79289
Backport pull request #1529
6 年前
Nerites
86a99323
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline 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 年前
Stephane Laroche
73aab246
Merge branch 'hdrp/staging' into StackLit2_TrunkTest
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs
6 年前