Merge branch 'master' of https://github.com/ConjureETS/PillowFight

Conflicts:
	Assets/Scripts/AutoTarget.cs

Signed-off-by: RosimInc <rosim_inc@hotmail.com>

Assets/Art/Materials/T_Molly.mat

@@ -0,0 +1,138 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: T_Molly
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 5
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+      data:
+        first:
+          name: _MainTex
+        second:
+          m_Texture: {fileID: 2800000, guid: 77150351248a93848a6b94486188b4c5, type: 3}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _BumpMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _DetailNormalMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _ParallaxMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _OcclusionMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _EmissionMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _DetailMask
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _DetailAlbedoMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _MetallicGlossMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+    m_Floats:
+      data:
+        first:
+          name: _SrcBlend
+        second: 1
+      data:
+        first:
+          name: _DstBlend
+        second: 0
+      data:
+        first:
+          name: _Cutoff
+        second: .5
+      data:
+        first:
+          name: _Parallax
+        second: .0199999996
+      data:
+        first:
+          name: _ZWrite
+        second: 1
+      data:
+        first:
+          name: _Glossiness
+        second: .5
+      data:
+        first:
+          name: _BumpScale
+        second: 1
+      data:
+        first:
+          name: _OcclusionStrength
+        second: 1
+      data:
+        first:
+          name: _DetailNormalMapScale
+        second: 1
+      data:
+        first:
+          name: _UVSec
+        second: 0
+      data:
+        first:
+          name: _Mode
+        second: 0
+      data:
+        first:
+          name: _Metallic
+        second: 0
+    m_Colors:
+      data:
+        first:
+          name: _EmissionColor
+        second: {r: 0, g: 0, b: 0, a: 1}
+      data:
+        first:
+          name: _Color
+        second: {r: .588, g: .588, b: .588, a: 1}

Assets/Art/Materials/T_Molly.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6cac40b8db27af0438a426297c2cb0cd
+timeCreated: 1440354886
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Materials/T_Molly_Oeil.mat

@@ -0,0 +1,138 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: T_Molly_Oeil
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 5
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+      data:
+        first:
+          name: _MainTex
+        second:
+          m_Texture: {fileID: 2800000, guid: 0d5271d9ddc7db645a5c19a223c50298, type: 3}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _BumpMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _DetailNormalMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _ParallaxMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _OcclusionMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _EmissionMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _DetailMask
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _DetailAlbedoMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+      data:
+        first:
+          name: _MetallicGlossMap
+        second:
+          m_Texture: {fileID: 0}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+    m_Floats:
+      data:
+        first:
+          name: _SrcBlend
+        second: 1
+      data:
+        first:
+          name: _DstBlend
+        second: 0
+      data:
+        first:
+          name: _Cutoff
+        second: .5
+      data:
+        first:
+          name: _Parallax
+        second: .0199999996
+      data:
+        first:
+          name: _ZWrite
+        second: 1
+      data:
+        first:
+          name: _Glossiness
+        second: .5
+      data:
+        first:
+          name: _BumpScale
+        second: 1
+      data:
+        first:
+          name: _OcclusionStrength
+        second: 1
+      data:
+        first:
+          name: _DetailNormalMapScale
+        second: 1
+      data:
+        first:
+          name: _UVSec
+        second: 0
+      data:
+        first:
+          name: _Mode
+        second: 0
+      data:
+        first:
+          name: _Metallic
+        second: 0
+    m_Colors:
+      data:
+        first:
+          name: _EmissionColor
+        second: {r: 0, g: 0, b: 0, a: 1}
+      data:
+        first:
+          name: _Color
+        second: {r: .588, g: .588, b: .588, a: 1}

Assets/Art/Materials/T_Molly_Oeil.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 794fda60a79870441abfb4b6004dc568
+timeCreated: 1440354886
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/SK_Molly_T-stance.FBX.meta

