Merge branch 'master' of http://git.thirdlevel.gmbh:80/GameDevOS/LD39

game/Assets/3DArt/Enemy.fbx.meta

@@ -0,0 +1,144 @@
+fileFormatVersion: 2
+guid: 0374fa6ad7f69b04f8ca0d296d213a92
+timeCreated: 1501422318
+licenseType: Pro
+ModelImporter:
+  serializedVersion: 21
+  fileIDToRecycleName:
+    100000: Battery
+    100002: BatteryHolder
+    100004: Body
+    100006: //RootNode
+    100008: LeftBackEye
+    100010: LeftBackLeg
+    100012: LeftFrontEye
+    100014: LeftFrontLeg
+    100016: RightBackEye
+    100018: RightBackLeg
+    100020: RightFrontEye
+    100022: RightFrontLeg
+    100024: Sting
+    400000: Battery
+    400002: BatteryHolder
+    400004: Body
+    400006: //RootNode
+    400008: LeftBackEye
+    400010: LeftBackLeg
+    400012: LeftFrontEye
+    400014: LeftFrontLeg
+    400016: RightBackEye
+    400018: RightBackLeg
+    400020: RightFrontEye
+    400022: RightFrontLeg
+    400024: Sting
+    2300000: Battery
+    2300002: BatteryHolder
+    2300004: Body
+    2300006: LeftBackEye
+    2300008: LeftBackLeg
+    2300010: LeftFrontEye
+    2300012: LeftFrontLeg
+    2300014: RightBackEye
+    2300016: RightBackLeg
+    2300018: RightFrontEye
+    2300020: RightFrontLeg
+    2300022: Sting
+    3300000: Battery
+    3300002: BatteryHolder
+    3300004: Body
+    3300006: LeftBackEye
+    3300008: LeftBackLeg
+    3300010: LeftFrontEye
+    3300012: LeftFrontLeg
+    3300014: RightBackEye
+    3300016: RightBackLeg
+    3300018: RightFrontEye
+    3300020: RightFrontLeg
+    3300022: Sting
+    4300000: Sting
+    4300002: Battery
+    4300004: BatteryHolder
+    4300006: LeftBackEye
+    4300008: LeftFrontEye
+    4300010: RightFrontEye
+    4300012: RightBackEye
+    4300014: RightBackLeg
+    4300016: RightFrontLeg
+    4300018: LeftBackLeg
+    4300020: LeftFrontLeg
+    4300022: Body
+  materials:
+    importMaterials: 1
+    materialName: 0
+    materialSearch: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 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
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 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: 0
+  humanoidOversampling: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

game/Assets/3DArt/Robo.fbx.meta

@@ -1,62 +1,67 @@
 fileFormatVersion: 2
 guid: c69bf052a16339e4293c9f1dd3d69734
-timeCreated: 1501363122
+timeCreated: 1501422319
 licenseType: Pro
 ModelImporter:
   serializedVersion: 21
   fileIDToRecycleName:
     100000: Arms
     100002: Basis
-    100004: Body
-    100006: Head
-    100008: Headlights
-    100010: LeftWheel
-    100012: RightWheelProfile
-    100014: RightWheelWithoutProfile
+    100004: BlasterWeapon
+    100006: Body
+    100008: Head
+    100010: Headlights
+    100012: LeftWheel
+    100014: RightWheel
     100016: //RootNode
-    100018: Weapon1
-    100020: WheelAxis
+    100018: Spinner
+    100020: SpinnerHolder
+    100022: WheelAxis
     400000: Arms
     400002: Basis
-    400004: Body
-    400006: Head
-    400008: Headlights
-    400010: LeftWheel
-    400012: RightWheelProfile
-    400014: RightWheelWithoutProfile
+    400004: BlasterWeapon
+    400006: Body
+    400008: Head
+    400010: Headlights
+    400012: LeftWheel
+    400014: RightWheel
     400016: //RootNode
-    400018: Weapon1
-    400020: WheelAxis
+    400018: Spinner
+    400020: SpinnerHolder
+    400022: WheelAxis
     2300000: Arms
     2300002: Basis
-    2300004: Body
-    2300006: Head
-    2300008: Headlights
-    2300010: LeftWheel
-    2300012: RightWheelProfile
-    2300014: RightWheelWithoutProfile
-    2300016: Weapon1
-    2300018: WheelAxis
+    2300004: BlasterWeapon
+    2300006: Body
+    2300008: Head
+    2300010: Headlights
+    2300012: LeftWheel
+    2300014: RightWheel
+    2300016: Spinner
+    2300018: SpinnerHolder
+    2300020: WheelAxis
     3300000: Arms
     3300002: Basis
-    3300004: Body
-    3300006: Head
-    3300008: Headlights
-    3300010: LeftWheel
-    3300012: RightWheelProfile
-    3300014: RightWheelWithoutProfile
-    3300016: Weapon1
-    3300018: WheelAxis
-    4300000: Weapon1
-    4300002: Headlights
-    4300004: Arms
-    4300006: Head
-    4300008: Body
-    4300010: Basis
-    4300012: WheelAxis
-    4300014: RightWheelWithoutProfile
-    4300016: LeftWheel
-    4300018: RightWheelProfile
+    3300004: BlasterWeapon
+    3300006: Body
+    3300008: Head
+    3300010: Headlights
+    3300012: LeftWheel
+    3300014: RightWheel
+    3300016: Spinner
+    3300018: SpinnerHolder
+    3300020: WheelAxis
+    4300000: SpinnerHolder
+    4300002: Spinner
+    4300004: BlasterWeapon
+    4300006: Headlights
+    4300008: Arms
+    4300010: Head
+    4300012: Body
+    4300014: Basis
+    4300016: WheelAxis
+    4300018: RightWheel
+    4300020: LeftWheel
   materials:
     importMaterials: 1
     materialName: 0