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

Conflicts:
	Assets/Scripts/Child.cs
	ProjectSettings/TagManager.asset

Assets/Art/Level Design.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 21f90b2010bab8b4fa568ee15d020c61
+folderAsset: yes
+timeCreated: 1440217785
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Level Design/Materials.meta

@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 8b63512d5d8364b46b7faa0145f6fdf4
+folderAsset: yes
+timeCreated: 1440217786
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Level Design/Materials/No Name.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: df154e346ae884a48bfbed81c5ac654e
+timeCreated: 1440217786
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Level Design/SM_blocking.FBX.meta

@@ -0,0 +1,74 @@
+fileFormatVersion: 2
+guid: 752b5ffe7b74cf440bed2011c420a66b
+timeCreated: 1440217786
+licenseType: Free
+ModelImporter:
+  serializedVersion: 18
+  fileIDToRecycleName:
+    100000: //RootNode
+    400000: //RootNode
+    2300000: //RootNode
+    3300000: //RootNode
+    4300000: Box045
+  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: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Art/Level Design/SM_blocking1.FBX.meta

@@ -0,0 +1,74 @@
+fileFormatVersion: 2
+guid: defbc15f0064cbe4fbe8eeb419d3be9c
+timeCreated: 1440217786
+licenseType: Free
+ModelImporter:
+  serializedVersion: 18
+  fileIDToRecycleName:
+    100000: //RootNode
+    400000: //RootNode
+    2300000: //RootNode
+    3300000: //RootNode
+    4300000: Object001
+  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: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/jp.unity.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c46fa10dab418474cbf869f61d972336
+timeCreated: 1440215783
+licenseType: Free
+DefaultImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Child.cs

@@ -12,6 +12,8 @@ public class Child : MonoBehaviour
     private bool _isGrounded = false;
     private float _xValue;
     private float _zValue;
+    public Pillow pillow;
+
 
     void Awake()
     {
@@ -25,6 +27,19 @@ public class Child : MonoBehaviour
         Debug.Log(_isGrounded);
     }
 
+
+    void OnTriggerEnter(Collider other) {
+        if (other.tag == "Pillow") {
+            
+            pillow = other.GetComponent<Pillow>();
+            other.transform.parent = transform; // make the pillow a child of Child
+            
+            // TODO: place the pillow correctly or animate or something...
+
+        Debug.Log(_isGrounded);
+        }
+    }
+
     void FixedUpdate()
     {
         // We move the child depending on the camera orientation

Assets/Scripts/Pillow.cs

@@ -0,0 +1,16 @@
+using UnityEngine;
+using System.Collections;
+
+public class Pillow : MonoBehaviour {
+
+	// Use this for initialization
+	void Start () {
+	    
+	}
+	
+	// Update is called once per frame
+	void Update () {
+	    
+	}
+
+}

Assets/Scripts/Pillow.cs.meta

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