@@ -0,0 +1,143 @@
+fileFormatVersion: 2
+guid: 7eb46158895a8724db3236fc4329eccf
+timeCreated: 1440354886
+licenseType: Free
+ModelImporter:
+  serializedVersion: 18
+  fileIDToRecycleName:
+    100000: Bip001
+    100002: Bip001 Footsteps
+    100004: Bip001 Head
+    100006: Bip001 HeadNub
+    100008: Bip001 L Calf
+    100010: Bip001 L Clavicle
+    100012: Bip001 L Finger0
+    100014: Bip001 L Finger0Nub
+    100016: Bip001 L Foot
+    100018: Bip001 L Forearm
+    100020: Bip001 L Hand
+    100022: Bip001 L Thigh
+    100024: Bip001 L Toe0
+    100026: Bip001 L Toe0Nub
+    100028: Bip001 L UpperArm
+    100030: Bip001 Neck
+    100032: Bip001 Pelvis
+    100034: Bip001 R Calf
+    100036: Bip001 R Clavicle
+    100038: Bip001 R Finger0
+    100040: Bip001 R Finger0Nub
+    100042: Bip001 R Foot
+    100044: Bip001 R Forearm
+    100046: Bip001 R Hand
+    100048: Bip001 R Thigh
+    100050: Bip001 R Toe0
+    100052: Bip001 R Toe0Nub
+    100054: Bip001 R UpperArm
+    100056: Bip001 Spine
+    100058: Bip001 Spine1
+    100060: Bip001 Spine2
+    100062: Box015
+    100064: //RootNode
+    100066: SM_Pillow
+    400000: Bip001
+    400002: Bip001 Footsteps
+    400004: Bip001 Head
+    400006: Bip001 HeadNub
+    400008: Bip001 L Calf
+    400010: Bip001 L Clavicle
+    400012: Bip001 L Finger0
+    400014: Bip001 L Finger0Nub
+    400016: Bip001 L Foot
+    400018: Bip001 L Forearm
+    400020: Bip001 L Hand
+    400022: Bip001 L Thigh
+    400024: Bip001 L Toe0
+    400026: Bip001 L Toe0Nub
+    400028: Bip001 L UpperArm
+    400030: Bip001 Neck
+    400032: Bip001 Pelvis
+    400034: Bip001 R Calf
+    400036: Bip001 R Clavicle
+    400038: Bip001 R Finger0
+    400040: Bip001 R Finger0Nub
+    400042: Bip001 R Foot
+    400044: Bip001 R Forearm
+    400046: Bip001 R Hand
+    400048: Bip001 R Thigh
+    400050: Bip001 R Toe0
+    400052: Bip001 R Toe0Nub
+    400054: Bip001 R UpperArm
+    400056: Bip001 Spine
+    400058: Bip001 Spine1
+    400060: Bip001 Spine2
+    400062: Box015
+    400064: //RootNode
+    400066: SM_Pillow
+    4300000: SM_Pillow
+    4300002: Box015
+    7400000: Take 001
+    9500000: //RootNode
+    13700000: Box015
+    13700002: SM_Pillow
+  materials:
+    importMaterials: 1
+    materialName: 0
+    materialSearch: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    optimizeGameObjects: 0
+    motionNodeName: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    animationCompression: 1
+    animationRotationError: .5
+    animationPositionError: .5
+    animationScaleError: .5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    clipAnimations: []
+    isReadable: 1
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    importBlendShapes: 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
+    splitTangentsAcrossUV: 1
+    normalImportMode: 0
+    tangentImportMode: 1
+  importAnimation: 1
+  copyAvatar: 0
+  humanDescription:
+    human: []
+    skeleton: []
+    armTwist: .5
+    foreArmTwist: .5
+    upperLegTwist: .5
+    legTwist: .5
+    armStretch: .0500000007
+    legStretch: .0500000007
+    feetSpacing: 0
+    rootMotionBoneName: 
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  animationType: 2
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Textures/T_Molly.tga.meta

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 77150351248a93848a6b94486188b4c5
+timeCreated: 1440355397
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: -1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Textures/T_Molly_Oeil.tga.meta

