Merge remote-tracking branch 'origin/develop' into mergeIntoGraphView
# Conflicts: # Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/TrackableWindow.cs # Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldAnchorWindow.cs # Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldLinkWindow.cs # Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldStorageWindow.cs # Assets/ETSI.ARF/ARF World Storage API/Materials.meta # UserSettings/Layouts/default-2021.dwlt # UserSettings/Search.settings
Showing
- Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/GraphEditorWindow.cs 22 additions, 14 deletions...ARF World Storage API/Editor/Windows/GraphEditorWindow.cs
- Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/TrackableWindow.cs 108 additions, 99 deletions...F/ARF World Storage API/Editor/Windows/TrackableWindow.cs
- Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldAnchorWindow.cs 96 additions, 82 deletions...ARF World Storage API/Editor/Windows/WorldAnchorWindow.cs
- Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldGraphWindow.cs 13 additions, 5 deletions.../ARF World Storage API/Editor/Windows/WorldGraphWindow.cs
- Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldGraphWindow.cs.meta 1 addition, 1 deletion...World Storage API/Editor/Windows/WorldGraphWindow.cs.meta
- Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldLinkWindow.cs 443 additions, 364 deletions...F/ARF World Storage API/Editor/Windows/WorldLinkWindow.cs
- Assets/ETSI.ARF/ARF World Storage API/Editor/Windows/WorldStorageWindow.cs 166 additions, 73 deletions...RF World Storage API/Editor/Windows/WorldStorageWindow.cs
- Assets/ETSI.ARF/ARF World Storage API/Editor/WorldStoragePrefabs.cs 36 additions, 0 deletions...I.ARF/ARF World Storage API/Editor/WorldStoragePrefabs.cs
- Assets/ETSI.ARF/ARF World Storage API/Editor/WorldStoragePrefabs.cs.meta 11 additions, 0 deletions.../ARF World Storage API/Editor/WorldStoragePrefabs.cs.meta
- Assets/ETSI.ARF/ARF World Storage API/Materials.meta 1 addition, 1 deletionAssets/ETSI.ARF/ARF World Storage API/Materials.meta
- Assets/ETSI.ARF/ARF World Storage API/Materials/blue.mat 80 additions, 0 deletionsAssets/ETSI.ARF/ARF World Storage API/Materials/blue.mat
- Assets/ETSI.ARF/ARF World Storage API/Materials/blue.mat.meta 8 additions, 0 deletions...ts/ETSI.ARF/ARF World Storage API/Materials/blue.mat.meta
- Assets/ETSI.ARF/ARF World Storage API/Materials/green.mat 80 additions, 0 deletionsAssets/ETSI.ARF/ARF World Storage API/Materials/green.mat
- Assets/ETSI.ARF/ARF World Storage API/Materials/green.mat.meta 8 additions, 0 deletions...s/ETSI.ARF/ARF World Storage API/Materials/green.mat.meta
- Assets/ETSI.ARF/ARF World Storage API/Materials/grey.mat 80 additions, 0 deletionsAssets/ETSI.ARF/ARF World Storage API/Materials/grey.mat
- Assets/ETSI.ARF/ARF World Storage API/Materials/grey.mat.meta 8 additions, 0 deletions...ts/ETSI.ARF/ARF World Storage API/Materials/grey.mat.meta
- Assets/ETSI.ARF/ARF World Storage API/Materials/red.mat 80 additions, 0 deletionsAssets/ETSI.ARF/ARF World Storage API/Materials/red.mat
- Assets/ETSI.ARF/ARF World Storage API/Materials/red.mat.meta 8 additions, 0 deletionsAssets/ETSI.ARF/ARF World Storage API/Materials/red.mat.meta
- Assets/ETSI.ARF/ARF World Storage API/Prefabs/ARFTrackable.prefab 835 additions, 0 deletions...TSI.ARF/ARF World Storage API/Prefabs/ARFTrackable.prefab
- Assets/ETSI.ARF/ARF World Storage API/Prefabs/ARFTrackable.prefab.meta 7 additions, 0 deletions...RF/ARF World Storage API/Prefabs/ARFTrackable.prefab.meta
Loading
Please register or sign in to comment