Merge branch 'main' into 'main' (a85f8553) · Commits · The Pain de Mii / TheLegendOfSimon_LAS21_T3_D

Commit a85f8553 authored 3 years ago by

GIRAULT COLIN

Merge branch 'main' into 'main'

Plus d'obstacles

See merge request !83

parents b40b9c5d 675c36ae

1 merge request!83Plus d'obstacles

Hide whitespace changes

Inline Side-by-side

Showing

T3-Unity/Assets/Scripts/Obstacle/GoogleARCore/SDK/Scripts/TrackedPointOrientationMode.cs 0 additions, 0 deletions

...e/GoogleARCore/SDK/Scripts/TrackedPointOrientationMode.cs
T3-Unity/Assets/Scripts/Obstacle/GoogleARCore/SDK/Scripts/TrackedPointOrientationMode.cs.meta 0 additions, 0 deletions

...gleARCore/SDK/Scripts/TrackedPointOrientationMode.cs.meta
T3-Unity/Assets/Scripts/Obstacle/GoogleARCore/SDK/Scripts/TrackingState.cs 0 additions, 0 deletions

...cripts/Obstacle/GoogleARCore/SDK/Scripts/TrackingState.cs
T3-Unity/Assets/Scripts/Obstacle/GoogleARCore/SDK/Scripts/TrackingState.cs.meta 0 additions, 0 deletions

...s/Obstacle/GoogleARCore/SDK/Scripts/TrackingState.cs.meta
T3-Unity/Assets/Scripts/Obstacle/GoogleARCore/SDK/Scripts/Utility.meta 0 additions, 0 deletions

...ts/Scripts/Obstacle/GoogleARCore/SDK/Scripts/Utility.meta
T3-Unity/Assets/Scripts/Obstacle/GoogleARCore/SDK/Scripts/Utility/ARCoreProjectSettings.cs 0 additions, 0 deletions

...GoogleARCore/SDK/Scripts/Utility/ARCoreProjectSettings.cs
T3-Unity/Assets/Scripts/Obstacle/GoogleARCore/SDK/Scripts/Utility/ARCoreProjectSettings.cs.meta 0 additions, 0 deletions

...eARCore/SDK/Scripts/Utility/ARCoreProjectSettings.cs.meta
T3-Unity/Assets/Scripts/Obstacle/GoogleARCore/SDK/Scripts/Utility/ARDebug.cs 0 additions, 0 deletions

...ipts/Obstacle/GoogleARCore/SDK/Scripts/Utility/ARDebug.cs
T3-Unity/Assets/Scripts/Obstacle/GoogleARCore/SDK/Scripts/Utility/ARDebug.cs.meta 0 additions, 0 deletions

...Obstacle/GoogleARCore/SDK/Scripts/Utility/ARDebug.cs.meta
T3-Unity/Assets/Scripts/Obstacle/GoogleARCore/SDK/Scripts/Utility/ConversionHelper.cs 0 additions, 0 deletions

...acle/GoogleARCore/SDK/Scripts/Utility/ConversionHelper.cs
T3-Unity/Assets/Scripts/Obstacle/GoogleARCore/SDK/Scripts/Utility/ConversionHelper.cs.meta 0 additions, 0 deletions

...GoogleARCore/SDK/Scripts/Utility/ConversionHelper.cs.meta
T3-Unity/Assets/Scripts/Obstacle/GoogleARCore/SDK/Scripts/Utility/IntPtrEqualityComparer.cs 0 additions, 0 deletions

...oogleARCore/SDK/Scripts/Utility/IntPtrEqualityComparer.cs
T3-Unity/Assets/Scripts/Obstacle/GoogleARCore/SDK/Scripts/Utility/IntPtrEqualityComparer.cs.meta 0 additions, 0 deletions

...ARCore/SDK/Scripts/Utility/IntPtrEqualityComparer.cs.meta
T3-Unity/Assets/Scripts/Obstacle/GoogleARCore/SDK/Scripts/Utility/MarshalingHelper.cs 0 additions, 0 deletions

...acle/GoogleARCore/SDK/Scripts/Utility/MarshalingHelper.cs
T3-Unity/Assets/Scripts/Obstacle/GoogleARCore/SDK/Scripts/Utility/MarshalingHelper.cs.meta 0 additions, 0 deletions

...GoogleARCore/SDK/Scripts/Utility/MarshalingHelper.cs.meta
T3-Unity/Assets/Scripts/Obstacle/Medium.meta 8 additions, 0 deletions

T3-Unity/Assets/Scripts/Obstacle/Medium.meta
T3-Unity/Assets/Scripts/Obstacle/Medium/DragDropM.cs 0 additions, 0 deletions

T3-Unity/Assets/Scripts/Obstacle/Medium/DragDropM.cs
T3-Unity/Assets/Scripts/Obstacle/Medium/DragDropM.cs.meta 0 additions, 0 deletions

T3-Unity/Assets/Scripts/Obstacle/Medium/DragDropM.cs.meta
T3-Unity/Assets/Scripts/Obstacle/Medium/midObj.cs 4 additions, 7 deletions

T3-Unity/Assets/Scripts/Obstacle/Medium/midObj.cs
T3-Unity/Assets/Scripts/Obstacle/Medium/midObj.cs.meta 0 additions, 0 deletions

T3-Unity/Assets/Scripts/Obstacle/Medium/midObj.cs.meta

with 12 additions and 7 deletions

Please register or to comment

Admin message

Merge branch 'main' into 'main'