@@ -0,0 +1,55 @@
+fileFormatVersion: 2
+guid: 0d5271d9ddc7db645a5c19a223c50298
+timeCreated: 1440355396
+licenseType: Free
+TextureImporter:
+  fileIDToRecycleName: {}
+  serializedVersion: 2
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    linearTexture: 0
+    correctGamma: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: .25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 0
+  cubemapConvolution: 0
+  cubemapConvolutionSteps: 8
+  cubemapConvolutionExponent: 1.5
+  seamlessCubemap: 0
+  textureFormat: -1
+  maxTextureSize: 2048
+  textureSettings:
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapMode: -1
+  nPOTScale: 1
+  lightmap: 0
+  rGBM: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: .5, y: .5}
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spritePixelsToUnits: 100
+  alphaIsTransparency: 0
+  textureType: -1
+  buildTargetSettings: []
+  spriteSheet:
+    sprites: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/MecanimContainer.cs

@@ -0,0 +1,13 @@
+using UnityEngine;
+using System.Collections;
+
+public class MecanimContainer : MonoBehaviour
+{
+    public Child ImmediateParent;
+
+    // For Mecanim
+    public void throw_pillow()
+    {
+        ImmediateParent.ThrowMecanimPillow();
+    }
+}

Assets/MecanimContainer.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 4d248c94f1991a74ba25229de4e648ea
+timeCreated: 1440351256
+licenseType: Free
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Child 2.prefab.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7b2324b0ba2cbba47a32db098a5a4a3b
+timeCreated: 1440354908
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Prefabs/Child.prefab

@@ -417,6 +417,7 @@ GameObject:
   m_Component:
   - 4: {fileID: 436644}
   - 95: {fileID: 9580008}
+  - 114: {fileID: 11484968}
   m_Layer: 0
   m_Name: Container
   m_TagString: Untagged
@@ -1072,7 +1073,6 @@ MonoBehaviour:
   Avatar: {fileID: 0}
   Animator: {fileID: 9580008}
   AnimationPillow: {fileID: 134552}
-  target: {fileID: 0}
 --- !u!114 &11446734
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1084,7 +1084,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e6ffb35a11ff1f545ac22f7ea752cffb, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  PlayerNumber: 1
+  PlayerNumber: 0
 --- !u!114 &11474836
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1097,6 +1097,18 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   minAngleRange: 10
+--- !u!114 &11484968
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 166010}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4d248c94f1991a74ba25229de4e648ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ImmediateParent: {fileID: 11430644}
 --- !u!135 &13545904
 SphereCollider:
   m_ObjectHideFlags: 1

Assets/Prefabs/Floor.prefab

@@ -51,6 +51,33 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 0
+--- !u!1 &188944
+GameObject:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  serializedVersion: 4
+  m_Component:
+  - 4: {fileID: 406202}
+  m_Layer: 8
+  m_Name: LostPillows
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &406202
+Transform:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 188944}
+  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_Children: []
+  m_Father: {fileID: 426040}
+  m_RootOrder: 0
 --- !u!4 &426040
 Transform:
   m_ObjectHideFlags: 1
@@ -61,6 +88,7 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
+  - {fileID: 406202}
   - {fileID: 477364}
   - {fileID: 482734}
   m_Father: {fileID: 0}
@@ -76,7 +104,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1.01551104, z: 1}
   m_Children: []
   m_Father: {fileID: 426040}
-  m_RootOrder: 0
+  m_RootOrder: 1
 --- !u!4 &482734
 Transform:
   m_ObjectHideFlags: 1
@@ -88,7 +116,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1.03999996, z: 1}
   m_Children: []
   m_Father: {fileID: 426040}
