Merge remote-tracking branch 'origin/steam-vr'

# Conflicts: # Assets/Imports.meta # Assets/Scripts/Client.cs
morsh · Jan 7, 2018 · 43b88c4 · 43b88c4
2 parents 3d52e3a + c462e64
commit 43b88c4
Show file tree

Hide file tree

Showing 771 changed files with 100,706 additions and 187 deletions.
diff --git a/Assets/Imports/LowPoly Environment Pack.meta b/Assets/Imports/LowPoly Environment Pack.meta
diff --git a/Assets/Imports/LowPoly Environment Pack/Demo.meta b/Assets/Imports/LowPoly Environment Pack/Demo.meta
diff --git a/Assets/Imports/LowPoly Environment Pack/Demo/Scene 1.meta b/Assets/Imports/LowPoly Environment Pack/Demo/Scene 1.meta
diff --git a/Assets/Imports/LowPoly Environment Pack/Demo/Scene 2.meta b/Assets/Imports/LowPoly Environment Pack/Demo/Scene 2.meta
diff --git a/Assets/Imports/LowPoly Environment Pack/Demo/Scene 3.meta b/Assets/Imports/LowPoly Environment Pack/Demo/Scene 3.meta
diff --git a/Assets/Imports/LowPoly Environment Pack/FBX.meta b/Assets/Imports/LowPoly Environment Pack/FBX.meta
diff --git a/Assets/Imports/LowPoly Environment Pack/FBX/Materials.meta b/Assets/Imports/LowPoly Environment Pack/FBX/Materials.meta
diff --git a/Assets/Imports/LowPoly Environment Pack/Prefabs.meta b/Assets/Imports/LowPoly Environment Pack/Prefabs.meta
diff --git a/Assets/Imports/PopupAsylum.meta b/Assets/Imports/PopupAsylum.meta
diff --git a/Assets/Imports/PopupAsylum/PA_CubeMaps.meta b/Assets/Imports/PopupAsylum/PA_CubeMaps.meta
diff --git a/Assets/Imports/PopupAsylum/PA_SciFiCombatants.meta b/Assets/Imports/PopupAsylum/PA_SciFiCombatants.meta
diff --git a/Assets/Imports/PopupAsylum/PA_SciFiCombatants/Textures.meta b/Assets/Imports/PopupAsylum/PA_SciFiCombatants/Textures.meta
diff --git a/Assets/Imports/PopupAsylum/PA_SciFiCombatants/Textures/Characters.meta b/Assets/Imports/PopupAsylum/PA_SciFiCombatants/Textures/Characters.meta
diff --git a/Assets/Imports/PopupAsylum/PA_SciFiCombatants/Textures/Vehicles.meta b/Assets/Imports/PopupAsylum/PA_SciFiCombatants/Textures/Vehicles.meta
diff --git a/Assets/Imports/PopupAsylum/PA_SciFiCombatants/_Imported3D.meta b/Assets/Imports/PopupAsylum/PA_SciFiCombatants/_Imported3D.meta
diff --git a/Assets/Imports/PopupAsylum/PA_SciFiCombatants/_Imported3D/Characters.meta b/Assets/Imports/PopupAsylum/PA_SciFiCombatants/_Imported3D/Characters.meta
diff --git a/Assets/Imports/PopupAsylum/PA_SciFiCombatants/_Imported3D/Characters/Materials.meta b/Assets/Imports/PopupAsylum/PA_SciFiCombatants/_Imported3D/Characters/Materials.meta
diff --git a/Assets/Imports/PopupAsylum/PA_SciFiCombatants/_Imported3D/Vehicles.meta b/Assets/Imports/PopupAsylum/PA_SciFiCombatants/_Imported3D/Vehicles.meta
diff --git a/Assets/Imports/PopupAsylum/PA_SciFiCombatants/_Imported3D/Vehicles/Materials.meta b/Assets/Imports/PopupAsylum/PA_SciFiCombatants/_Imported3D/Vehicles/Materials.meta