Polishing 1

General polishing commit
2018-09-06 21:24:11 +02:00
parent ffd5beade2
commit b778c14158
184 changed files with 58363 additions and 16430 deletions
--- a/Assets/Blender/beach_plateaus.blend.meta
+++ b/Assets/Blender/beach_plateaus.blend.meta
@@ -1,14 +1,44 @@
 fileFormatVersion: 2
-guid: 5aefd83731ab0d643aabc86df0821426
+guid: 33abdca398f60f444a31247a5a8daf0f
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
    100000: //RootNode
+    100002: Cube
+    100004: Cube_001
+    100006: Cube_002
+    100008: Cube_003
+    100010: Cube_004
+    100012: Cube_005
    400000: //RootNode
+    400002: Cube
+    400004: Cube_001
+    400006: Cube_002
+    400008: Cube_003
+    400010: Cube_004
+    400012: Cube_005
    2100000: unnamed
-    2300000: //RootNode
-    3300000: //RootNode
-    4300000: Circle
+    2300000: Cube
+    2300002: Cube_001
+    2300004: Cube_002
+    2300006: Cube_003
+    2300008: Cube_004
+    2300010: Cube_005
+    2300012: //RootNode
+    3300000: Cube
+    3300002: Cube_001
+    3300004: Cube_002
+    3300006: Cube_003
+    3300008: Cube_004
+    3300010: Cube_005
+    3300012: //RootNode
+    4300000: Cube_005
+    4300002: Cube_004
+    4300004: Cube_003
+    4300006: Cube_002
+    4300008: Cube_001
+    4300010: Cube
+    6400000: //RootNode
    7400000: Default Take
    9500000: //RootNode
  externalObjects: {}
@@ -44,7 +74,7 @@ ModelImporter:
    lODScreenPercentages: []
    globalScale: 1
    meshCompression: 0
-    addColliders: 0
+    addColliders: 1
    importVisibility: 1
    importBlendShapes: 1
    importCameras: 1
--- a/Assets/Blender/beach_rocks.blend.meta
+++ b/Assets/Blender/beach_rocks.blend.meta
@@ -1,14 +1,39 @@
 fileFormatVersion: 2
-guid: 92769698617cda944a6083e435fee3e4
+guid: e828cce137763164da2e4aa40af2942f
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
    100000: //RootNode
+    100002: Cube
+    100004: Cube_001
+    100006: Cube_002
+    100008: Icosphere
+    100010: Cube_003
    400000: //RootNode
+    400002: Cube
+    400004: Cube_001
+    400006: Cube_002
+    400008: Icosphere
+    400010: Cube_003
    2100000: unnamed
-    2300000: //RootNode
-    3300000: //RootNode
-    4300000: Icosphere
+    2100002: Material
+    2100004: Bottom
+    2100006: Top
+    2300000: Cube
+    2300002: Cube_001
+    2300004: Cube_002
+    2300006: Icosphere
+    2300008: Cube_003
+    3300000: Cube
+    3300002: Cube_001
+    3300004: Cube_002
+    3300006: Icosphere
+    3300008: Cube_003
+    4300000: Cube_002
+    4300002: Icosphere
+    4300004: Cube_001
+    4300006: Cube
+    4300008: Cube_003
    7400000: Default Take
    9500000: //RootNode
  externalObjects: {}
