Peter Bay Bastian
|
3457c49b
|
Updated to work after merge with trunk
|
8 年前 |
Mads Ronnow
|
f4f2a2f8
|
Fixed graph image comparison test and added graph shader text comparison in test
|
7 年前 |
Tim Cooper
|
870f055f
|
Remove graph view.
|
7 年前 |
Tim Cooper
|
28cf7cb6
|
Upgrade to trunk based graph view.
|
7 年前 |
Yuanxing Cai
|
77e26863
|
Merge branch 'master' into crash-fixes
|
7 年前 |
Tim Cooper
|
400411ff
|
add dependency on sap
|
7 年前 |
Tim Cooper
|
5ff20e91
|
missed manifest update
|
7 年前 |
Matt Dean
|
d0277da5
|
Fix manifest
- Added non manifest files in packages to ignore
- Fixed package manifest
|
7 年前 |
Tim Cooper
|
85affe1f
|
Update lightweight pipeline / SRP version
|
7 年前 |
GitHub
|
21a946ef
|
Merge pull request #73 from Unity-Technologies/master
Merge master
|
7 年前 |
Patrick Fournier
|
de93c238
|
Merge trunk
|
7 年前 |
Tim Cooper
|
048fd0dd
|
Update to latest light weight pipeline.
|
7 年前 |
Tim Cooper
|
54ac74c0
|
Merge branch 'master' into node-input-scene
|
7 年前 |
Peter Bay Bastian
|
31fd09c2
|
Update LW package version to 0.1.20
|
7 年前 |
Tim Cooper
|
a197968f
|
Merge remote-tracking branch 'origin/master' into HDMaster
|
7 年前 |
GitHub
|
5546123e
|
Merge branch 'master' into node-bugfixes
|
7 年前 |
Tim Cooper
|
7995a0e9
|
upgrading to new shader library.
|
7 年前 |
Tim Cooper
|
5c4cbe12
|
For LW use the proper shader paths that get exported from the LW package..
|
7 年前 |
GitHub
|
c3ae833e
|
Merge pull request #144 (Upgrade to use new shader library)
Also includes WIP HD Unlit Master Node
|
7 年前 |
Jens Holm
|
93fa2455
|
Merge remote-tracking branch 'origin/master' into inspector-window
|
7 年前 |
Tim Cooper
|
21984136
|
LW working with new SRP release.
|
7 年前 |
GitHub
|
2927625a
|
Merge pull request #169 from Unity-Technologies/SRP-0.1.25
Srp 0.1.25
|
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 年前 |
Jens Holm
|
55b86ced
|
Merge branch 'master' into inspector-window
|
7 年前 |
Matt Dean
|
725a1ea9
|
Merge branch 'master' into sliders
|
7 年前 |
Matt Dean
|
c0c00ec0
|
Merge branch 'master' into node-matrix
|
7 年前 |
Alex Lian
|
5dd074d3
|
Move shadergraph
|
7 年前 |
Peter Bay Bastian
|
8c23ec53
|
Update package manifest to point to local packages
|
7 年前 |
GitHub
|
24a25058
|
Merge pull request #1422 from Unity-Technologies/sg/update-test-project
Update Shader Graph test project
|
7 年前 |
GitHub
|
2274ce9d
|
Merge branch 'master' into sg/fix-for-subgraphs-inside-main-graph
|
7 年前 |
Tim Cooper
|
5ecafbed
|
Update manifests with explicit references.
|
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 年前 |
Thomas
|
01ee049b
|
Merge branch 'master' into gfx-tests-postfx
|
7 年前 |
Chris Tchou
|
6408007a
|
Merge branch 'master' into hdrpcleanup
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRPass.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRSubShader.cs
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitSubShader.cs
|
7 年前 |
Tim Cooper
|
148bf580
|
Start adding shader graph test framework
|
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 年前 |
Tim Cooper
|
893f84e9
|
Add warnings as errors to test projects + fix issues
|
7 年前 |
Tim Cooper
|
8406655d
|
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
|
7 年前 |
Tim Cooper
|
5517ed97
|
Fix the manifest to include tests + remove project version
|
7 年前 |
Nerites
|
cc9ae6f7
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
|
7 年前 |
Nerites
|
9b69a952
|
Merge xrconfig branch into xrsettings
|
7 年前 |
GitHub
|
e7ef35ad
|
Merge pull request #1634 from Unity-Technologies/ShaderGraphTests
Shader graph tests
|
7 年前 |
Nerites
|
f6c51928
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
|
7 年前 |
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
|
7 年前 |
Stephane Laroche
|
73aab246
|
Merge branch 'hdrp/staging' into StackLit2_TrunkTest
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs
|
6 年前 |
GitHub
|
9cc64871
|
Remove pp submodule (#1770)
* Remove postprocessing submodule and use shipped package dependency.
|
6 年前 |
Nerites
|
b088283d
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
|
6 年前 |
GitHub
|
7b744594
|
Merge branch 'master' into xrsettings
|
6 年前 |
GitHub
|
d5300b0b
|
Merge pull request #1774 from Unity-Technologies/master
Merge master into staging
|
6 年前 |
GitHub
|
f0a8da64
|
Merge pull request #1775 from Unity-Technologies/HDRP/staging
merge Hdrp/staging
|
6 年前 |
sebastienlagarde
|
10164527
|
Merge branch 'HDRP/staging' into HDRP/refactor-reflectionProbe/clean-proxy-volume
|
6 年前 |
Remy
|
b364cfd3
|
Merge branch 'hdrp/staging' into tests/hdrp/distortion
|
6 年前 |
Yao Xiaoling
|
a11976bf
|
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
|
7cfc2ed0
|
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
|
6 年前 |