Merge branch 'master' of git@ooftooft.net:Racesm.git

# Conflicts: # Assets/Images/Car Icons.meta # Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta # Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta # Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta # Assets/Imported Assets/Toon Vehicles/Textures/Gradient/Materials.meta # Assets/ML-Agents/Timers/SampleScene_timers.json.meta
2024-04-23 08:26:25 +02:00
parent 6e9746bd84 e3c6bd1fd6
commit efbffea201
68 changed files with 12437 additions and 1706 deletions
--- a/Assets/Images/Car
+++ b/Assets/Images/Car
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+<<<<<<< HEAD:Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta
+guid: d884527f3e242c144af52b11faf49d2f
+=======
+guid: d5d570160164b804ca24a36b21a621db
+folderAsset: yes
+>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92:Assets/Images/Car Icons.meta
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Images/Car
+++ b/Assets/Images/Car
--- a/Icons/Bolide.png.meta
+++ b/Icons/Bolide.png.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 081e2e6756dd63b4da0ea5c0d0a73972
+guid: b74ee83b36b954044aed9332321f66be
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
--- a/Icons/Bulldozer.png
+++ b/Icons/Bulldozer.png
--- a/Icons/Bulldozer.png.meta
+++ b/Icons/Bulldozer.png.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: aee6d7ce19a5384479b2837651bda9e5
+guid: bc45b3f878c58934aa02c44b1a43152b
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
--- a/Assets/Images/Car
+++ b/Assets/Images/Car
--- a/Assets/Images/Hotrod
+++ b/Assets/Images/Hotrod
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ec368240f49fcae40b7c54df6b33905a
+guid: f5d43c43a19fe1b4bae07ff327553e19
 TextureImporter:
  internalIDToNameTable: []
  externalObjects: {}
--- a/Assets/Images/Car
+++ b/Assets/Images/Car
--- a/Icons/Coupe.png.meta
+++ b/Icons/Coupe.png.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 92da0f05eba4eda418494dd3fcb30883
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Images/Car
+++ b/Assets/Images/Car
--- a/Icons/Hotrod.png.meta
+++ b/Icons/Hotrod.png.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: a852bac068f412a45b306dfdfe6c3d7a
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Images/Car
+++ b/Assets/Images/Car
--- a/Assets/Images/Car
+++ b/Assets/Images/Car
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 08c9eaf42c6f43146ad704dc9aee9706
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Images/Car
+++ b/Assets/Images/Car
--- a/Assets/Images/Car
+++ b/Assets/Images/Car
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 998d105eb3c9f5241bb26003959bf217
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Icons/Sportscar.png
+++ b/Icons/Sportscar.png
--- a/Icons/Sportscar.png.meta
+++ b/Icons/Sportscar.png.meta
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: cd4aaa21a95accf42bb798c4386a49a5
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Images/Ford
+++ b/Assets/Images/Ford
--- a/Assets/Images/Hotrod
+++ b/Assets/Images/Hotrod
--- a/Assets/Images/Racecar
+++ b/Assets/Images/Racecar
--- a/Assets/Images/rounded
+++ b/Assets/Images/rounded
--- a/Assets/Images/rounded
+++ b/Assets/Images/rounded
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 7be92b3aae2b7f74ab79a1b447d6096d
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Images/rounded
+++ b/Assets/Images/rounded
--- a/Assets/Images/rounded
+++ b/Assets/Images/rounded
@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 61583fba956632548911dbe60ba47876
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 50, y: 38, z: 50, w: 38}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Free/URP_Support/URP/URP_Standard.unitypackage.meta
+++ b/Free/URP_Support/URP/URP_Standard.unitypackage.meta
@@ -1,5 +1,10 @@
 fileFormatVersion: 2
+<<<<<<< HEAD:Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta
 guid: d884527f3e242c144af52b11faf49d2f
