Merge pull request #280 from Amsterdam/release/2.6.0

Release/2.6.0
Amsterdam · Jul 13, 2021 · 6d78ca5 · 6d78ca5
2 parents b7834df + 0c4a5a3
commit 6d78ca5
Show file tree

Hide file tree

Showing 161 changed files with 3,726 additions and 2,606 deletions.
diff --git a/3DAmsterdam/Assets/3DAmsterdam/Prefabs/AssetGeneration/ProgressPreviewMap.prefab b/3DAmsterdam/Assets/3DAmsterdam/Prefabs/AssetGeneration/ProgressPreviewMap.prefab
diff --git a/...erlands3D/Prefabs/Traffic/Car.prefab.meta → ...Generation/ProgressPreviewMap.prefab.meta b/...erlands3D/Prefabs/Traffic/Car.prefab.meta → ...Generation/ProgressPreviewMap.prefab.meta
diff --git a/3DAmsterdam/Assets/3DAmsterdam/Scenes/3DAmsterdam.unity b/3DAmsterdam/Assets/3DAmsterdam/Scenes/3DAmsterdam.unity
diff --git a/3DAmsterdam/Assets/3DAmsterdam/Scenes/DataGeneration/GenerateBuildingTilesFromGeoJSON.unity b/3DAmsterdam/Assets/3DAmsterdam/Scenes/DataGeneration/GenerateBuildingTilesFromGeoJSON.unity
diff --git a/3DAmsterdam/Assets/3DAmsterdam/Scenes/DataGeneration/GenerateBuildingTilesFromOBJ.unity b/3DAmsterdam/Assets/3DAmsterdam/Scenes/DataGeneration/GenerateBuildingTilesFromOBJ.unity
diff --git a/3DAmsterdam/Assets/3DAmsterdam/Scenes/DataGeneration/GenerateTreeTiles.unity b/3DAmsterdam/Assets/3DAmsterdam/Scenes/DataGeneration/GenerateTreeTiles.unity
diff --git a/3DAmsterdam/Assets/3DAmsterdam/Scripts/AssetGeneration/Trees/GenerateTreeData.cs.meta b/3DAmsterdam/Assets/3DAmsterdam/Scripts/AssetGeneration/Trees/GenerateTreeData.cs.meta
diff --git a/.../3DAmsterdam/Scripts/AssetGeneration.meta → ...sets/Netherlands3D/Animations/Vissim.meta b/.../3DAmsterdam/Scripts/AssetGeneration.meta → ...sets/Netherlands3D/Animations/Vissim.meta
diff --git a/...rlands3D/Prefabs/Traffic/Human.controller → ...ands3D/Animations/Vissim/Human.controller b/...rlands3D/Prefabs/Traffic/Human.controller → ...ands3D/Animations/Vissim/Human.controller
diff --git a/...s3D/Prefabs/Traffic/Human.controller.meta → ...D/Animations/Vissim/Human.controller.meta b/...s3D/Prefabs/Traffic/Human.controller.meta → ...D/Animations/Vissim/Human.controller.meta
diff --git a/3DAmsterdam/Assets/Netherlands3D/Models/Traffic/BasicTruck.fbx b/3DAmsterdam/Assets/Netherlands3D/Models/Traffic/BasicTruck.fbx
diff --git a/3DAmsterdam/Assets/Netherlands3D/Models/Traffic/BasicTruck.fbx.meta b/3DAmsterdam/Assets/Netherlands3D/Models/Traffic/BasicTruck.fbx.meta