Sebastien Lagarde
|
49897966
|
HDRP: Reorganize folder and files
|
6 年前 |
GitHub
|
aad9d81b
|
Merge pull request #1450 from Unity-Technologies/HDRP-Reorganize-folder-and-files
HDRP: Reorganize folder and files
|
6 年前 |
|
Sebastien Lagarde
|
bac8ca96
|
First version of a material upgrader system (With upgrade for EmissiveColor)
|
6 年前 |
|
GitHub
|
745e2fe0
|
Merge pull request #1451 from Unity-Technologies/Upgrader-for-materiial
First version of a material upgrader system (With upgrade for Emissiv…
|
6 年前 |
sebastienlagarde
|
56693471
|
Improve upgrade material system + Add versionning via HDRPProjectVersion.txt to project settings
|
6 年前 |
|
GitHub
|
274022c0
|
Merge pull request #1457 from Unity-Technologies/Improve-upgrade-material-system
Improve upgrade material system + Add versionning via HDRPProjectVers…
|
6 年前 |
Paul Melamed
|
9f1637c0
|
Merge branch 'master' into decals/NoHDRP_exception
|
6 年前 |
Stephane Laroche
|
d85052d9
|
Merge branch 'master' into StackLit2
|
6 年前 |
|
sebastienlagarde
|
41bab0af
|
improve material upgrade
|
6 年前 |
|
GitHub
|
9a4c6386
|
Merge pull request #1471 from Unity-Technologies/improve-material-upgrade
HDRP: improve material upgrade+ create hdrp version at a letter step
|
6 年前 |
|
Stephane Laroche
|
f7d6e7db
|
Merge remote-tracking branch 'mainrepo/master' into StackLit2
|
6 年前 |
Oliver Schnabel
|
97ac5bf9
|
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
|
6 年前 |
Chris Tchou
|
e8ce5056
|
Merge branch 'master' into vertexAnimHDRP2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRPass.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
|
6 年前 |
|
sebastienlagarde
|
7f2358af
|
Move Checkout core function to CoreEditor + create file for shadowmapGUI + rename VSSEnabledto VCSEnabled
|
6 年前 |
|
GitHub
|
f3c9daff
|
Merge pull request #1477 from Unity-Technologies/Fix-issue-with-wrong-location-of-checkout
Move Checkout core function to CoreEditor + create file for shadowmapGUI
|
6 年前 |
|
sebastienlagarde
|
bde9fede
|
changeHDRPVersion to integer and don't display warning
|
6 年前 |
|
GitHub
|
1ea9dac9
|
Merge pull request #1480 from Unity-Technologies/Fix-issue-with-HDRP-version
changeHDRPVersion to integer and don't display warning
|
6 年前 |
|
GitHub
|
51a1873e
|
Merge branch 'master' into update-changelog
|
6 年前 |
Peter Bay Bastian
|
b4dd9062
|
Merge remote-tracking branch 'origin/master' into sg/facesign
|
6 年前 |
|
sebastienlagarde
|
4a622009
|
Merge branch 'master' into refactor-shader-variant-per-material
|
6 年前 |
|
Oliver Schnabel
|
3a15d806
|
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
|
6 年前 |
|
sebastienlagarde
|
c299552b
|
HDRP: Fix hdrp version trouble (now return current version when no version exist)
|
6 年前 |
|
GitHub
|
422525b7
|
Merge pull request #1487 from Unity-Technologies/Fix-hdrpversoin-trouble
HDRP: Fix hdrp version trouble (now return current version when no ve…
|
6 年前 |
Remy
|
7bf53f3c
|
Merge branch 'master' into HDRP-Tests
|
6 年前 |
|
Stephane Laroche
|
7933fd8d
|
Merge branch 'master' into StackLit2
|
6 年前 |
|
Paul Melamed
|
797daf79
|
Merge branch 'master' into decals/ss3_channel_mask
|
6 年前 |
|
sebastienlagarde
|
6c870111
|
Merge branch 'master' into FalseColorMode
|
6 年前 |
Felipe Lira
|
7193e88e
|
Merge branch 'master' into lw/bugfixes
# Conflicts:
# com.unity.render-pipelines.lightweight/CHANGELOG.md
|
6 年前 |
Thomas
|
01ee049b
|
Merge branch 'master' into gfx-tests-postfx
|
6 年前 |
|
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
|
6 年前 |
|
GitHub
|
3a6a4e59
|
Merge branch 'master' into sg/spheremasknode
|
6 年前 |
Nerites
|
4b5c5d5c
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
|
6 年前 |
Antoine Lelievre
|
94299904
|
Light intensity now works with timeline and animators
|
6 年前 |
|
GitHub
|
adaab50a
|
Merge pull request #1612 from Unity-Technologies/LightUnits
HDRP: Add extra Light units (Candela, Luminance)
|
6 年前 |
|
sebastienlagarde
|
acce4895
|
Merge branch 'master' into DisableFogWithDiffsueAndSpecularDebug
|
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
|
cc9ae6f7
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
|
6 年前 |
|
Nerites
|
9b69a952
|
Merge xrconfig branch into xrsettings
|
6 年前 |
Yao Xiaoling
|
7ba05ba9
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
|
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 年前 |
|
sebastienlagarde
|
49764db8
|
Update UI for decal material based on artists feedback + add upgrader script
|
6 年前 |
|
GitHub
|
13ae3ef8
|
Merge pull request #1712 from Unity-Technologies/Update-DecalUI
Update UI for decal material based on artists feedback + add upgrader
|
6 年前 |
|
GitHub
|
3f424739
|
Merge pull request #1713 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
|
6 年前 |
|
Remy
|
2883e443
|
Merge branch 'master' into tests/hdrp/distortion
|
6 年前 |
|
Stephane Laroche
|
73aab246
|
Merge branch 'hdrp/staging' into StackLit2_TrunkTest
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs
|
6 年前 |
|
Nerites
|
4c6e512a
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
|
6 年前 |
|
sebastienlagarde
|
d8d59c81
|
Fix decal upgrade script
|
6 年前 |
|
Nerites
|
7a18f28e
|
Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings"
This reverts commit b4235a00abc6fa6e57b0ec4e3b9ac5476a00483b, reversing
changes made to 9f8c48222c8e832dafba28a61d7eb38a18a5f9c8.
|
6 年前 |
Julien Ignace
|
13c603cb
|
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking
|
6 年前 |
|
Nerites
|
5182ab18
|
Revert "Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings""
This reverts commit ec4368043e0e48024a999926b30a6d885a9c6d5d.
|
6 年前 |
|
sebastienlagarde
|
e53ca1bf
|
HDRP: Remove warning
|
6 年前 |
|
GitHub
|
07c127ac
|
Merge pull request #1743 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
|
6 年前 |
|
Remy
|
b3ff809b
|
Merge branch 'master' into tests/hdrp/distortion
|
6 年前 |
|
Sebastien Lagarde
|
65ea94ef
|
Update the material upgrader system to be per material and not per project
|
6 年前 |
|
Sebastien Lagarde
|
a9cdd84b
|
Update keyword in upgraded script for decal
|
6 年前 |
|
Sebastien Lagarde
|
5e272239
|
Fix issue with upgrade decal script
|
6 年前 |
|
GitHub
|
b57e1824
|
Merge pull request #1747 from Unity-Technologies/Decal-compilation
Decal shader stripping and upgrade script + fix
|
6 年前 |
|
GitHub
|
449e311f
|
Merge pull request #1749 from Unity-Technologies/HDRP/staging
merge Hdrp/staging
|
6 年前 |
|
Sebastien Lagarde
|
b89550d1
|
Fix issue with upgrade script and embed material
|
6 年前 |
|
GitHub
|
9ca2f35e
|
Merge pull request #1750 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
|
6 年前 |
|
Sebastien Lagarde
|
09928ece
|
HDRP: Decal - Silent a warning
|
6 年前 |
|
GitHub
|
0bdf96cc
|
Merge pull request #1754 from Unity-Technologies/Update-name-of-decal-keyword
Reduce number of decal shader variant
|
6 年前 |
|
GitHub
|
019f3227
|
Merge pull request #1757 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
|
6 年前 |
|
Remy
|
b425d23e
|
Merge branch 'master' into tests/hdrp/distortion
|
6 年前 |
|
Julien Ignace
|
5bfcc8cd
|
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking
|
6 年前 |
|
Yao Xiaoling
|
4d7a5d51
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
|
6 年前 |
|
Nerites
|
b088283d
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
|
6 年前 |
|
GitHub
|
7b744594
|
Merge branch 'master' into xrsettings
|
6 年前 |
|
Yao Xiaoling
|
665cb283
|
Fix merge.
|
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 年前 |
Anis Benyoub
|
949ce831
|
More work on cloth UI
|
6 年前 |
|
Anis Benyoub
|
cd8cac28
|
Rename cloth to Fabric
|
6 年前 |
|
GitHub
|
0f00f09d
|
Merge pull request #1847 from Unity-Technologies/Add-cloth-material-anis
Finishing a first version of the implementation of the Fabric Shader
|
6 年前 |
|
Sebastien Lagarde
|
82c30969
|
Merge branch 'master' into fix/coupling-hdlight-workflow
|
6 年前 |
|
GitHub
|
f25dd24a
|
Merge branch 'master' into HDRP/staging
|
6 年前 |
|
GitHub
|
2befab52
|
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
|
6 年前 |
|
Julien Ignace
|
ab8c4439
|
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-gcalloc
|
6 年前 |
Yao Xiao Ling
|
cfd45cf1
|
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
|
6 年前 |
egomeh
|
e7c59a70
|
Resolve merge conflicts
|
6 年前 |
|
GitHub
|
7cfc2ed0
|
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
|
6 年前 |
|
GitHub
|
a6854ec4
|
Merge pull request #1875 from Unity-Technologies/gpu-terrain
GPU Terrain (2018.3) port to HDRP and LWRP
|
6 年前 |
|
egomeh
|
93afc87c
|
Merge remote-tracking branch 'origin/master' into lw/light-attenuation
|
6 年前 |
|
Thomas
|
468989ad
|
Merge branch 'master' into pyramid-rework
|
6 年前 |
|
GitHub
|
aae1a458
|
Merge branch 'master' into lw/no_front_to_back_sorting_of_opaques_on_gpu_with_hsr
|
6 年前 |
