Alex Lian
|
5dd074d3
|
Move shadergraph
|
7 年前 |
|
Alex Lian
|
3be7d580
|
Merge remote-tracking branch 'origin/master' into build/automation
|
7 年前 |
Tim Cooper
|
38c413cd
|
Merge branch 'build/automation' into masteraxxx
# Conflicts:
# TestProjects/GraphicsTests/Assets/Tests/UTF_Core
# TestProjects/GraphicsTests/Assets/Tests/UTF_Tests_HDRP
|
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
|
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 年前 |
|
Tim Cooper
|
416f1e20
|
Disable integration test for now.
|
7 年前 |
|
GitHub
|
2274ce9d
|
Merge branch 'master' into sg/fix-for-subgraphs-inside-main-graph
|
7 年前 |
|
GitHub
|
53aa984e
|
Merge pull request #1434 from Unity-Technologies/build/fix-tests
Build/fix tests
|
7 年前 |
|
GitHub
|
51a1873e
|
Merge branch 'master' into update-changelog
|
7 年前 |
|
Tim Cooper
|
a5f33a0c
|
Remove Project Version
|
7 年前 |
|
Peter Bay Bastian
|
b4dd9062
|
Merge remote-tracking branch 'origin/master' into sg/facesign
|
7 年前 |
|
Tim Cooper
|
eaad479b
|
Remove project version file.
|
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 年前 |
Martin Thorzen
|
8dc1c1be
|
Adding test scene for Shader Graphs.
This first Scene is for all teh Maths nodes
|
7 年前 |
|
GitHub
|
3a6a4e59
|
Merge branch 'master' into sg/spheremasknode
|
7 年前 |
|
Tim Cooper
|
cba42a6a
|
Remove large files.
|
7 年前 |
|
Tim Cooper
|
ce3b9547
|
Add files and non large files.
|
7 年前 |
|
sebastienlagarde
|
8140058d
|
Merge branch 'master' into ContactShadowWithLightTransmission
|
7 年前 |
|
GitHub
|
bd393bda
|
Merge branch 'master' into switch-support
|
7 年前 |
Nerites
|
4b5c5d5c
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
|
7 年前 |
|
Stephane Laroche
|
f46075fb
|
Merge remote-tracking branch 'mainrepo/master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Lit/Lit.hlsl
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs.hlsl
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
|
7 年前 |
|
GitHub
|
0610a60c
|
Merge branch 'master' into sg/error-for-incompatible-pipeline
|
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 年前 |
|
Tim Cooper
|
168cdcb4
|
Add ShaderGraph MathNode tests
|
7 年前 |
|
Nerites
|
9b69a952
|
Merge xrconfig branch into xrsettings
|
6 年前 |
|
Tim Cooper
|
1312c2f8
|
Add Ref images for osx
|
6 年前 |
|
GitHub
|
e7ef35ad
|
Merge pull request #1634 from Unity-Technologies/ShaderGraphTests
Shader graph tests
|
6 年前 |
|
Nerites
|
f6c51928
|
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 年前 |
|
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 年前 |
