Merge branch 'main' of https://github.com/Netherlands3D/twin into fea…

…ture/jump-to-object # Conflicts: # Assets/_Application/Layers/LayerTypes/GeoJsonLayers/GeoJSONPointLayer.cs: used theirs # Assets/_Application/Utility/BoundingBox.cs: used theirs # Assets/_Functionalities/Wms/Scripts/WMSLayerGameObject.cs: used theirs
Netherlands3D · Feb 12, 2025 · 9f30c2b · 9f30c2b
2 parents c07401e + e08186f
commit 9f30c2b
Show file tree

Hide file tree

Showing 355 changed files with 22,457 additions and 12,247 deletions.
diff --git a/Assets/Animations/UI/Searchbar.meta b/Assets/Animations/UI/Searchbar.meta
diff --git a/Assets/Animations/UI/Searchbar/Panel.controller b/Assets/Animations/UI/Searchbar/Panel.controller
diff --git a/Assets/Animations/UI/Searchbar/Panel.controller.meta b/Assets/Animations/UI/Searchbar/Panel.controller.meta