+=======
+guid: d5d570160164b804ca24a36b21a621db
+folderAsset: yes
+>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92:Assets/Images/Car Icons.meta
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Vehicles/Textures/Gradient/Materials.meta
+++ b/Vehicles/Textures/Gradient/Materials.meta
@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+<<<<<<< HEAD:Assets/ML-Agents/Timers/SampleScene_timers.json.meta
+guid: 4af2646cae3014146bf467e2830fdb41
+TextScriptImporter:
+=======
+guid: 27000db5eaa3d9f42bceff430c265d3a
+folderAsset: yes
+DefaultImporter:
+>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92:Assets/Imported Assets/Toon Vehicles/Textures/Gradient/Materials.meta
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Vehicles/Textures/Gradient/Materials/Cars_Brown.mat
+++ b/Vehicles/Textures/Gradient/Materials/Cars_Brown.mat
@@ -0,0 +1,83 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Cars_Brown
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: ca28738c9bb529d44804712168c509aa, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Vehicles/Textures/Gradient/Materials/Cars_Brown.mat.meta
+++ b/Vehicles/Textures/Gradient/Materials/Cars_Brown.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fdabfe92806808b45be055f239fe1f46
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Vehicles/Textures/Gradient/Materials/Cars_Green.mat
+++ b/Vehicles/Textures/Gradient/Materials/Cars_Green.mat
@@ -0,0 +1,83 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Cars_Green
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 7b8dd4079f9cf7f4093038ebf7b484fb, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Vehicles/Textures/Gradient/Materials/Cars_Green.mat.meta
+++ b/Vehicles/Textures/Gradient/Materials/Cars_Green.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 12fe0ce9f81b25545b90f82f8be8be2a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Vehicles/Textures/Gradient/Materials/Cars_Pink.mat
+++ b/Vehicles/Textures/Gradient/Materials/Cars_Pink.mat
@@ -0,0 +1,83 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Cars_Pink
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 055417cd5c295ae48aaf7b65f6fc4787, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Vehicles/Textures/Gradient/Materials/Cars_Pink.mat.meta
+++ b/Vehicles/Textures/Gradient/Materials/Cars_Pink.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d43d711f3f92f854eb418bb281e0566b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Vehicles/Textures/Gradient/Materials/Cars_Red.mat
+++ b/Vehicles/Textures/Gradient/Materials/Cars_Red.mat
@@ -0,0 +1,83 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Cars_Red
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 3d1bc6a733e680946b9870f94679a5e5, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Vehicles/Textures/Gradient/Materials/Cars_Red.mat.meta
+++ b/Vehicles/Textures/Gradient/Materials/Cars_Red.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 04d47d25451a2934da3f11280512296c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Vehicles/Textures/Gradient/Materials/Cars_Turquoise.mat
+++ b/Vehicles/Textures/Gradient/Materials/Cars_Turquoise.mat
@@ -0,0 +1,83 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Cars_Turquoise
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 1cb1744de7276b44c9e3906d4a60bc63, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Vehicles/Textures/Gradient/Materials/Cars_Turquoise.mat.meta
+++ b/Vehicles/Textures/Gradient/Materials/Cars_Turquoise.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b9e8fcb3edf205946bf85713df30c959
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Vehicles/Textures/Gradient/Materials/Cars_Yellow.mat
+++ b/Vehicles/Textures/Gradient/Materials/Cars_Yellow.mat
@@ -0,0 +1,83 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Cars_Yellow
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: a6999a5e567847b41bbde95826981b6b, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Vehicles/Textures/Gradient/Materials/Cars_Yellow.mat.meta
+++ b/Vehicles/Textures/Gradient/Materials/Cars_Yellow.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b79cdb937d236eb4fbc3f1dc6c9e2ddd
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/ML-Agents/Timers/SampleScene_timers.json.meta
+++ b/Assets/ML-Agents/Timers/SampleScene_timers.json.meta
@@ -1,6 +1,17 @@
 fileFormatVersion: 2
+<<<<<<< HEAD
+<<<<<<< HEAD:Assets/ML-Agents/Timers/SampleScene_timers.json.meta
 guid: 4af2646cae3014146bf467e2830fdb41
 TextScriptImporter:
+=======
+guid: 27000db5eaa3d9f42bceff430c265d3a
+folderAsset: yes
+DefaultImporter:
+>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92:Assets/Imported Assets/Toon Vehicles/Textures/Gradient/Materials.meta
+=======
+guid: 346e9f2550a219244aeff3bf857e8b41
+TextScriptImporter:
+>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/customization.meta
+++ b/customization.meta
@@ -0,0 +1,13 @@
+fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Prefabs/Car customization.meta
+guid: 06c76d9728f1db14598bbfc2175cb70e
+folderAsset: yes
+DefaultImporter:
+========
+guid: b5b5c324d550ebe44ae0860419d225e3
+PrefabImporter:
+>>>>>>>> 7cdc6e8c07b0d585e75b23eb21c129711d524f3c:Assets/Prefabs/Towers.prefab.meta
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/customization/Hotrod
+++ b/customization/Hotrod
@@ -0,0 +1,455 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1416994316725918661
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6501708300074551286}
+  - component: {fileID: 1813117750399512623}
+  m_Layer: 0
+  m_Name: Directional Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6501708300074551286
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1416994316725918661}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 5, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4396357477850336864}
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!108 &1813117750399512623
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1416994316725918661}
+  m_Enabled: 1
+  serializedVersion: 10
+  m_Type: 0
+  m_Shape: 0
+  m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
+  m_Intensity: 8
+  m_Range: 10
+  m_SpotAngle: 30
+  m_InnerSpotAngle: 2
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 0
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+    m_CullingMatrixOverride:
+      e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    m_UseCullingMatrixOverride: 0
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingLayerMask: 1
+  m_Lightmapping: 2
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_UseBoundingSphereOverride: 0
+  m_UseViewFrustumForShadowCasterCull: 1
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
+--- !u!1 &5471432146962600635
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4396357477850336864}
+  m_Layer: 0
+  m_Name: Hotrod garage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4396357477850336864
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5471432146962600635}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8970651488343915553}
+  - {fileID: 2027150768681671473}
+  - {fileID: 8010156301291418612}
+  - {fileID: 6501708300074551286}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &7539952653933852043
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8010156301291418612}
+  - component: {fileID: 1680591503361447837}
+  m_Layer: 0
+  m_Name: Camera
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8010156301291418612
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7539952653933852043}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.17364816, y: -0, z: -0, w: 0.9848078}
+  m_LocalPosition: {x: 0, y: 1.000505, z: -1.9979231}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4396357477850336864}
+  m_LocalEulerAnglesHint: {x: 20, y: 0, z: 0}
+--- !u!20 &1680591503361447837
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7539952653933852043}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 1
+  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_Iso: 200
+  m_ShutterSpeed: 0.005
+  m_Aperture: 16
+  m_FocusDistance: 10
+  m_FocalLength: 50
+  m_BladeCount: 5
+  m_Curvature: {x: 2, y: 11}
+  m_BarrelClipping: 0.25
+  m_Anamorphism: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: 0.3
+  far clip plane: 1000
+  field of view: 55.301594
+  orthographic: 0
+  orthographic size: 5
+  m_Depth: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 3
+  m_HDR: 1
+  m_AllowMSAA: 1
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 1
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!1 &8413941805919799639
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8970651488343915553}
+  - component: {fileID: 5771503860802144587}
+  - component: {fileID: 5718242486756199040}
+  - component: {fileID: 6245290961355215493}
+  m_Layer: 0
+  m_Name: Cylinder
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8970651488343915553
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8413941805919799639}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 5, y: 0.01, z: 5}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4396357477850336864}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &5771503860802144587
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8413941805919799639}
+  m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &5718242486756199040
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8413941805919799639}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 9d6913bc815c98847b3f5446ba52a72e, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!136 &6245290961355215493
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8413941805919799639}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Radius: 0.5000001
+  m_Height: 2
+  m_Direction: 1
+  m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697}
+--- !u!1001 &6276767506931661672
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 4396357477850336864}
+    m_Modifications:
+    - target: {fileID: 3239213433477781764, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+      propertyPath: m_Constraints
+      value: 112
+      objectReference: {fileID: 0}
+    - target: {fileID: 3239213433477781764, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+      propertyPath: m_IsKinematic
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.01
+      objectReference: {fileID: 0}
+    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.34202018
+      objectReference: {fileID: 0}
+    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.9396927
+      objectReference: {fileID: 0}
+    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 140
+      objectReference: {fileID: 0}
+    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5711380006811689493, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+      propertyPath: m_Name
+      value: Hotrod
+      objectReference: {fileID: 0}
+    m_RemovedComponents:
+    - {fileID: 5418785709807611868, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+    - {fileID: 3239213433477781764, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+    m_RemovedGameObjects:
+    - {fileID: 5980600979410270282, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+    - {fileID: 8790375192439221064, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+    - {fileID: 7302242925535239009, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+    - {fileID: 3310781390057679429, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+    - {fileID: 7906150893989788378, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 5711380006811689493, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 6692659148362127303}
+  m_SourcePrefab: {fileID: 100100000, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+--- !u!1 &432052737111161349 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5973316160603472237, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+  m_PrefabInstance: {fileID: 6276767506931661672}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &1754551253132073341 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5711380006811689493, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+  m_PrefabInstance: {fileID: 6276767506931661672}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &6692659148362127303
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1754551253132073341}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0ee5992a8d68a894cba0612b0c18c3db, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  materialParts:
+  - {fileID: 4522219978994262219}
+  - {fileID: 4991787881391760290}
+  - {fileID: 8458950456673008156}
+  - {fileID: 2859228255262882056}
+  - {fileID: 432052737111161349}
+  defaultColors:
+  - {fileID: 2100000, guid: aa4a216a2af73e349a061c3b08f04fca, type: 2}
+  - {fileID: 2100000, guid: 860d6251349fddd48b946fcba9793104, type: 2}
+  - {fileID: 2100000, guid: 860d6251349fddd48b946fcba9793104, type: 2}
+  - {fileID: 2100000, guid: 860d6251349fddd48b946fcba9793104, type: 2}
+  - {fileID: 2100000, guid: 860d6251349fddd48b946fcba9793104, type: 2}
+--- !u!4 &2027150768681671473 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+  m_PrefabInstance: {fileID: 6276767506931661672}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2859228255262882056 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8121549483450565216, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+  m_PrefabInstance: {fileID: 6276767506931661672}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &4522219978994262219 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7627314183742200739, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+  m_PrefabInstance: {fileID: 6276767506931661672}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &4991787881391760290 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1323471614491531466, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+  m_PrefabInstance: {fileID: 6276767506931661672}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &8458950456673008156 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2485903799768531316, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
+  m_PrefabInstance: {fileID: 6276767506931661672}
+  m_PrefabAsset: {fileID: 0}
--- a/customization/Hotrod
+++ b/customization/Hotrod
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 72f36551c0bfff14fa73ab0c8bb3b28f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Towers.prefab.meta
+++ b/Assets/Prefabs/Towers.prefab.meta
@@ -1,6 +1,12 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Prefabs/Car customization.meta
+guid: 63afb34a2c116fe498ae42967d35d805
+folderAsset: yes
+DefaultImporter:
+========
 guid: b5b5c324d550ebe44ae0860419d225e3
 PrefabImporter:
+>>>>>>>> 7cdc6e8c07b0d585e75b23eb21c129711d524f3c:Assets/Prefabs/Towers.prefab.meta
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/Customization.unity
+++ b/Customization.unity
--- a/Assets/Scenes/mini_racetrack3.unity
+++ b/Assets/Scenes/mini_racetrack3.unity
@@ -38,7 +38,7 @@ RenderSettings:
  m_ReflectionIntensity: 1
  m_CustomReflection: {fileID: 0}
  m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.29684305, g: 0.63376737, b: 0.9937157, a: 1}
+  m_IndirectSpecularColor: {r: 0.29684302, g: 0.6337671, b: 0.9937157, a: 1}
  m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -123,6 +123,11 @@ NavMeshSettings:
    debug:
      m_Flags: 0
  m_NavMeshData: {fileID: 0}
+--- !u!4 &50605733 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+  m_PrefabInstance: {fileID: 993115565}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &507129824
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -133,7 +138,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 2.5158076
+      value: 0.8158076
      objectReference: {fileID: 0}
    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalPosition.y
@@ -141,23 +146,23 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 5.4411907
+      value: 63.561188
      objectReference: {fileID: 0}
    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.97014254
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0.24253564
+      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0.97014254
      objectReference: {fileID: 0}
    - target: {fileID: 320316327550477191, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalRotation.z
-      value: -0
+      value: -0.24253564
      objectReference: {fileID: 0}
    - target: {fileID: 679652745285801860, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: field of view
@@ -217,7 +222,7 @@ PrefabInstance:
      objectReference: {fileID: 923696411}
    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 2.5158076
+      value: 0.8158076
      objectReference: {fileID: 0}
    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalPosition.y
@@ -225,23 +230,23 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 5.4411907
+      value: 63.561188
      objectReference: {fileID: 0}
    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.97014254
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0.24253564
+      value: -0
      objectReference: {fileID: 0}
    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0.97014254
      objectReference: {fileID: 0}
    - target: {fileID: 8890610309520933432, guid: 80c5f8bcfe7e033419638b39d9a278c4, type: 3}
      propertyPath: m_LocalRotation.z
-      value: -0
+      value: -0.24253564
      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
@@ -258,7 +263,7 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 0
+      value: -1.7
      objectReference: {fileID: 0}
    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
      propertyPath: m_LocalPosition.y
@@ -266,11 +271,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 0
+      value: 55.12
      objectReference: {fileID: 0}
    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 1
+      value: 0
      objectReference: {fileID: 0}
    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
      propertyPath: m_LocalRotation.x
@@ -278,7 +283,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
      propertyPath: m_LocalRotation.z
@@ -290,7 +295,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
+      value: 180
      objectReference: {fileID: 0}
    - target: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
@@ -310,6 +315,152 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 5420764024659664985, guid: 5851f609a58dc884a99030da0105c6db, type: 3}
  m_PrefabInstance: {fileID: 923696410}
  m_PrefabAsset: {fileID: 0}
+--- !u!1001 &993115565
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2315850889160409376, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 2315850889160409376, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 2315850889160409376, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -4.0000005
+      objectReference: {fileID: 0}
+    - target: {fileID: 6776445221154225130, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_Name
+      value: Towers
+      objectReference: {fileID: 0}
+    - target: {fileID: 9003798636308242673, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -9.000002
+      objectReference: {fileID: 0}
+    - target: {fileID: 9003798636308242673, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9003798636308242673, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -9.75
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 2161611741186629825, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1500534166}
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 63afb34a2c116fe498ae42967d35d805, type: 3}
+--- !u!1001 &1500534165
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 50605733}
+    m_Modifications:
+    - target: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 5.16
+      objectReference: {fileID: 0}
+    - target: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 4.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -2.1699998
+      objectReference: {fileID: 0}
+    - target: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.70710677
+      objectReference: {fileID: 0}
+    - target: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5525295603368428666, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+      propertyPath: m_Name
+      value: ComPlaneV1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+--- !u!4 &1500534166 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5180858929285816000, guid: f6d4109da7a8fb14598e335baed19ec6, type: 3}
+  m_PrefabInstance: {fileID: 1500534165}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &1903297572
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -406,3 +557,4 @@ SceneRoots:
  - {fileID: 1903297572}
  - {fileID: 507129824}
  - {fileID: 923696410}
+  - {fileID: 993115565}
--- a/Assets/Scripts/Car
+++ b/Assets/Scripts/Car
@@ -1,29 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class CarCustomizationCamera : MonoBehaviour
-{
-    new Transform transform;
-    public Transform car;
-    public float rotateSpeed;
-    public Vector3 startPosition;
-    public Quaternion startRotation;
-    // Start is called before the first frame update
-    void Start()
-    {
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-        transform.LookAt(car);
-        transform.position += transform.right * Time.deltaTime * rotateSpeed;
-    }
-
-    private void OnEnable() {
-        transform = GetComponent<Transform>();
-        transform.position = startPosition;
-        transform.rotation = startRotation;
-    }
-}
--- a/Customization.meta
+++ b/Customization.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 95551c0cc76300044b242a09b1bbc0ef
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Customization/Change
+++ b/Customization/Change
@@ -0,0 +1,33 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+
+public class ChangeCarColor : MonoBehaviour
+{
+    public GameObject[] materialParts;
+    public Material[] defaultColors;
+    // Start is called before the first frame update
+
+    private void OnEnable() {
+
+        for (int i = 0; i < materialParts.Count(); i++)
+        {
+            GameObject part = materialParts[i];
+            Material color = defaultColors[i];
+            MeshRenderer renderer = part.GetComponent<MeshRenderer>();
+
+            renderer.material = color;
+
+        }
+    }
+
+    public void ChangeColor(Material color)
+    {
+        foreach (GameObject part in materialParts)
+        {
+            MeshRenderer renderer = part.GetComponent<MeshRenderer>();
+            renderer.material = color;
+        }
+    }
+}
--- a/Customization/Change
+++ b/Customization/Change
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cc607b4c1721b87489346376014622d5
+guid: 0ee5992a8d68a894cba0612b0c18c3db
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
--- a/Customization/Garage.cs
+++ b/Customization/Garage.cs
@@ -0,0 +1,176 @@
+using System.Collections;
+using System.Collections.Generic;
+using Unity.Mathematics;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Garage : MonoBehaviour
+{
+    GameObject CurrentCar;
+    public Button[] CarButtons;
+    public GameObject[] Garages;
+    public GameObject[] CarBodies;
+    public Button[] ColorButtons;
+    public Material[] Colors;
+    quaternion currentRotation;
+    void Start()
+    {
+        CarButtons[0].onClick.AddListener(SelectHotrod);
+        CarButtons[1].onClick.AddListener(SelectCoupe);
+        CarButtons[2].onClick.AddListener(SelectBolide);
+        CarButtons[3].onClick.AddListener(SelectIcecreamTruck);
+        CarButtons[4].onClick.AddListener(SelectSportscar);
+        CarButtons[5].onClick.AddListener(SelectSchoolBus);
+        CarButtons[6].onClick.AddListener(SelectBulldozer);
+        CarButtons[7].onClick.AddListener(SelectPicupTruck);
+
+        ColorButtons[0].onClick.AddListener(SelectBlack);
+        ColorButtons[1].onClick.AddListener(SelectBlue);
+        ColorButtons[2].onClick.AddListener(SelectBrown);
+        ColorButtons[3].onClick.AddListener(SelectGray);
+        ColorButtons[4].onClick.AddListener(SelectGreen);
+        ColorButtons[5].onClick.AddListener(SelectOrange);
+        ColorButtons[6].onClick.AddListener(SelectPink);
+        ColorButtons[7].onClick.AddListener(SelectRed);
+        ColorButtons[8].onClick.AddListener(SelectTurquoise);
+        ColorButtons[9].onClick.AddListener(SelectViolet);
+        ColorButtons[10].onClick.AddListener(SelectWhite);
+        ColorButtons[11].onClick.AddListener(SelectYellow);
+
+        disable();
+        SelectHotrod();
+    }
+
+    private void FixedUpdate() {
+        CurrentCar.transform.eulerAngles += Vector3.up * 0.7f;
+        currentRotation = CurrentCar.transform.rotation;
+    }
+
+    void disable()
+    {
+        foreach (GameObject carGarage in Garages)
+        {
+            carGarage.SetActive(false);
+        }
+    }
+
+    void SelectCar(int i)
+    {
+        disable();
+        Garages[i].SetActive(true);
+        CurrentCar = CarBodies[i];
+        CurrentCar.transform.rotation = currentRotation;
+    }
+
+    void SelectHotrod()
+    {
+        SelectCar(0);
+    }
+
+    void SelectCoupe()
+    {
+        SelectCar(1);
+    }
+
+    void SelectBolide()
+    {
+        SelectCar(2);
+    }
+
+    void SelectIcecreamTruck()
+    {
+        SelectCar(3);
+    }
+
+    void SelectSportscar()
+    {
+        SelectCar(4);
+    }
+
+    void SelectSchoolBus()
+    {
+        SelectCar(5);
+    }
+
+    void SelectBulldozer()
+    {
+        SelectCar(6);
+    }
+
+    void SelectPicupTruck()
+    {
+        SelectCar(7);
+    }
+
+    void SelectBlack()
+    {
+        Material color = Colors[0];
+        CurrentCar.GetComponent<ChangeCarColor>().ChangeColor(color);
+    }
+
+    void SelectBlue()
+    {
+        Material color = Colors[1];
+        CurrentCar.GetComponent<ChangeCarColor>().ChangeColor(color);
+    }
+
+    void SelectBrown()
+    {
+        Material color = Colors[2];
+        CurrentCar.GetComponent<ChangeCarColor>().ChangeColor(color);
+    }
+
+    void SelectGray()
+    {
+        Material color = Colors[3];
+        CurrentCar.GetComponent<ChangeCarColor>().ChangeColor(color);
+    }
+
+    void SelectGreen()
+    {
+        Material color = Colors[4];
+        CurrentCar.GetComponent<ChangeCarColor>().ChangeColor(color);
+    }
+
+    void SelectOrange()
+    {
+        Material color = Colors[5];
+        CurrentCar.GetComponent<ChangeCarColor>().ChangeColor(color);
+    }
+
+    void SelectPink()
+    {
+        Material color = Colors[6];
+        CurrentCar.GetComponent<ChangeCarColor>().ChangeColor(color);
+    }
+
+    void SelectRed()
+    {
+        Material color = Colors[7];
+        CurrentCar.GetComponent<ChangeCarColor>().ChangeColor(color);
+    }
+
+    void SelectTurquoise()
+    {
+        Material color = Colors[8];
+        CurrentCar.GetComponent<ChangeCarColor>().ChangeColor(color);
+    }
+
+    void SelectViolet()
+    {
+        Material color = Colors[9];
+        CurrentCar.GetComponent<ChangeCarColor>().ChangeColor(color);
+    }
+
+    void SelectWhite()
+    {
+        Material color = Colors[10];
+        CurrentCar.GetComponent<ChangeCarColor>().ChangeColor(color);
+    }
+
+    void SelectYellow()
+    {
+        Material color = Colors[11];
+        CurrentCar.GetComponent<ChangeCarColor>().ChangeColor(color);
+    }
+}
--- a/Assets/Scripts/Garage.cs.meta
+++ b/Assets/Scripts/Garage.cs.meta
--- a/Customization/Transparent
+++ b/Customization/Transparent
@@ -0,0 +1,150 @@
+using UnityEngine;
+using System.Collections;
+using System.IO;
+
+//https://gist.github.com/bitbutter/302da1c840b7c93bc789
+
+/*
+Usage:
+1. Attach this script to your chosen camera's game object.
+2. Set that camera's Clear Flags field to Solid Color.
+3. Use the inspector to set frameRate and framesToCapture
+4. Choose your desired resolution in Unity's Game window (must be less than or equal to your screen resolution)
+5. Turn on "Maximise on Play"
+6. Play your scene. Screenshots will be saved to YourUnityProject/Screenshots by default.
+*/
+
+public class TransparentBackgroundScreenshotRecorder : MonoBehaviour {
+
+#region public fields
+[Tooltip("A folder will be created with this base name in your project root")]
+public string folderBaseName = "Screenshots";
+[Tooltip("How many frames should be captured per second of game time")]
+public int frameRate = 24;
+[Tooltip("How many frames should be captured before quitting")]
+public int framesToCapture = 24;
+#endregion
+#region private fields
+private string folderName = "";
+private GameObject whiteCamGameObject;
+private Camera whiteCam;
+private GameObject blackCamGameObject;
+private Camera blackCam;
+private Camera mainCam;
+private int videoFrame = 0; // how many frames we've rendered
+private float originalTimescaleTime;
+private bool done=false;
+private int screenWidth;
+private int screenHeight;
+private Texture2D textureBlack;
+private Texture2D textureWhite;
+private Texture2D textureTransparentBackground;
+#endregion
+
+void Awake () {
+  mainCam = gameObject.GetComponent<Camera>();
+  CreateBlackAndWhiteCameras ();
+  CreateNewFolderForScreenshots ();
+  CacheAndInitialiseFields ();
+  Time.captureFramerate = frameRate;
+}
+
+void LateUpdate () {
+  if(!done){
+    StartCoroutine(CaptureFrame());
+  } else {
+    Debug.Log("Complete! "+videoFrame+" videoframes rendered. File names are 0 indexed)");
+  Debug.Break();
+  }
+}
+
+IEnumerator CaptureFrame (){
+  yield return new WaitForEndOfFrame();
+  if(videoFrame < framesToCapture) {
+    RenderCamToTexture(blackCam,textureBlack);
+    RenderCamToTexture(whiteCam,textureWhite);
+    CalculateOutputTexture ();
+    SavePng ();
+    videoFrame++;
+    Debug.Log("Rendered frame " +videoFrame); 
+    videoFrame++;
+  } else {
+    done=true;
+    StopCoroutine("CaptureFrame");
+  }
+}
+
+void RenderCamToTexture (Camera cam, Texture2D tex){
+  cam.enabled=true;
+  cam.Render();
+  WriteScreenImageToTexture(tex);
+  cam.enabled=false;
+}
+
+void CreateBlackAndWhiteCameras (){
+  whiteCamGameObject = (GameObject) new GameObject();
+  whiteCamGameObject.name="White Background Camera";
+  whiteCam=whiteCamGameObject.AddComponent<Camera>();
+  whiteCam.CopyFrom(mainCam);
+  whiteCam.backgroundColor=Color.white;
+  whiteCamGameObject.transform.SetParent(gameObject.transform, true);
+
+  blackCamGameObject = (GameObject) new GameObject();
+  blackCamGameObject.name="Black Background Camera";
+  blackCam=blackCamGameObject.AddComponent<Camera>();
+  blackCam.CopyFrom(mainCam);
+  blackCam.backgroundColor=Color.black;
+  blackCamGameObject.transform.SetParent(gameObject.transform, true);
+}
+
+void CreateNewFolderForScreenshots (){
+  // Find a folder name that doesn't exist yet. Append number if necessary.
+  folderName = folderBaseName;
+  int count = 1;
+  while (System.IO.Directory.Exists (folderName)) {
+    folderName = folderBaseName + count;
+    count++;
+  }
+  System.IO.Directory.CreateDirectory (folderName); // Create the folder
+}
+
+void WriteScreenImageToTexture (Texture2D tex){
+  tex.ReadPixels (new Rect (0, 0, screenWidth, screenHeight), 0, 0);
+  tex.Apply ();
+}
+
+void CalculateOutputTexture (){
+  Color color;
+  for (int y = 0; y < textureTransparentBackground.height; ++y) {
+  // each row
+    for (int x = 0; x < textureTransparentBackground.width; ++x) {
+      // each column
+      float alpha = textureWhite.GetPixel (x, y).r - textureBlack.GetPixel (x, y).r;
+      alpha = 1.0f - alpha;
+      if (alpha == 0) {
+        color = Color.clear;
+      }
+      else {
+        color = textureBlack.GetPixel (x, y) / alpha;
+      }
+      color.a = alpha;
+      textureTransparentBackground.SetPixel (x, y, color);
+    }
+  }
+}
+
+void SavePng (){
+  string name = string.Format ("{0}/{1:D04} shot.png", folderName, videoFrame);
+  var pngShot = textureTransparentBackground.EncodeToPNG ();
+  File.WriteAllBytes (name, pngShot);
+}
+
+void CacheAndInitialiseFields (){
+  originalTimescaleTime = Time.timeScale;
+  screenWidth = Screen.width;
+  screenHeight = Screen.height;
+  textureBlack = new Texture2D (screenWidth, screenHeight, TextureFormat.RGB24, false);
+  textureWhite = new Texture2D (screenWidth, screenHeight, TextureFormat.RGB24, false);
+  textureTransparentBackground = new Texture2D (screenWidth, screenHeight, TextureFormat.ARGB32, false);
+  }
+}
--- a/Customization/Transparent
+++ b/Customization/Transparent
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 10b47492e0f2c4f46a754608e4e9a985
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Garage.cs
+++ b/Assets/Scripts/Garage.cs
@@ -1,56 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.UI;
-
-public class Garage : MonoBehaviour
-{
-    public Button HotrodButton;
-    public GameObject HotrodGarage;
-    public Button RacecarButton;
-    public GameObject RacecarGarage;
-    public Button FordButton;
-    public GameObject FordGarage;
-    // Start is called before the first frame update
-    void Start()
-    {
-        HotrodButton.onClick.AddListener(SelectHotrod);
-        RacecarButton.onClick.AddListener(SelectRacecar);
-        FordButton.onClick.AddListener(SelectFord);
-
-        disable();
-        HotrodGarage.SetActive(true);
-    }
-
-    void enable()
-    {
-        HotrodGarage.SetActive(true);
-        RacecarGarage.SetActive(true);
-        FordGarage.SetActive(true);
-    }
-
-    void disable()
-    {
-        HotrodGarage.SetActive(false);
-        RacecarGarage.SetActive(false);
-        FordGarage.SetActive(false);
-    }
-
-    void SelectHotrod()
-    {
-        disable();
-        HotrodGarage.SetActive(true);
-    }
-
-    void SelectRacecar()
-    {
-        disable();
-        RacecarGarage.SetActive(true);
-    }
-
-    void SelectFord()
-    {
-        disable();
-        FordGarage.SetActive(true);
-    }
-}
--- a/Assets/Sounds/Agnus
+++ b/Assets/Sounds/Agnus
--- a/Assets/Sounds/Agnus
+++ b/Assets/Sounds/Agnus
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 632dbffd8a80b8245a8f464d1fa8f7cd
+guid: 10cae2fd52e1c0f4eba2e2091d441cd1
 AudioImporter:
  externalObjects: {}
  serializedVersion: 7
--- a/Assets/Sounds/Train
+++ b/Assets/Sounds/Train
--- a/Assets/Tower_Fall
+++ b/Assets/Tower_Fall
--- a/Assets/Tower_Fall
+++ b/Assets/Tower_Fall
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 28a67afe409d1c34b962f60fbd4676cd
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Tower_Fall.anim
+++ b/Assets/Tower_Fall.anim
--- a/Toolkit.meta
+++ b/Toolkit.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 079df8c4f4160d24a917c1e405de7461
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Toolkit/PanelSettings.asset
+++ b/Toolkit/PanelSettings.asset
@@ -0,0 +1,38 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 19101, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: PanelSettings
+  m_EditorClassIdentifier: 
+  themeUss: {fileID: -4733365628477956816, guid: 3a3a3a1897b8d86488c5d774789f4534, type: 3}
+  m_TargetTexture: {fileID: 0}
+  m_ScaleMode: 1
+  m_ReferenceSpritePixelsPerUnit: 100
+  m_Scale: 1
+  m_ReferenceDpi: 96
+  m_FallbackDpi: 96
+  m_ReferenceResolution: {x: 1200, y: 800}
+  m_ScreenMatchMode: 0
+  m_Match: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+  m_ClearDepthStencil: 1
+  m_ClearColor: 0
+  m_ColorClearValue: {r: 0, g: 0, b: 0, a: 0}
+  m_DynamicAtlasSettings:
+    m_MinAtlasSize: 64
+    m_MaxAtlasSize: 4096
+    m_MaxSubTextureSize: 64
+    m_ActiveFilters: 31
+  m_AtlasBlitShader: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0}
+  m_RuntimeShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0}
+  m_RuntimeWorldShader: {fileID: 9102, guid: 0000000000000000f000000000000000, type: 0}
+  textSettings: {fileID: 0}
--- a/Toolkit/PanelSettings.asset.meta
+++ b/Toolkit/PanelSettings.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4abeca5e892426a4a8d76926ab790c79
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Toolkit/UnityThemes.meta
+++ b/Toolkit/UnityThemes.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f4268b4074aa031419d38af340a24663
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss
+++ b/Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss
@@ -0,0 +1 @@
+@import url("unity-theme://default");
--- a/Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss.meta
+++ b/Toolkit/UnityThemes/UnityDefaultRuntimeTheme.tss.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3a3a3a1897b8d86488c5d774789f4534
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12388, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
--- a/Packages/manifest.json
+++ b/Packages/manifest.json
@@ -1,5 +1,6 @@
 {
  "dependencies": {
+    "com.unity.2d.sprite": "1.0.0",
    "com.unity.cinemachine": "2.9.7",
    "com.unity.collab-proxy": "2.3.1",
    "com.unity.feature.development": "1.0.1",
--- a/Packages/packages-lock.json
+++ b/Packages/packages-lock.json
@@ -1,5 +1,11 @@
 {
  "dependencies": {
+    "com.unity.2d.sprite": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
    "com.unity.barracuda": {
      "version": "3.0.0",
      "depth": 1,