31e4c8ca
HDRenderLoop: Intermediate state
8 年前
7fa398c4
HDRenderLoop: Reorganize LightLoop pass, move code into SinglePass.cs
8 年前
882368f7
HDRenderLoop: Merge FTPL Build Light List part (tile, bigtile, cluster..)
- Only build light list, not light application for now
- untested, crash when big tile are enabled
8 年前
442892e0
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
8 年前
91937fed
HDRenderLoop: Merge FPTL - start light application
- all broken for now
8 年前
f85c5fe4
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
2b2b5808
Merge branch 'master' into scriptablerenderloop-materialgraph
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/Editor/LitUI.cs
8 年前
9b94966f
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
a91df7f9
HDRenderLoop: Merge FTPL - application of opaque tiled lists (untested)
8 年前
0ad558b0
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
0065b8b6
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
8 年前
16333450
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
814ebce6
HDRenderLoop: Fix some warning in compute shaders
8 年前
805c0972
HDRenderLoop: Fix issue with cubemap and tile rendering
- I still have issue on both cubemap and light for what appear to be the
last light/cubemap in the list, not sure why.
8 年前
fc0cb9a4
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into SkySystem
8 年前
ab48557b
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
4c335811
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into SkySystem
8 年前
2df9af84
Merge branch 'SkySystem'
8 年前
610894d8
HDRenderLoop: Fix issue with tile list index + Rename SFiniteLightData to LightShapeData
8 年前
668f9372
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/Material/LayeredLit/Editor/LayeredLitUI.cs
8 年前
39e6194b
HDRenderLoop: few fix on cluster FPTL, still not work yet
8 年前
f44b8fd2
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# .gitignore
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
8 年前
6d7d07de
TilePass support for arealights
8 年前
517006da
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
36e49e0d
Minor refactoring in HDRenderLoop: Renamed light types are now referred to as volumes and light models are now referred to as light categories
8 年前
d0ebdb4a
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-lightloop
8 年前
8ef3ae75
misc bug fixes
misc bug fixes
8 年前
37316a28
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-lightloop
8 年前
546401a2
HDRenderLoop: Version that compile and display something
8 年前
8337fa69
Merge pull request #34 from Unity-Technologies/Refactor-lightloop
Refactor lightloop
8 年前
e7cb98c6
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
462e7b4d
Merge branch 'master' into scriptablerenderloop-graphicssettings
8 年前
267b0349
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
9d2ab9fb
reintroduced compute shader version of light evaluation code
8 年前
4e827773
Changed tabs to spaces and removed debug code in shadeopaque
8 年前
1144884f
Merge remote-tracking branch 'origin/master' into refactorentrypoint
Conflicts:
Assets/ScriptableRenderLoop/HDRenderLoop/Lighting/TilePass/TilePass.cs
8 年前
1af099df
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into MIS
8 年前
b890244e
HDRenderLoop: Rename the directory HDRenderLoop in HDRenderPipeline
8 年前
23f2ee44
Merge pull request #71 from Unity-Technologies/Renaming-HDRenderLoop
Renaming hdrenderloop to hd renderPipeline
8 年前
782077fb
Merge branch 'master' into lowendmobile
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
8 年前
0f63e44e
Merge branch 'master' into LayeredLit
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader
8 年前
66610d8f
Merge remote-tracking branch 'origin/master' into batch_rendering
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
# ProjectSettings/ProjectVersion.txt
8 年前
f38f5e1a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
47bf244a
Consistently handle 'NdotL' problems
8 年前
96c60309
Orthonormalize TBN
8 年前
1272e08c
Move orthonormalization into GetSurfaceAndBuiltinData()
8 年前
7b7eb3b4
Fixed a number of compilation issue with PS4.
8 年前
a04d917d
Merge pull request #92 from Unity-Technologies/Branch_fix-ps4-hdrenderloop
Fixed a number of compilation issue with PS4.
8 年前
74657c39
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
05e84b23
Merge branch 'master' into lowendmobile
8 年前
2bfdeef3
Output diffuse lighting into a separate render target
8 年前
65e1c7e7
workaround hlsl bytecode/metal output issue that only triggered on iOS
8 年前
4cf1213b
Implement the pass combining specular with diffuse and SSS
8 年前
d1ed6394
Split lighting for all materials into diffuse and specular
8 年前
53139a71
prevent crash on iOS from illegal access
prevent crash on iOS from illegal access. In HLSL, unlike c++, for the
statement if(A && B) B is executed whether A succeeds or fails. In this
case the result is a crash on iOS (since we convert from hlsl to d3dasm
to metal).
8 年前
13ea9eba
fix a typo from 6a559794e99deb97862d7665ded84ac0396dbcf3
8 年前
65dc77ef
fix something obvious :)
fix something obvious :)
8 年前
89421bcf
Merge branch 'master' into metal
8 年前
2ba6f819
Merge pull request #108 from Unity-Technologies/metal
Initial macOS Metal support for HDRenderPipeline + some iOS fixes in FTPL
8 年前
087242cd
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
21be7561
Merge branch 'master' into SSSSS
8 年前
d4271c8c
Merge remote-tracking branch 'origin/master' into preview-cameras
8 年前
171302ee
Merge branch 'preview-cameras' into refactor-hdloop
Conflicts:
Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
8 年前
40290c81
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/ShaderVariables.hlsl
8 年前
2cdff1ec
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/TestScenes/HDTest/GlobalIlluminationTest.unity
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset.meta
# Assets/TestScenes/HDTest/HDRI.meta
# ProjectSettings/GraphicsSettings.asset
# ProjectSettings/ProjectSettings.asset
8 年前
48a18cb1
HDRenderPipeline: Fix shader warning + ligth limits
8 年前
49a063c5
Merge pull request #125 from Unity-Technologies/Fix-shader-warning-+-light-limits-corruption
HDRenderPipeline: Fix shader warning + ligth limits
8 年前
be52007a
Merge branch 'master' into lowendmobile
8 年前
a1e72bda
Merge remote-tracking branch 'origin/master' into refactor-hdloop
Conflicts:
Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/TilePass/TilePass.cs
Assets/ScriptableRenderLoop/HDRenderPipeline/Lighting/TilePass/TilePassResources.cs
8 年前
ac23a82e
Merge branch 'master' into SSSSS
8 年前
0ca79425
Merge branch 'SSSSS'
8 年前
d00136e3
Merge pull request #128 from EvgeniiG/master
Add the initial implementation of SSS
8 年前
df95d960
Merge branch 'master' into Branch_DebugShadows
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Editor/HDRenderPipelineInspector.cs
# Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
# Assets/ScriptableRenderLoop/RenderPasses/ShadowRenderPass.cs
8 年前
b2595e70
Merge remote-tracking branch 'origin/master'
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
8 年前
9cecdb2e
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-POM-+-Heightmap-behavior
8 年前
8c1ebfeb
explicitly set _CameraDepthTexture precision
8 年前
e2f52112
Merge pull request #132 from Unity-Technologies/metal
Metal
8 年前
f3984098
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-POM-+-Heightmap-behavior
8 年前
506c1212
Merge branch 'master' into Branch_DebugShadows
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Editor/HDRenderPipelineInspector.cs
8 年前
0da32ed1
Merge branch 'master' into Branch_DebugLighting
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Editor/HDRenderPipelineInspector.cs
# Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
8 年前
3b9f1e7d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
60dd6c48
Implemented lighting debug in the shader.
8 年前
538bf3b2
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
c66d98c1
Merge pull request #135 from Unity-Technologies/Branch_DebugLighting
Branch debuglighting
8 年前
64b996ea
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-POM-+-Heightmap-behavior
8 年前
c13b75bb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
1d022582
Merge remote-tracking branch 'refs/remotes/origin/master' into postfx-temp
8 年前
e8505d17
switch to structured across the board
switch to structured across the board
8 年前
ca6b7f62
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/BasicRenderBatching.meta
# Assets/BasicRenderBatching/LightingBatching.meta
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/ScriptableRenderLoop/HDRenderPipeline/PostProcess/Resources/Textures.meta
# Assets/ScriptableRenderLoop/HDRenderPipeline/ShaderVariables.hlsl
# Assets/TestScenes/HDTest/CascadedShadowsTest.meta
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset
# Assets/TestScenes/HDTest/GraphicTest/Two Sided/Prefabs/Materials.meta
# Assets/TestScenes/HDTest/Leaf.meta
# Assets/TestScenes/HDTest/Leaf/GroundLeaf.meta
8 年前
89d05b25
Merge branch 'batch_rendering' of https://github.com/Unity-Technologies/ScriptableRenderLoop into batch_rendering
# Conflicts:
# Assets/BasicRenderBatching/LightingBatchingProbe.unity
8 年前
a1e0f1e9
Rename scriptableRenderLoop Folder to ScriptableRenderPipeline
- Rename all "loop" name to "pipeline" name for FPTL/Basic/HD
- Update all include in HDRenderPipeline to match C++ #include path that
is Asset/ScriptableRenderPipeline
Caution: This PR require the new C++ code
8 年前
f67aaaa4
Merge pull request #152 from Unity-Technologies/Rename-ScriptableRenderLoop-folder
Rename scriptableRenderLoop Folder to ScriptableRenderPipeline (Need to update C++)
8 年前
c8a27740
Merge branch 'master' into shadows
8 年前
caf9e0b1
get rid of some warnings (all false positives)
get rid of some warnings (all false positives)
8 年前
2ce17b6c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
ff92221a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
0905d0bc
Merge branch 'master' into lowendmobile
# Conflicts:
# Assets/ScriptableRenderPipeline/RenderPasses/ShadowRenderPass.cs
# ProjectSettings/QualitySettings.asset
8 年前
77102a68
Merge branch 'master' into shadows
8 年前
aee19128
Remove 'positionCS' from 'PositionInputs'
8 年前
3c290788
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/TestScenes/Big
# Assets/TestScenes/HDTest/Material/HDRenderLoopMaterials/Lit_Emissive_Blue.mat
8 年前
2b3c73fa
Changed the way we handle reading into the bound depth buffer.
- Now Depth buffer is not copied anymore on PS4
- On other platform, depth buffer is used only once and the copy is used as a texture in all shader that need it. Depth Buffer Render Target is no longer changed.
8 年前
f8fb534f
allow clustered tiled to use 16, 32 or 64 as its tile size
allow clustered tiled to use 16, 32 or 64 as its tile size. Fptl will
remain 16x16 due to its per pixel nature.
8 年前
f1c40192
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
b7cd7bb8
Merge pull request #170 from EvgeniiG/master
Fix depth offset for POM
8 年前
5cb0e855
Merge pull request #173 from Unity-Technologies/Branch_CopyDepthTexture
Branch copydepthtexture
8 年前
20a72b30
HDRenderPipeline: Change from 16x16 to 32x32 tile size for clustered
- Shader opaque compute doens't work
- Seems that if we disable clustered for forward, the fallback have some
conflict with tiling (not a use mode as the fallback is just a debug
mode but should not happen).
8 年前
bbd02192
Merge pull request #175 from Unity-Technologies/Change-to-32x32-clustered-tile
HDRenderPipeline: Change from 16x16 to 32x32 tile size for clustered
8 年前
8fd9c678
switch back to clustered in 32x32 and misc
switch back to clustered in 32x32, fix ps4 shader compile bug (always
use 16x16 for deferred lighting) and fix incorrect allocation size for
s_PerTileLogBaseTweak.
8 年前
84860a17
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
e3ed72d7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
8d6eac51
compile fixes for xbox one
8 年前
e6d31a76
fixed compute shader version of tiled deferred
8 年前
98360617
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
b38bced1
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
8 年前
77eb16d6
Merge branch 'master' into metal
8 年前
48d64603
unify lightlistbuild compute kernels a bit + spaces to tabs
8 年前
c445e599
Explicit tile coordinates in GetPositionInput.
~10% faster tile deferred light evaluation in compute
8 年前
bfd69072
Merge branch 'master' into metal-ios
8 年前
2cce2981
Merge branch 'master' into metal
8 年前
5764f6b9
remove lightlistbuild compute shader warnings, unify few things between fptl/HD renderloop versions
8 年前
8488f9ad
Merge pull request #188 from Unity-Technologies/metal-ios
metal-ios
8 年前
a8edd715
Merge branch 'master' into metal
8 年前
09c4949e
HLSLcc: fix out of bounds issues on Metal/iOS, HLSL bytecode being the root cause before Metal generated shaders
8 年前
93c3dc2b
Revert "HLSLcc: fix out of bounds issues on Metal/iOS, HLSL bytecode being the root cause before Metal generated shaders"
This reverts commit 72893e261ba44cbf88087255f4a57116f9e9f76a.
8 年前
6f5f9da4
Fixed UI for Tile Debug Modes
Added compute shader for clearing indirect arguments
Added feature flags to UI, and LightVolumeData
8 年前
ddd7d5d5
HDRenderPipeline: Change all include shader absolute path to relative path
8 年前
86dbe5d8
Merge pull request #192 from Unity-Technologies/Update-To-relative-path
HDRenderPipeline: Change all include shader absolute path to relative path
8 年前
e210fc3a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
12d98082
fixed tile debugging dropdown
added tile classification with indirect dispatch (feature variant shaders)
added debugging mode for feature variants
8 年前
0628ecc1
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
f120a09b
added feature branches to lightloop
initial set of feature variant shaders
8 年前
764e5269
Merge branch 'master' into metal-ios
8 年前
cefe8b15
Merge branch 'master' into shadows
8 年前
ac01ea01
HLSLcc: fix out of bounds issues on Metal/iOS, HLSL bytecode being the root cause before Metal generated shaders
8 年前
5d1327b6
HLSLcc: change out of bounds fix to use iNrCoarseLights-1 instead
8 年前
557acdfd
Merge branch 'master' into lowendmobile
# Conflicts:
# Assets/LowEndMobilePipeline/TestScenes/Materials.meta
# Assets/ScriptableRenderPipeline/Editor/MaterialUpgrader.cs
# Assets/TestScenes/HDTest/GraphicTest/LayeredTessellation/Material.meta
# Assets/TestScenes/HDTest/LayeredLitTest/Mesh/Materials.meta
8 年前
5f4bb2bf
unify with bigTileIdx code from lightlistbuild-clustered
8 年前
9f45311a
fix out of bounds issue
8 年前
8cc48cd7
Merge pull request #204 from Unity-Technologies/metal-ios
metal-ios
8 年前
0574ef6b
Merge branch 'master' into metal
8 年前
890606b0
HLSLcc: workaround NaN issue on iOS
8 年前
53b4031c
unify with bigTileIdx code from lightlistbuild-clustered
8 年前
e9a6b7ab
fix out of bounds issue
8 年前
eb5294a1
HLSLcc: workaround NaN issue on iOS
8 年前
79a9ba87
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
66e32153
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into batch_rendering
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderVariables.hlsl
# Assets/TestScenes/HDTest/GlobalIlluminationTest.unity
# ProjectSettings/EditorBuildSettings.asset
# ProjectSettings/ProjectVersion.txt
# ProjectSettings/QualitySettings.asset
8 年前
918c1797
Feature flags now also include material/gbuffer flags.
8 年前
f4536331
Revert "HLSLcc: workaround NaN issue on iOS"
This reverts commit abc4476086ed60a8004657d2b689e16e91576386.
8 年前
ed990060
Merge from upstream
8 年前
2a7a5a1b
explicitly handle square root of negative value scenario. Make sure the plane pair is identified as invalid.
8 年前
101239a7
Merge branch 'master' into metal-ios
8 年前
954a22ef
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ExportSky
8 年前
c46cb0b5
Merge branch 'master' into metal
8 年前
cfabde6f
Merge pull request #212 from Unity-Technologies/metal-ios
metal-ios
8 年前
2df09bda
Merge branch 'master' into metal
8 年前
08262cdc
Implement ZERO_INITIALIZE_ARRAY()
8 年前
097f384d
metal/ios: proper fix for out of bounds issue with g_vBigTileLightList
8 年前
b90e5b21
Revert "HLSLcc: workaround NaN issue on iOS"
This reverts commit abc4476086ed60a8004657d2b689e16e91576386.
8 年前
c17ae966
fixed ps4 shader compilation errors
8 年前
3a5b105e
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
c8ac52da
Merge pull request #215 from Unity-Technologies/metal-ios
metal-ios
8 年前
545f8b11
Merge branch 'master' into metal
8 年前
88ab5b8b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
8db09493
Merge branch 'master' into shadows
8 年前
6e428acc
Merge branch 'metal' into classicDeferredMobile
8 年前
abed39d7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
a011b30d
Merge pull request #220 from EvgeniiG/master
Implement projector lights
8 年前
ed55ce8f
HDRenderPipeline: Clean debgu settings
- Merge debugViewMaterial with Lightingdebug mode into a DisplayDebug
(less pass)
- Clean debug code, remove useless file
8 年前
d82162c7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into shadows
8 年前
c53cba39
Merge pull request #229 from Unity-Technologies/Clean-debug-settings
Clean debug settings
8 年前
8fa3ec78
less warped cluster distribution for 100% sky tile
less warped cluster distribution for 100% sky tile
8 年前
f961a56d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
42530415
Merge branch 'master'
7 年前
c31d6106
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Debug/DebugDisplay.cs
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.asset
7 年前
58f36f39
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl
7 年前
712ff1d3
Merge pull request #228 from Unity-Technologies/shadows
Update Shadows system
7 年前
0d763678
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
3a226917
merged master
7 年前
f27d26c4
Merge branch 'master' into Branch_Batching2
# Conflicts:
# Assets/TestScenes/HDTest/NewBatcherTest.meta
7 年前
36baac01
Revert "Local merge"
This reverts commit 05f9d2b94ae1d3a5f3e707ba4ad677e700a6fc55, reversing
changes made to f491bb59591c78736427ca92d2067f445f1630c5.
7 年前
9c290707
merge changes from remote to local branch
7 年前
sebastienlagarde
Sebastien Lagarde
Julien Ignace
Evgenii Golubev
Paul Demeulenaere
runes
runestubbe
mmikk
GitHub
Felipe Lira
Tim Cooper
Arnaud Carre
Antti Tapaninen
Chman
Arnaud Carré arnaud@unity3d.com
uygar
Rune Stubbe
vlad-andreev
Filip Iliescu
David Rogers