Merge branch 'main' into 'main'

Plus d'obstacles See merge request !83

Merge branch 'main' into 'main'
Plus d'obstacles See merge request !83
a85f8553 · GIRAULT COLIN · b40b9c5d · 675c36ae · a85f8553 · a85f8553
Commit a85f8553 authored 3 years ago by GIRAULT COLIN
--- a/T3-Unity/Assets/GoogleARCore/SDK/Materials/ARBackground.mat
+++ b/T3-Unity/Assets/GoogleARCore/SDK/Materials/ARBackground.mat
--- a/T3-Unity/Assets/GoogleARCore/SDK/Materials/ARBackground.mat.meta
+++ b/T3-Unity/Assets/GoogleARCore/SDK/Materials/ARBackground.mat.meta
--- a/T3-Unity/Assets/GoogleARCore/SDK/Materials/ARBackground.shader
+++ b/T3-Unity/Assets/GoogleARCore/SDK/Materials/ARBackground.shader
--- a/T3-Unity/Assets/GoogleARCore/SDK/Materials/ARBackground.shader.meta
+++ b/T3-Unity/Assets/GoogleARCore/SDK/Materials/ARBackground.shader.meta
--- a/T3-Unity/Assets/GoogleARCore/SDK/Plugins.meta
+++ b/T3-Unity/Assets/GoogleARCore/SDK/Plugins.meta
--- a/T3-Unity/Assets/GoogleARCore/SDK/Plugins/arcore_client.aar
+++ b/T3-Unity/Assets/GoogleARCore/SDK/Plugins/arcore_client.aar
--- a/T3-Unity/Assets/GoogleARCore/SDK/Plugins/arcore_client.aar.meta
+++ b/T3-Unity/Assets/GoogleARCore/SDK/Plugins/arcore_client.aar.meta
--- a/T3-Unity/Assets/GoogleARCore/SDK/Plugins/google_ar_optional.aar
+++ b/T3-Unity/Assets/GoogleARCore/SDK/Plugins/google_ar_optional.aar
--- a/T3-Unity/Assets/GoogleARCore/SDK/Plugins/google_ar_optional.aar.meta
+++ b/T3-Unity/Assets/GoogleARCore/SDK/Plugins/google_ar_optional.aar.meta
--- a/T3-Unity/Assets/GoogleARCore/SDK/Plugins/google_ar_required.aar
+++ b/T3-Unity/Assets/GoogleARCore/SDK/Plugins/google_ar_required.aar
--- a/T3-Unity/Assets/GoogleARCore/SDK/Plugins/google_ar_required.aar.meta
+++ b/T3-Unity/Assets/GoogleARCore/SDK/Plugins/google_ar_required.aar.meta
--- a/T3-Unity/Assets/GoogleARCore/SDK/Plugins/libarcore_unity_api.so
+++ b/T3-Unity/Assets/GoogleARCore/SDK/Plugins/libarcore_unity_api.so
--- a/T3-Unity/Assets/GoogleARCore/SDK/Plugins/libarcore_unity_api.so.meta
+++ b/T3-Unity/Assets/GoogleARCore/SDK/Plugins/libarcore_unity_api.so.meta
--- a/T3-Unity/Assets/GoogleARCore/SDK/Plugins/libarpresto_api.so
+++ b/T3-Unity/Assets/GoogleARCore/SDK/Plugins/libarpresto_api.so
--- a/T3-Unity/Assets/GoogleARCore/SDK/Plugins/libarpresto_api.so.meta
+++ b/T3-Unity/Assets/GoogleARCore/SDK/Plugins/libarpresto_api.so.meta
--- a/T3-Unity/Assets/GoogleARCore/SDK/Plugins/unityandroidpermissions.aar
+++ b/T3-Unity/Assets/GoogleARCore/SDK/Plugins/unityandroidpermissions.aar
--- a/T3-Unity/Assets/GoogleARCore/SDK/Plugins/unityandroidpermissions.aar.meta
+++ b/T3-Unity/Assets/GoogleARCore/SDK/Plugins/unityandroidpermissions.aar.meta
--- a/T3-Unity/Assets/GoogleARCore/SDK/Plugins/unitygar.aar
+++ b/T3-Unity/Assets/GoogleARCore/SDK/Plugins/unitygar.aar
--- a/T3-Unity/Assets/GoogleARCore/SDK/Plugins/unitygar.aar.meta
+++ b/T3-Unity/Assets/GoogleARCore/SDK/Plugins/unitygar.aar.meta
--- a/T3-Unity/Assets/GoogleARCore/SDK/Scripts.meta
+++ b/T3-Unity/Assets/GoogleARCore/SDK/Scripts.meta