Commit graph

4 commits

Author SHA1 Message Date
Chikashi Miyama
17b4217ce4 implement #136 2019-12-12 17:48:03 +01:00
Chikashi Miyama
e2c873d099 Merge branch 'refs/heads/master' into Azure_Integration_RenderBuffer
# Conflicts:
#	UnityProject/Assembly-CSharp-Editor.csproj
#	UnityProject/Assembly-CSharp.csproj
#	UnityProject/Assets/Scenes/Examples/Azure.meta
#	UnityProject/Assets/Scenes/Examples/Azure/AzureDemo.unity
#	UnityProject/Assets/Scenes/Examples/Azure/AzureDemo.unity.meta
#	UnityProject/Assets/Scripts/UnitTest.meta
#	UnityProject/Assets/ThridParty/Assets/Construction_Site_Column/Materials.meta
2019-12-12 13:18:26 +01:00
Chikashi Miyama
ddf8b0b70c update AzureDemo scene 2019-12-12 13:16:29 +01:00
Chikashi Miyama
fcf5152f6b add Native Plugins for Kinect stolen from Keijiro 2019-12-12 11:43:44 +01:00