--- a/Assets/Blender/large
+++ b/Assets/Blender/large
--- a/Assets/Blender/longplateau_horizontal.blend.meta
+++ b/Assets/Blender/longplateau_horizontal.blend.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3b6832ff1a40a4445af6fd2a4de420b9
+guid: f8a9b47e26adf7341996b9467a94f551
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
--- a/Assets/Blender/rock_wall01.blend
+++ b/Assets/Blender/rock_wall01.blend
--- a/Assets/Blender/rock_wall01.blend.meta
+++ b/Assets/Blender/rock_wall01.blend.meta
@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: 701478431802b1143ae792147b8cbe91
-ModelImporter:
-  serializedVersion: 23
-  fileIDToRecycleName:
-    100000: //RootNode
-    400000: //RootNode
-    2100000: Material
-    2300000: //RootNode
-    3300000: //RootNode
-    4300000: Cube
-    7400000: Default Take
-    9500000: //RootNode
-  externalObjects: {}
-  materials:
-    importMaterials: 1
-    materialName: 0
-    materialSearch: 1
-    materialLocation: 1
-  animations:
-    legacyGenerateAnimations: 4
-    bakeSimulation: 0
-    resampleCurves: 1
-    optimizeGameObjects: 0
-    motionNodeName: 
-    rigImportErrors: 
-    rigImportWarnings: 
-    animationImportErrors: 
-    animationImportWarnings: 
-    animationRetargetingWarnings: 
-    animationDoRetargetingWarnings: 0
-    importAnimatedCustomProperties: 0
-    importConstraints: 0
-    animationCompression: 1
-    animationRotationError: 0.5
-    animationPositionError: 0.5
-    animationScaleError: 0.5
-    animationWrapMode: 0
-    extraExposedTransformPaths: []
-    extraUserProperties: []
-    clipAnimations: []
-    isReadable: 1
-  meshes:
-    lODScreenPercentages: []
-    globalScale: 1
-    meshCompression: 0
-    addColliders: 0
-    importVisibility: 1
-    importBlendShapes: 1
-    importCameras: 1
-    importLights: 1
-    swapUVChannels: 0
-    generateSecondaryUV: 0
-    useFileUnits: 1
-    optimizeMeshForGPU: 1
-    keepQuads: 0
-    weldVertices: 1
-    preserveHierarchy: 0
-    indexFormat: 0
-    secondaryUVAngleDistortion: 8
-    secondaryUVAreaDistortion: 15.000001
-    secondaryUVHardAngle: 88
-    secondaryUVPackMargin: 4
-    useFileScale: 1
-    previousCalculatedGlobalScale: 1
-    hasPreviousCalculatedGlobalScale: 1
-  tangentSpace:
-    normalSmoothAngle: 60
-    normalImportMode: 0
-    tangentImportMode: 3
-    normalCalculationMode: 4
-  importAnimation: 1
-  copyAvatar: 0
-  humanDescription:
-    serializedVersion: 2
-    human: []
-    skeleton: []
-    armTwist: 0.5
-    foreArmTwist: 0.5
-    upperLegTwist: 0.5
-    legTwist: 0.5
-    armStretch: 0.05
-    legStretch: 0.05
-    feetSpacing: 0
-    rootMotionBoneName: 
-    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
-    hasTranslationDoF: 0
-    hasExtraRoot: 0
-    skeletonHasParents: 1
-  lastHumanDescriptionAvatarSource: {instanceID: 0}
-  animationType: 2
-  humanoidOversampling: 1
-  additionalBone: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Blender/rock_wall_edge.blend.meta
+++ b/Assets/Blender/rock_wall_edge.blend.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a407b81221217314cb2f3f58d53416b6
+guid: 9ce16e413ddf64b45b624f04e77768ab
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
@@ -9,6 +9,7 @@ ModelImporter:
    2300000: //RootNode
    3300000: //RootNode
    4300000: Cube
+    6400000: //RootNode
    7400000: Default Take
    9500000: //RootNode
  externalObjects: {}
@@ -44,7 +45,7 @@ ModelImporter:
    lODScreenPercentages: []
    globalScale: 1
    meshCompression: 0
-    addColliders: 0
+    addColliders: 1
    importVisibility: 1
    importBlendShapes: 1
    importCameras: 1