-  m_RootOrder: 1
+  m_RootOrder: 2
 --- !u!23 &2349926
 MeshRenderer:
   m_ObjectHideFlags: 1

Assets/Prefabs/Kid_AnimControl.controller

@@ -70,7 +70,7 @@ AnimatorStateTransition:
   m_TransitionDuration: .25
   m_TransitionOffset: 0
   m_ExitTime: .659090877
-  m_HasExitTime: 1
+  m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1

Assets/Scenes/Gameplay.unity

@@ -339,6 +339,56 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: .533475876, y: .74000001, z: .589999974}
   m_Center: {x: .0127378851, y: 2.4403807e-08, z: .319999993}
+--- !u!1001 &488401107
+Prefab:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 410726, guid: 7b2324b0ba2cbba47a32db098a5a4a3b, type: 2}
+      propertyPath: m_LocalPosition.x
+      value: -2.02999997
+      objectReference: {fileID: 0}
+    - target: {fileID: 410726, guid: 7b2324b0ba2cbba47a32db098a5a4a3b, type: 2}
+      propertyPath: m_LocalPosition.y
+      value: .97299999
+      objectReference: {fileID: 0}
+    - target: {fileID: 410726, guid: 7b2324b0ba2cbba47a32db098a5a4a3b, type: 2}
+      propertyPath: m_LocalPosition.z
+      value: 2.27999997
+      objectReference: {fileID: 0}
+    - target: {fileID: 410726, guid: 7b2324b0ba2cbba47a32db098a5a4a3b, type: 2}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 410726, guid: 7b2324b0ba2cbba47a32db098a5a4a3b, type: 2}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 410726, guid: 7b2324b0ba2cbba47a32db098a5a4a3b, type: 2}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 410726, guid: 7b2324b0ba2cbba47a32db098a5a4a3b, type: 2}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 410726, guid: 7b2324b0ba2cbba47a32db098a5a4a3b, type: 2}
+      propertyPath: m_RootOrder
+      value: 7
+      objectReference: {fileID: 0}
+    - target: {fileID: 11406004, guid: 7b2324b0ba2cbba47a32db098a5a4a3b, type: 2}
+      propertyPath: Mom
+      value: 
+      objectReference: {fileID: 673576180}
+    - target: {fileID: 11406004, guid: 7b2324b0ba2cbba47a32db098a5a4a3b, type: 2}
+      propertyPath: Avatar
+      value: 
+      objectReference: {fileID: 673576179}
+    m_RemovedComponents: []
+  m_ParentPrefab: {fileID: 100100000, guid: 7b2324b0ba2cbba47a32db098a5a4a3b, type: 2}
+  m_IsPrefabParent: 0
 --- !u!1001 &510381202
 Prefab:
   m_ObjectHideFlags: 0
@@ -461,92 +511,6 @@ MonoBehaviour:
   MaxAngle: 135
   OpenDuration: 5
   CloseDuration: 1
