Revert "Merge branch 'leveldesign_r'"

This reverts commit 998a52fe3c.
2018-09-08 17:44:36 +02:00
parent 998a52fe3c
commit c64220a353
209 changed files with 274 additions and 59813 deletions
--- a/Assets/Blender/large
+++ b/Assets/Blender/large
--- a/_tree_top.blend.meta
+++ b/_tree_top.blend.meta
@@ -0,0 +1,98 @@
+fileFormatVersion: 2
+
+guid: 92769698617cda944a6083e435fee3e4
+
+ModelImporter:
+  serializedVersion: 23
+  fileIDToRecycleName:
+    100000: //RootNode
+    400000: //RootNode
+    2100000: unnamed
+    2300000: //RootNode
+    3300000: //RootNode
+    4300000: Icosphere
+    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/longplateau_horizontal.blend.meta
+++ b/Assets/Blender/longplateau_horizontal.blend.meta
@@ -1,10 +1,6 @@
 fileFormatVersion: 2
-<<<<<<< HEAD

 guid: 3b6832ff1a40a4445af6fd2a4de420b9
-=======
-guid: f8a9b47e26adf7341996b9467a94f551
->>>>>>> leveldesign_r
 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
@@ -0,0 +1,97 @@
+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,10 +1,6 @@
 fileFormatVersion: 2
-<<<<<<< HEAD

 guid: a407b81221217314cb2f3f58d53416b6
-=======
-guid: 9ce16e413ddf64b45b624f04e77768ab
->>>>>>> leveldesign_r
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
@@ -14,11 +10,7 @@ ModelImporter:
    2300000: //RootNode
    3300000: //RootNode
    4300000: Cube
-<<<<<<< HEAD

-=======
-    6400000: //RootNode
->>>>>>> leveldesign_r
    7400000: Default Take
    9500000: //RootNode
  externalObjects: {}
@@ -55,10 +47,7 @@ ModelImporter:
    globalScale: 1
    meshCompression: 0
    addColliders: 1
-<<<<<<< HEAD

-=======
->>>>>>> leveldesign_r
    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
@@ -0,0 +1,96 @@
+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,26 +1,16 @@
 fileFormatVersion: 2
-<<<<<<< HEAD

 guid: d336f86cc18e4c646a8f4ee463e65728

-=======
-guid: d336f86cc18e4c646a8f4ee463e65728
->>>>>>> leveldesign_r
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
    100000: //RootNode
    400000: //RootNode
-<<<<<<< HEAD

    2100000: Bottom
    2100002: Top

-=======
-    2100000: Material
-    2100002: Bottom
-    2100004: Top
->>>>>>> leveldesign_r
    2300000: //RootNode
    3300000: //RootNode
    4300000: Cube
--- a/Assets/Blender/rock_wall_stepped.blend.meta
+++ b/Assets/Blender/rock_wall_stepped.blend.meta
@@ -1,26 +1,16 @@
 fileFormatVersion: 2
-<<<<<<< HEAD

 guid: 743de541888a4014c912500b676649b4

-=======
-guid: 743de541888a4014c912500b676649b4
->>>>>>> leveldesign_r
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
    100000: //RootNode
    400000: //RootNode
-<<<<<<< HEAD

    2100000: Rock
    2100002: Top

-=======
-    2100000: Material
-    2100002: Rock
-    2100004: Top
->>>>>>> leveldesign_r
    2300000: //RootNode
    3300000: //RootNode
    4300000: Cube
--- a/Assets/Blender/rocks01.blend.meta
+++ b/Assets/Blender/rocks01.blend.meta
@@ -65,10 +65,7 @@ ModelImporter:
    7400000: Default Take
    9500000: //RootNode
    2186277476908879412: ImportLogs
-<<<<<<< HEAD

-=======
->>>>>>> leveldesign_r
  externalObjects: {}
  materials:
    importMaterials: 1
--- a/Assets/Blender/spikertap1.blend.meta
+++ b/Assets/Blender/spikertap1.blend.meta
@@ -1,11 +1,7 @@
 fileFormatVersion: 2
-<<<<<<< HEAD

 guid: 606d416790688a04bbc4000f9b15bafa

-=======
-guid: 606d416790688a04bbc4000f9b15bafa
->>>>>>> leveldesign_r
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
--- a/Assets/Blender/tree_platform.blend.meta
+++ b/Assets/Blender/tree_platform.blend.meta
@@ -1,11 +1,7 @@
 fileFormatVersion: 2