--- a/Assets/Blender/rock_wall_plain.blend
+++ b/Assets/Blender/rock_wall_plain.blend
--- a/Assets/Blender/rock_wall_plain.blend.meta
+++ b/Assets/Blender/rock_wall_plain.blend.meta
@@ -1,96 +0,0 @@
-fileFormatVersion: 2
-guid: b275e49af3372a84cb8c398328475d27
-ModelImporter:
-  serializedVersion: 23
-  fileIDToRecycleName:
-    100000: //RootNode
-    400000: //RootNode
-    2100000: Material
-    2300000: //RootNode
-    3300000: //RootNode
-    4300000: Cube
-    7400000: Default Take
-    9500000: //RootNode
-  externalObjects: {}
-  materials:
-    importMaterials: 1
-    materialName: 0
-    materialSearch: 1
-    materialLocation: 1
-  animations:
-    legacyGenerateAnimations: 4
-    bakeSimulation: 0
-    resampleCurves: 1
-    optimizeGameObjects: 0
-    motionNodeName: 
-    rigImportErrors: 
-    rigImportWarnings: 
-    animationImportErrors: 
-    animationImportWarnings: 
-    animationRetargetingWarnings: 
-    animationDoRetargetingWarnings: 0
-    importAnimatedCustomProperties: 0
-    importConstraints: 0
-    animationCompression: 1
-    animationRotationError: 0.5
-    animationPositionError: 0.5
-    animationScaleError: 0.5
-    animationWrapMode: 0
-    extraExposedTransformPaths: []
-    extraUserProperties: []
-    clipAnimations: []
-    isReadable: 1
-  meshes:
-    lODScreenPercentages: []
-    globalScale: 1
-    meshCompression: 0
-    addColliders: 0
-    importVisibility: 1
-    importBlendShapes: 1
-    importCameras: 1
-    importLights: 1
-    swapUVChannels: 0
-    generateSecondaryUV: 0
-    useFileUnits: 1
-    optimizeMeshForGPU: 1
-    keepQuads: 0
-    weldVertices: 1
-    preserveHierarchy: 0
-    indexFormat: 0
-    secondaryUVAngleDistortion: 8
-    secondaryUVAreaDistortion: 15.000001
-    secondaryUVHardAngle: 88
-    secondaryUVPackMargin: 4
-    useFileScale: 1
-    previousCalculatedGlobalScale: 1
-    hasPreviousCalculatedGlobalScale: 1
-  tangentSpace:
-    normalSmoothAngle: 60
-    normalImportMode: 0
-    tangentImportMode: 3
-    normalCalculationMode: 4
-  importAnimation: 1
-  copyAvatar: 0
-  humanDescription:
-    serializedVersion: 2
-    human: []
-    skeleton: []
-    armTwist: 0.5
-    foreArmTwist: 0.5
-    upperLegTwist: 0.5
-    legTwist: 0.5
-    armStretch: 0.05
-    legStretch: 0.05
-    feetSpacing: 0
-    rootMotionBoneName: 
-    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
-    hasTranslationDoF: 0
-    hasExtraRoot: 0
-    skeletonHasParents: 1
-  lastHumanDescriptionAvatarSource: {instanceID: 0}
-  animationType: 2
-  humanoidOversampling: 1
-  additionalBone: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Blender/rock_wall_ridge.blend.meta
+++ b/Assets/Blender/rock_wall_ridge.blend.meta
@@ -1,12 +1,13 @@
 fileFormatVersion: 2
-guid: 9b76b3361e364bc44ae6f4b4858ba26b
+guid: d336f86cc18e4c646a8f4ee463e65728
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
    100000: //RootNode
    400000: //RootNode
-    2100000: Bottom
-    2100002: Top
+    2100000: Material
+    2100002: Bottom
+    2100004: Top
    2300000: //RootNode
    3300000: //RootNode
    4300000: Cube
--- a/Assets/Blender/rock_wall_stepped.blend.meta
+++ b/Assets/Blender/rock_wall_stepped.blend.meta
@@ -1,12 +1,13 @@
 fileFormatVersion: 2
-guid: f4142e156ded48f4785a1d5642f4fc89
+guid: 743de541888a4014c912500b676649b4
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
    100000: //RootNode
    400000: //RootNode
-    2100000: Rock
-    2100002: Top
+    2100000: Material
+    2100002: Rock
+    2100004: Top
    2300000: //RootNode
    3300000: //RootNode
    4300000: Cube
--- a/Assets/Blender/rocks01.blend.meta
+++ b/Assets/Blender/rocks01.blend.meta
@@ -1,44 +1,70 @@
 fileFormatVersion: 2
-guid: b46d4838699b12f4b8ae8e73f6b77079
+guid: 51bb0cf2719c35f44993990fd4c53f2a
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
-    100000: long_rock_det
-    100002: long_rock_det_001
-    100004: long_rock_smpl
-    100006: med_rock
-    100008: platform0
-    100010: platform1
-    100012: //RootNode
-    400000: long_rock_det
-    400002: long_rock_det_001
-    400004: long_rock_smpl
-    400006: med_rock
-    400008: platform0
-    400010: platform1
-    400012: //RootNode
-    2100000: Material
-    2100002: unnamed
-    2300000: long_rock_det
-    2300002: long_rock_det_001
-    2300004: long_rock_smpl
-    2300006: med_rock
-    2300008: platform0
-    2300010: platform1
-    3300000: long_rock_det
-    3300002: long_rock_det_001
-    3300004: long_rock_smpl
-    3300006: med_rock
-    3300008: platform0
-    3300010: platform1
-    4300000: long_rock_det_001
-    4300002: platform1
-    4300004: platform0
-    4300006: med_rock
-    4300008: long_rock_det
-    4300010: long_rock_smpl
+    100000: Cube
+    100002: Cube_001
+    100004: Cube_002
+    100006: //RootNode
+    100008: Cube_003
+    100010: Cube_004
+    100012: long_rock_det
+    100014: long_rock_smpl
+    100016: med_rock
+    100018: platform0
+    100020: platform1
+    100022: long_rock_det_001
+    400000: Cube
+    400002: Cube_001
+    400004: Cube_002
+    400006: //RootNode
+    400008: Cube_003
+    400010: Cube_004
+    400012: long_rock_det
+    400014: long_rock_smpl
+    400016: med_rock
+    400018: platform0
+    400020: platform1
+    400022: long_rock_det_001
+    2100000: unnamed
+    2100002: Material
+    2300000: Cube
+    2300002: Cube_001
+    2300004: Cube_002
+    2300006: Cube_003
+    2300008: Cube_004
+    2300010: long_rock_det
+    2300012: long_rock_smpl
+    2300014: med_rock
+    2300016: platform0
+    2300018: platform1
+    2300020: long_rock_det_001
+    3300000: Cube
+    3300002: Cube_001
+    3300004: Cube_002
+    3300006: Cube_003
+    3300008: Cube_004
+    3300010: long_rock_det
+    3300012: long_rock_smpl
+    3300014: med_rock
+    3300016: platform0
+    3300018: platform1
+    3300020: long_rock_det_001
+    4300000: Cube_002
+    4300002: Cube_001
+    4300004: Cube
+    4300006: Cube_004
+    4300008: Cube_003
+    4300010: platform1
+    4300012: platform0
+    4300014: med_rock
+    4300016: long_rock_det
+    4300018: long_rock_smpl
+    4300020: long_rock_det_001
    7400000: Default Take
    9500000: //RootNode
