Julien Ignace
|
55bd39cb
|
- Updated ShadowsTest scene with a setup of cameras.
- Split Input Registering code from DebugActionManager and used it to register inputs for FreeCamera
|
7 年前 |
Thomas
|
076b0d65
|
Cleaned up unused usings
|
7 年前 |
GitHub
|
89072748
|
Merge pull request #449 from Unity-Technologies/refactor-episode-2
Refactoring: Episode 2 - The Editor Strikes Back
|
7 年前 |
sebastienlagarde
|
71713559
|
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3
|
7 年前 |
|
GitHub
|
f49bc2d1
|
Merge pull request #450 from Unity-Technologies/Unity-2017.3
Unity 2017.3
|
7 年前 |
Peter Andreasen
|
2ef7d649
|
merged with master
|
7 年前 |
Sebastien Lagarde
|
f62941c5
|
Merge branch 'Unity-2017.3' into Add-Per-Pixel-scale
|
7 年前 |
Evgenii Golubev
|
8d403196
|
Merge branch 'Add-Per-Pixel-scale' of https://github.com/Unity-Technologies/ScriptableRenderLoop
|
7 年前 |
|
Evgenii Golubev
|
ea93b8f4
|
Merge branch 'Add-Per-Pixel-scale' of https://github.com/Unity-Technologies/ScriptableRenderLoop
|
7 年前 |
Felipe Lira
|
5f970d63
|
Merge branch 'Unity-2017.3' into LightweightPipeline
|
7 年前 |
|
Sebastien Lagarde
|
a4fddf9c
|
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
|
7 年前 |
|
Sebastien Lagarde
|
4d5c89d9
|
Temp disabling code so we don't go out of memory at launch
|
7 年前 |
|
GitHub
|
7ef20321
|
Merge pull request #985 from Unity-Technologies/Fix-out-of-memory-at-launnch
Temp disabling code so we don't go out of memory at launch
|
7 年前 |
|
Sebastien Lagarde
|
0d688467
|
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
|
7 年前 |
|
Thomas
|
278e0671
|
Fixed input registering and the "ghost inspector" issue
|
7 年前 |
|
GitHub
|
31254b86
|
Merge pull request #991 from Unity-Technologies/input-register-fix
Fixed input registering and the "ghost inspector" issue
|
7 年前 |
Remy
|
229f2e88
|
Merge branch 'master' into HDRP_GraphicTests
|
7 年前 |
Peter Bay Bastian
|
ba0ce030
|
Merge branch 'master' into integrate-sg-subshaders
|
7 年前 |
|
Evgenii Golubev
|
0a2033df
|
Merge upstream/master
|
7 年前 |
Paul Melamed
|
6f570901
|
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
|
7 年前 |
John Parsaie
|
8cc0d941
|
Merge SRP 2018.1
|
7 年前 |
|
GitHub
|
47d42b36
|
Merge pull request #1 from Unity-Technologies/master
Merge from main
|
7 年前 |
Frédéric Vauchelles
|
fd3d298d
|
Merge branch 'master' into feature/ReflectionProbeBaking
|
7 年前 |
|
Frédéric Vauchelles
|
d1dfdb4e
|
Merge branch 'master' into feature/ScreenSpaceProjection
# Conflicts:
# SampleScenes/HDTest/PlanarReflectionTests.unity
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/LightingDebugPanel.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
|
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 年前 |
|
Julien Ignace
|
3317353a
|
Temporary fix for a crash in input registering.
|
7 年前 |
|
GitHub
|
a466fdb8
|
Merge pull request #1447 from Unity-Technologies/Branch_FixInputRegisterCrash
Temporary fix for a crash in input registering.
|
7 年前 |
|
GitHub
|
51a1873e
|
Merge branch 'master' into update-changelog
|
7 年前 |
|
Peter Bay Bastian
|
b4dd9062
|
Merge remote-tracking branch 'origin/master' into sg/facesign
|
7 年前 |
|
Paul Melamed
|
797daf79
|
Merge branch 'master' into decals/ss3_channel_mask
|
7 年前 |
Yao Xiaoling
|
7ba05ba9
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
|
7 年前 |
Aleksandr Kirillov
|
4695f235
|
Merge branch 'master' into lw/terrain_optimization
|
7 年前 |