-<<<<<<< HEAD

 guid: e19e7453725b19e4e989432893eb38d1

-=======
-guid: e19e7453725b19e4e989432893eb38d1
->>>>>>> leveldesign_r
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
--- a/Assets/Blender/tree_tops.blend.meta
+++ b/Assets/Blender/tree_tops.blend.meta
@@ -1,11 +1,7 @@
 fileFormatVersion: 2
-<<<<<<< HEAD

 guid: b2571f564af29ac4aba093136c5074ae

-=======
-guid: b2571f564af29ac4aba093136c5074ae
->>>>>>> leveldesign_r
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
--- a/Assets/Blender/trees_with_trunks.blend.meta
+++ b/Assets/Blender/trees_with_trunks.blend.meta
@@ -1,11 +1,7 @@
 fileFormatVersion: 2
-<<<<<<< HEAD

 guid: 35d251ed30860a7478a010b09eba12a2

-=======
-guid: 35d251ed30860a7478a010b09eba12a2
->>>>>>> leveldesign_r
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
@@ -18,15 +14,10 @@ ModelImporter:
    400004: Icosphere_002
    400006: //RootNode
    2100000: unnamed
-<<<<<<< HEAD

    2100002: Leaves
    2100004: Trunk

-=======
-    2100002: Leaves
-    2100004: Trunk
->>>>>>> leveldesign_r
    2300000: Icosphere
    2300002: Icosphere_001
    2300004: Icosphere_002
--- a/Assets/Blender/trunk.blend
+++ b/Assets/Blender/trunk.blend
--- a/Assets/Blender/trunk.blend.meta
+++ b/Assets/Blender/trunk.blend.meta
@@ -0,0 +1,98 @@
+fileFormatVersion: 2
+
+guid: 2c4683743c15c5b4da69008ce599c18b
+
+ModelImporter:
+  serializedVersion: 23
+  fileIDToRecycleName:
+    100000: //RootNode
+    400000: //RootNode
+    2100000: unnamed
+    2300000: //RootNode
+    3300000: //RootNode
+    4300000: Circle
+    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/waves.blend.meta
+++ b/Assets/Blender/waves.blend.meta
@@ -1,11 +1,7 @@
 fileFormatVersion: 2
-<<<<<<< HEAD

 guid: be524af1caf68134f82b9c43ce1db13e

-=======
-guid: be524af1caf68134f82b9c43ce1db13e
->>>>>>> leveldesign_r
 ModelImporter:
  serializedVersion: 23
  fileIDToRecycleName:
@@ -14,80 +10,52 @@ ModelImporter:
    100004: Cube_002
    100006: Cube_003
    100008: Cube_004
-<<<<<<< HEAD

    100010: Cube_005
    100012: Cube_006
    100014: //RootNode
 r
-=======
-    100010: Cube_005
-    100012: Cube_006
-    100014: //RootNode
->>>>>>> leveldesign_r
    400000: Cube_000
    400002: Cube_001
    400004: Cube_002
    400006: Cube_003
    400008: Cube_004
-<<<<<<< HEAD

    400010: Cube_005
    400012: Cube_006
    400014: //RootNode

-=======
-    400010: Cube_005
-    400012: Cube_006
-    400014: //RootNode
->>>>>>> leveldesign_r
    2100000: unnamed
    2300000: Cube_000
    2300002: Cube_001
    2300004: Cube_002
    2300006: Cube_003
    2300008: Cube_004
-<<<<<<< HEAD

    2300010: Cube_005
    2300012: Cube_006

-=======
-    2300010: Cube_005
-    2300012: Cube_006
->>>>>>> leveldesign_r
    3300000: Cube_000
    3300002: Cube_001
    3300004: Cube_002
    3300006: Cube_003
    3300008: Cube_004
-<<<<<<< HEAD

    3300010: Cube_005
    3300012: Cube_006

-=======
-    3300010: Cube_005
-    3300012: Cube_006
->>>>>>> leveldesign_r
    4300000: Cube_006
    4300002: Cube_004
    4300004: Cube_003
    4300006: Cube_002
    4300008: Cube_001
    4300010: Cube_000
-<<<<<<< HEAD

-=======
->>>>>>> leveldesign_r
    4300012: Cube_005
    7400000: Default Take
    9500000: //RootNode
    2186277476908879412: ImportLogs
-<<<<<<< HEAD

-=======
->>>>>>> leveldesign_r
  externalObjects: {}
  materials:
    importMaterials: 1