+    2186277476908879412: ImportLogs
  externalObjects: {}
  materials:
    importMaterials: 1
--- a/Assets/Blender/spikertap1.blend.meta
+++ b/Assets/Blender/spikertap1.blend.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2de05f09465a47e43b2f91adf1bca565
+guid: 606d416790688a04bbc4000f9b15bafa
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
--- a/Assets/Blender/tree_platform.blend.meta
+++ b/Assets/Blender/tree_platform.blend.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d6617fc4508c1964e9c4563472852d0c
+guid: e19e7453725b19e4e989432893eb38d1
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
--- a/Assets/Blender/tree_tops.blend.meta
+++ b/Assets/Blender/tree_tops.blend.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e239e770c70ceed4d92f2b38463449a7
+guid: b2571f564af29ac4aba093136c5074ae
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
--- a/Assets/Blender/trees_with_trunks.blend
+++ b/Assets/Blender/trees_with_trunks.blend
--- a/Assets/Blender/trees_with_trunks.blend.meta
+++ b/Assets/Blender/trees_with_trunks.blend.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 26f04547f7046224c8040168f487c2fc
+guid: 35d251ed30860a7478a010b09eba12a2
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
@@ -12,6 +12,8 @@ ModelImporter:
    400004: Icosphere_002
    400006: //RootNode
    2100000: unnamed
+    2100002: Leaves
+    2100004: Trunk
    2300000: Icosphere
    2300002: Icosphere_001
    2300004: Icosphere_002
--- a/Assets/Blender/trunk.blend
+++ b/Assets/Blender/trunk.blend
--- a/Assets/Blender/waves.blend.meta
+++ b/Assets/Blender/waves.blend.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c1ef83d9238b7724a9a61c7aa5fea40b
+guid: be524af1caf68134f82b9c43ce1db13e
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
@@ -8,36 +8,42 @@ ModelImporter:
    100004: Cube_002
    100006: Cube_003
    100008: Cube_004
-    100010: Cube_006
-    100012: //RootNode
+    100010: Cube_005
+    100012: Cube_006
+    100014: //RootNode
    400000: Cube_000
    400002: Cube_001
    400004: Cube_002
    400006: Cube_003
    400008: Cube_004
-    400010: Cube_006
-    400012: //RootNode
+    400010: Cube_005
+    400012: Cube_006
+    400014: //RootNode
    2100000: unnamed
    2300000: Cube_000
    2300002: Cube_001
    2300004: Cube_002
    2300006: Cube_003
    2300008: Cube_004
-    2300010: Cube_006
+    2300010: Cube_005
+    2300012: Cube_006
    3300000: Cube_000
    3300002: Cube_001
    3300004: Cube_002
    3300006: Cube_003
    3300008: Cube_004
-    3300010: Cube_006
+    3300010: Cube_005
+    3300012: Cube_006
    4300000: Cube_006
    4300002: Cube_004
    4300004: Cube_003
    4300006: Cube_002
    4300008: Cube_001
    4300010: Cube_000
+    4300012: Cube_005
    7400000: Default Take
    9500000: //RootNode
+    2186277476908879412: ImportLogs
  externalObjects: {}
  materials:
    importMaterials: 1