Commit ee30c93
committed
Merge branch 'release/v4.1.0-beta'
# Conflicts:
# Documentation~/manual/dynamicTile.md
# Documentation~/resources/manual/dynamicTile/tileImportConfig.png
# Documentation~/resources/manual/importCityModels/plateauWindowImport.png
# Editor/Addressables/AddressablesUtility.cs
# Editor/CityImport/CityImportConfigGUI.cs
# Editor/CityImport/PackageImportConfigGUIs/Components/DynamicTileConfigGUI.cs
# Editor/DynamicTile/DynamicTileExporter.cs
# Editor/DynamicTile/ImportToDynamicTile.cs
# Editor/DynamicTile/PLATEAUSceneViewCameraTracker.cs
# Editor/DynamicTile/PLATEAUTileManagerEditor.cs
# Editor/Window/Main/Tab/CityChangeActiveGui.cs
# Editor/Window/Main/Tab/ImportGuiParts/ImportButton.cs
# Plugins/Android/libplateau.so
# Plugins/Linux/x86_64/libplateau.so
# Plugins/MacOS/arm64/libOpenMeshCore.8.0.dylib
# Plugins/MacOS/arm64/libOpenMeshCore.dylib
# Plugins/MacOS/arm64/libOpenMeshTools.8.0.dylib
# Plugins/MacOS/arm64/libOpenMeshTools.dylib
# Plugins/MacOS/arm64/libplateau.dylib
# Plugins/MacOS/arm64/libz.1.2.13.dylib
# Plugins/MacOS/arm64/libz.1.dylib
# Plugins/MacOS/arm64/libz.dylib
# Plugins/MacOS/x86_64/libOpenMeshCore.8.0.dylib
# Plugins/MacOS/x86_64/libOpenMeshCore.dylib
# Plugins/MacOS/x86_64/libOpenMeshTools.8.0.dylib
# Plugins/MacOS/x86_64/libOpenMeshTools.dylib
# Plugins/MacOS/x86_64/libplateau.dylib
# Plugins/MacOS/x86_64/libz.1.2.13.dylib
# Plugins/MacOS/x86_64/libz.1.dylib
# Plugins/MacOS/x86_64/libz.dylib
# Plugins/Windows/x86_64/plateau.dll
# Plugins/iOS/plateau.framework/plateau
# Runtime/CityAdjust/ChangeActive/CityFilter.cs
# Runtime/DynamicTile/AddressableLoader.cs
# Runtime/DynamicTile/PLATEAUDynamicTileJobSystem.cs
# Runtime/DynamicTile/PLATEAUTileManager.cs
# Runtime/Util/RenderUtil.cs
# Tests/EditModeTests/TestDynamicTile/TestImportToDynamicTile.cs
# package.jsonFile tree
460 files changed
+23166
-2911
lines changed- Documentation~
- manual
- resources
- index
- manual
- accessCityObject
- cityAdjust
- dynamicTile
- exportCityModels
- importCityModels
- installation
- Editor
- AdjustModel
- CityImport
- PackageImportConfigGUIs
- Components
- Extendables
- Components
- CityInfo
- DynamicTile
- TileModule
- RoadNetwork
- AddSystem
- Intersection
- Road
- CodeGen
- EditingSystemSubMod
- SplineSystems
- EditingSystem
- Exporter
- Structure
- Tester
- TileAddressables
- Util
- Window
- Common
- Tile
- Main
- Tab
- AdjustGuiParts
- ImportGuiParts
- MaterialAdjustGui
- Parts
- RoadGUIParts
- TerrainConvertGui
- ProgressDisplay
- Materials
- Fallback/Triplanar
- Shader
- LodTriplanar
- Plugins
- Android
- Linux/x86_64
- MacOS
- arm64
- x86_64
- Windows/x86_64
- iOS
- plateau.framework
- Resources/PlateauUIDocument
- DynamicTile
- RoadNetwork
- Runtime
- CityAdjust
- AlignLand
- ChangeActive
- ConvertToAsset
- MaterialAdjust/Searcher
- NonLibData
- CityExport
- CityImport
- AreaSelector/Display/Windows
- Config
- PackageImportConfigs
- Import
- CityImportProcedure
- Convert
- CityInfo
- DynamicTile
- RoadAdjust
- RoadMarking
- RoadNetworkToMesh
- RoadNetwork
- CityObject
- Drawer
- Data
- Factory
- Graph
- Drawer
- Structure
- Tester
- Util
- TerrainConvert
- Util
- Tests
- EditModeTests
- TestDynamicTile
- TestMaterialAdjust
- RoadNetworkTest
- TestUtils
- libplateau/CSharpPLATEAU
- Basemap
- CityGML
- Dataset
- Geometries
- GranularityConvert
- HeightMapAlign
- Heightmap
- Interop
- MaterialAdjust
- MeshWriter
- Native
- Network
- PolygonMesh
- Texture
- Util
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
460 files changed
+23166
-2911
lines changed
0 commit comments