---- !u!1001 &567140365
-Prefab:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 487994, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: m_LocalPosition.x
-      value: -2.02999997
-      objectReference: {fileID: 0}
-    - target: {fileID: 487994, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: m_LocalPosition.y
-      value: .97299999
-      objectReference: {fileID: 0}
-    - target: {fileID: 487994, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: m_LocalPosition.z
-      value: 2.27999997
-      objectReference: {fileID: 0}
-    - target: {fileID: 487994, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 487994, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 487994, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 487994, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 487994, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: m_RootOrder
-      value: 7
-      objectReference: {fileID: 0}
-    - target: {fileID: 190616, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: m_Name
-      value: Child 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 11430644, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: Mom
-      value: 
-      objectReference: {fileID: 673576180}
-    - target: {fileID: 11446734, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: PlayerNumber
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 11430644, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: hitPushBackForce
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 13685066, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: m_Material
-      value: 
-      objectReference: {fileID: 0}
-    - target: {fileID: 11430644, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: Speed
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 5480620, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: m_AngularDrag
-      value: .0500000007
-      objectReference: {fileID: 0}
-    - target: {fileID: 11430644, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: yAngleVector
-      value: 3
-      objectReference: {fileID: 0}
-    - target: {fileID: 5480620, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: m_Mass
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 11430644, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: JumpForce
-      value: 200
-      objectReference: {fileID: 0}
-    - target: {fileID: 11430644, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: Avatar
-      value: 
-      objectReference: {fileID: 673576179}
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 100100000, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-  m_IsPrefabParent: 0
 --- !u!1 &573037238
 GameObject:
   m_ObjectHideFlags: 0
@@ -681,7 +645,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 22413388, guid: dec23153e975cb94db47e642092ad58e, type: 2}
       propertyPath: m_RootOrder
-      value: 9
+      value: 10
       objectReference: {fileID: 0}
     - target: {fileID: 22413388, guid: dec23153e975cb94db47e642092ad58e, type: 2}
       propertyPath: m_AnchoredPosition.x
@@ -1346,7 +1310,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 483988, guid: 38eb021af0911154aab92f72bc4f341a, type: 2}
       propertyPath: m_RootOrder
-      value: 5
+      value: 6
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 38eb021af0911154aab92f72bc4f341a, type: 2}
@@ -1768,7 +1732,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 445796, guid: cffa81ba5df21ac4f8d31f5bed357ce1, type: 2}
       propertyPath: m_RootOrder
-      value: 2
+      value: 3
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: cffa81ba5df21ac4f8d31f5bed357ce1, type: 2}
@@ -2411,7 +2375,7 @@ Prefab:
       objectReference: {fileID: 0}
     - target: {fileID: 498212, guid: 158e745881137e04ca2086294f44d74c, type: 2}
       propertyPath: m_RootOrder
-      value: 4
+      value: 5
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 158e745881137e04ca2086294f44d74c, type: 2}
@@ -2595,10 +2559,6 @@ Prefab:
       propertyPath: m_Name
       value: Child 1
       objectReference: {fileID: 0}
-    - target: {fileID: 11446734, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
-      propertyPath: PlayerNumber
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_ParentPrefab: {fileID: 100100000, guid: 6dd661a967968c64dbae75c01fac6a09, type: 2}
   m_IsPrefabParent: 0

Assets/Scripts/AutoTarget.cs

@@ -61,6 +61,8 @@ public class AutoTarget : MonoBehaviour
 
         foreach (Transform t in targets) 
 		{
+            if (t == null) continue;
+
             Vector3 targetDirection = t.transform.position - transform.position;
 			Debug.Log(targetDirection.magnitude);
 			if (targetDirection.sqrMagnitude > rangeSq)

Assets/Scripts/Child.cs

@@ -116,27 +116,50 @@ public class Child : MonoBehaviour
         }
     }
 
+    public void ThrowMecanimPillow()
+    {
+        if (pillow == null) return;
+
+		Transform target = _autoTarget.GetTarget(transform.forward);
+
+        Vector3 direction;
+
+        if (target != null)
+        {
+            direction = target.transform.position - pillow.transform.position;
+        }
+        else
+	    {
+            direction = transform.forward;
+	    }
+
+        direction = direction.normalized;
+
+        pillow.gameObject.SetActive(true);
+        pillow.transform.localPosition = new Vector3(0.109f, -0.407f, 0.389f);
+        pillow.transform.localEulerAngles = new Vector3(0f, 204.46f, 310.0002f);
+
+        AnimationPillow.SetActive(false);
+
+        pillow.Throw(direction * ThrowForce);
+
+        pillow.IsOwned = false;
+
+		target = null;
+
+        pillow = null;
+    }
+
     void OnTriggerEnter(Collider other) {
         if (other.tag == "Pillow"){
 
             Pillow incomingPillow = other.GetComponent<Pillow>();
 
-            // picking up a pillow
-            if (this.pillow == null && incomingPillow.IsPickable) {
-
-                pillow = incomingPillow;
-
-                pillow.transform.parent = transform; // make the pillow a child of Child
-                pillow.transform.localPosition = new Vector3(0f, 1.5f, 0f);
-                pillow.GetComponent<Rigidbody>().isKinematic = true; // dont make pillow obey to gravity when in a child's hands
-                pillow.IsOwned = true;
-                
-                // TODO: place the pillow correctly or animate or something...
-            }
-
             // getting hit by a pillow
-            else if (incomingPillow.IsThrown) {
+            if (incomingPillow.IsThrown) {
-
+                Debug.Log("abc");
+                if (incomingPillow.Owner != this)
+                {
                     //player is hit
                     Debug.Log("Child is hit by a pillow");
 
@@ -144,6 +167,21 @@ public class Child : MonoBehaviour
                     Destroy(other.gameObject);
                 }
             }
+            // picking up a pillow
+            else if (this.pillow == null && incomingPillow.IsPickable) {
+                Debug.Log("def");
+                pillow = incomingPillow;
+
+                pillow.transform.parent = transform; // make the pillow a child of Child
+                pillow.gameObject.SetActive(false);
+                pillow.GetComponent<Rigidbody>().isKinematic = true; // dont make pillow obey to gravity when in a child's hands
+                pillow.IsOwned = true;
+                pillow.Owner = this;
+                AnimationPillow.SetActive(true);
+                
+                // TODO: place the pillow correctly or animate or something...
+            }
+        }
     }
 
     private bool IsGrounded()
@@ -209,27 +247,6 @@ public class Child : MonoBehaviour
         if (_isInLava) return;
 
         if (pillow != null) {
-
-            Vector3 direction;
-
-            Transform target = _autoTarget.GetTarget(transform.forward);
-
-            if (target != null) {
-                direction = target.transform.position - pillow.transform.position;
-            }
-            else {
-                direction = transform.forward;
-            }
-            direction = direction.normalized;
-
-            
-            pillow.Throw(direction * ThrowForce);
-
-            pillow.IsOwned = false;
-
-            pillow = null;
-
-            target = null;
             Animator.SetTrigger("StartAttack");
         }
     }
@@ -287,11 +304,6 @@ public class Child : MonoBehaviour
 
     void OnCollisionStay(Collision collision)
     {
-        if (collision.gameObject.tag == "Walls")
-        {
-            Debug.Log(_isPushed);
-        }
-
         if (collision.gameObject.tag == "Lava")
         {
             _invulnerableTime += Time.deltaTime;
@@ -310,9 +322,10 @@ public class Child : MonoBehaviour
         }
         else if (_wasPushed && collision.gameObject.tag == "Walls")
         {
+            /*
             _wasPushed = false;
 
-            Push(Vector3.Reflect(_pushedDir.normalized, collision.contacts[0].normal) * _pushedDir.magnitude);
+            Push(Vector3.Reflect(_pushedDir.normalized, collision.contacts[0].normal) * _pushedDir.magnitude);*/
         }
     }
 

Assets/Scripts/Pillow.cs

@@ -31,6 +31,15 @@ public class Pillow : MonoBehaviour {
         }
     }
 
+    private Child _owner;
+
+    public Child Owner
+    {
+        get { return _owner; }
+        set { _owner = value; }
+    }
+
+
 	// Use this for initialization
 	void Start () {
         _col = GetComponent<Collider>();
@@ -71,7 +80,10 @@ public class Pillow : MonoBehaviour {
 	}
 
     void OnCollisionEnter(Collision other) {
-        if (!IsPickable && !IsLost) {
+        Child child = other.gameObject.GetComponent<Child>();
+
+        if (!IsPickable && !IsLost && Owner == child)
+        {
             // on first collision, revert the pillow as pickable
             MakePickable();
         }