diff --git a/PinataSmackdown/ProjectSettings/AudioManager.asset b/PinataSmackdown/ProjectSettings/AudioManager.asset deleted file mode 100644 index e971d21..0000000 Binary files a/PinataSmackdown/ProjectSettings/AudioManager.asset and /dev/null differ diff --git a/PinataSmackdown/ProjectSettings/DynamicsManager.asset b/PinataSmackdown/ProjectSettings/DynamicsManager.asset deleted file mode 100644 index 655a767..0000000 Binary files a/PinataSmackdown/ProjectSettings/DynamicsManager.asset and /dev/null differ diff --git a/PinataSmackdown/ProjectSettings/EditorBuildSettings.asset b/PinataSmackdown/ProjectSettings/EditorBuildSettings.asset deleted file mode 100644 index d02b9cd..0000000 Binary files a/PinataSmackdown/ProjectSettings/EditorBuildSettings.asset and /dev/null differ diff --git a/PinataSmackdown/ProjectSettings/EditorSettings.asset b/PinataSmackdown/ProjectSettings/EditorSettings.asset deleted file mode 100644 index 5b7be07..0000000 Binary files a/PinataSmackdown/ProjectSettings/EditorSettings.asset and /dev/null differ diff --git a/PinataSmackdown/ProjectSettings/GraphicsSettings.asset b/PinataSmackdown/ProjectSettings/GraphicsSettings.asset deleted file mode 100644 index c0ee0ec..0000000 Binary files a/PinataSmackdown/ProjectSettings/GraphicsSettings.asset and /dev/null differ diff --git a/PinataSmackdown/ProjectSettings/InputManager.asset b/PinataSmackdown/ProjectSettings/InputManager.asset deleted file mode 100644 index 111ba9e..0000000 Binary files a/PinataSmackdown/ProjectSettings/InputManager.asset and /dev/null differ diff --git a/PinataSmackdown/ProjectSettings/NavMeshLayers.asset b/PinataSmackdown/ProjectSettings/NavMeshLayers.asset deleted file mode 100644 index 22e2058..0000000 Binary files a/PinataSmackdown/ProjectSettings/NavMeshLayers.asset and /dev/null differ diff --git a/PinataSmackdown/ProjectSettings/NetworkManager.asset b/PinataSmackdown/ProjectSettings/NetworkManager.asset deleted file mode 100644 index 3e988a1..0000000 Binary files a/PinataSmackdown/ProjectSettings/NetworkManager.asset and /dev/null differ diff --git a/PinataSmackdown/ProjectSettings/Physics2DSettings.asset b/PinataSmackdown/ProjectSettings/Physics2DSettings.asset deleted file mode 100644 index 9b87d5f..0000000 Binary files a/PinataSmackdown/ProjectSettings/Physics2DSettings.asset and /dev/null differ diff --git a/PinataSmackdown/ProjectSettings/ProjectSettings.asset b/PinataSmackdown/ProjectSettings/ProjectSettings.asset deleted file mode 100644 index e20ebdd..0000000 Binary files a/PinataSmackdown/ProjectSettings/ProjectSettings.asset and /dev/null differ diff --git a/PinataSmackdown/ProjectSettings/QualitySettings.asset b/PinataSmackdown/ProjectSettings/QualitySettings.asset deleted file mode 100644 index 19409d5..0000000 Binary files a/PinataSmackdown/ProjectSettings/QualitySettings.asset and /dev/null differ diff --git a/PinataSmackdown/ProjectSettings/TagManager.asset b/PinataSmackdown/ProjectSettings/TagManager.asset deleted file mode 100644 index 3ab674d..0000000 Binary files a/PinataSmackdown/ProjectSettings/TagManager.asset and /dev/null differ diff --git a/PinataSmackdown/ProjectSettings/TimeManager.asset b/PinataSmackdown/ProjectSettings/TimeManager.asset deleted file mode 100644 index 6a2964f..0000000 Binary files a/PinataSmackdown/ProjectSettings/TimeManager.asset and /dev/null differ diff --git a/PinataSmackdown_unity/.DS_Store b/PinataSmackdown_unity/.DS_Store deleted file mode 100644 index 233f08c..0000000 Binary files a/PinataSmackdown_unity/.DS_Store and /dev/null differ diff --git a/PinataSmackdown_unity/Assets/.DS_Store b/PinataSmackdown_unity/Assets/.DS_Store deleted file mode 100644 index c201f4d..0000000 Binary files a/PinataSmackdown_unity/Assets/.DS_Store and /dev/null differ diff --git a/PinataSmackdown_unity/Assets/Lachlan_jump_work.unity b/PinataSmackdown_unity/Assets/Lachlan_jump_work.unity deleted file mode 100644 index dc2ac94..0000000 Binary files a/PinataSmackdown_unity/Assets/Lachlan_jump_work.unity and /dev/null differ diff --git a/PinataSmackdown_unity/Assets/Lachlan_jump_work.unity.meta b/PinataSmackdown_unity/Assets/Lachlan_jump_work.unity.meta deleted file mode 100644 index e26cfb1..0000000 --- a/PinataSmackdown_unity/Assets/Lachlan_jump_work.unity.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 7929efa0d0fa84d269f932355f708f12 -DefaultImporter: - userData: diff --git a/PinataSmackdown_unity/Assets/Main Camera.prefab b/PinataSmackdown_unity/Assets/Main Camera.prefab deleted file mode 100644 index 2da1082..0000000 Binary files a/PinataSmackdown_unity/Assets/Main Camera.prefab and /dev/null differ diff --git a/PinataSmackdown_unity/Assets/Main Camera.prefab.meta b/PinataSmackdown_unity/Assets/Main Camera.prefab.meta deleted file mode 100644 index 6a11ca1..0000000 --- a/PinataSmackdown_unity/Assets/Main Camera.prefab.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: c9c7412211778407f9c1450e23c597fc -NativeFormatImporter: - userData: diff --git a/PinataSmackdown_unity/Assets/Materials.meta b/PinataSmackdown_unity/Assets/Materials.meta deleted file mode 100644 index 325179b..0000000 --- a/PinataSmackdown_unity/Assets/Materials.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 334a07353496b3f4682903e0a28dbad0 -folderAsset: yes -DefaultImporter: - userData: diff --git a/PinataSmackdown_unity/Assets/Materials/lambert1.mat b/PinataSmackdown_unity/Assets/Materials/lambert1.mat deleted file mode 100644 index d05ff69..0000000 Binary files a/PinataSmackdown_unity/Assets/Materials/lambert1.mat and /dev/null differ diff --git a/PinataSmackdown_unity/Assets/Materials/lambert1.mat.meta b/PinataSmackdown_unity/Assets/Materials/lambert1.mat.meta deleted file mode 100644 index 1b7cf07..0000000 --- a/PinataSmackdown_unity/Assets/Materials/lambert1.mat.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: ef3b7b6cdc3ee234899234695bd8d7c3 -NativeFormatImporter: - userData: diff --git a/PinataSmackdown_unity/Assets/Materials/pillar_unrapped 1.mat b/PinataSmackdown_unity/Assets/Materials/pillar_unrapped 1.mat deleted file mode 100644 index f3fba7a..0000000 Binary files a/PinataSmackdown_unity/Assets/Materials/pillar_unrapped 1.mat and /dev/null differ diff --git a/PinataSmackdown_unity/Assets/Materials/pillar_unrapped 1.mat.meta b/PinataSmackdown_unity/Assets/Materials/pillar_unrapped 1.mat.meta deleted file mode 100644 index ac13cb0..0000000 --- a/PinataSmackdown_unity/Assets/Materials/pillar_unrapped 1.mat.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 001b004239ebbc846b32fe5e3bbab73c -NativeFormatImporter: - userData: diff --git a/PinataSmackdown_unity/Assets/Materials/pillar_unrapped.mat b/PinataSmackdown_unity/Assets/Materials/pillar_unrapped.mat deleted file mode 100644 index 6399eaa..0000000 Binary files a/PinataSmackdown_unity/Assets/Materials/pillar_unrapped.mat and /dev/null differ diff --git a/PinataSmackdown_unity/Assets/Materials/pillar_unrapped.mat.meta b/PinataSmackdown_unity/Assets/Materials/pillar_unrapped.mat.meta deleted file mode 100644 index 664f70d..0000000 --- a/PinataSmackdown_unity/Assets/Materials/pillar_unrapped.mat.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 4e19020496989f94dba07a0025059bcf -NativeFormatImporter: - userData: diff --git a/PinataSmackdown_unity/Assets/Materials/platform_texture.mat b/PinataSmackdown_unity/Assets/Materials/platform_texture.mat deleted file mode 100644 index a247928..0000000 Binary files a/PinataSmackdown_unity/Assets/Materials/platform_texture.mat and /dev/null differ diff --git a/PinataSmackdown_unity/Assets/Materials/platform_texture.mat.meta b/PinataSmackdown_unity/Assets/Materials/platform_texture.mat.meta deleted file mode 100644 index 9dc3b70..0000000 --- a/PinataSmackdown_unity/Assets/Materials/platform_texture.mat.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 0ed59f0aa227af74e943e157e83fd03e -NativeFormatImporter: - userData: diff --git a/PinataSmackdown_unity/Assets/New Terrain.asset b/PinataSmackdown_unity/Assets/New Terrain.asset deleted file mode 100644 index bb7b28a..0000000 Binary files a/PinataSmackdown_unity/Assets/New Terrain.asset and /dev/null differ diff --git a/PinataSmackdown_unity/Assets/New Terrain.asset.meta b/PinataSmackdown_unity/Assets/New Terrain.asset.meta deleted file mode 100644 index 90162b2..0000000 --- a/PinataSmackdown_unity/Assets/New Terrain.asset.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: a03922fd2222daf45aa6220f0ae167ad -NativeFormatImporter: - userData: diff --git a/PinataSmackdown_unity/Assets/P1weapon.cs b/PinataSmackdown_unity/Assets/P1weapon.cs deleted file mode 100644 index 2c9474d..0000000 --- a/PinataSmackdown_unity/Assets/P1weapon.cs +++ /dev/null @@ -1,56 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class P1weapon : MonoBehaviour { - - public float pushMagnitude = 500; - - void Start () { - renderer.enabled = false; - } - - void Update (){ - if (Input.GetKeyDown (KeyCode.KeypadEnter)) { - // show - renderer.enabled = true; - collider2D.enabled = true; - } - if (Input.GetKeyUp (KeyCode.KeypadEnter)){ - renderer.enabled = false; - collider2D.enabled = false; - } - - } - - void OnCollisionEnter2D (Collision2D other){ - Vector2 ab = new Vector2 (0, 0); - //pushmagntiude - - if (other.gameObject.name == "Cube2") { - - //Get a and b - Vector2 a; - Vector2 b; - a = transform.position; - b = other.transform.position; - //Calculate AB-> - ab = b - a; - Debug.Log (ab); - //Modify to add height - ab = new Vector2 (ab.x,ab.y +0.8f); - Debug.Log (ab); - //Normalise AB - ab.Normalize(); - Debug.Log (ab); - //Multiple AB by push magnitude - ab = ab * pushMagnitude; - Debug.Log (ab); - //Push opponent by AB * magnitude - other.gameObject.rigidbody2D.AddForce (ab, ForceMode2D.Force); - other.gameObject.GetComponent().Pushed(); - } - } - - // Update is called once per frame - -} \ No newline at end of file diff --git a/PinataSmackdown_unity/Assets/P1weapon.cs.meta b/PinataSmackdown_unity/Assets/P1weapon.cs.meta deleted file mode 100644 index fc0d1b3..0000000 --- a/PinataSmackdown_unity/Assets/P1weapon.cs.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 048f4317d0f555545a68dd6b84173109 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: diff --git a/PinataSmackdown_unity/Assets/P2_weapon.cs b/PinataSmackdown_unity/Assets/P2_weapon.cs deleted file mode 100644 index fa64d02..0000000 --- a/PinataSmackdown_unity/Assets/P2_weapon.cs +++ /dev/null @@ -1,56 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class P2_weapon : MonoBehaviour { - - public float pushMagnitude = 500; - - void Start () { - renderer.enabled = false; - } - - void Update (){ - if (Input.GetKeyDown (KeyCode.Space)) { - // show - renderer.enabled = true; - collider2D.enabled = true; - } - if (Input.GetKeyUp (KeyCode.Space)){ - renderer.enabled = false; - collider2D.enabled = false; - } - - } - - void OnCollisionEnter2D (Collision2D col){ - Vector2 ab = new Vector2 (0, 0); - //pushmagntiude - - if (col.gameObject.name == "Cube") { - - //Get a and b - Vector2 a; - Vector2 b; - a = transform.position; - b = col.transform.position; - //Calculate AB-> - ab = b - a; - Debug.Log (ab); - //Modify to add height - ab = new Vector2 (ab.x,ab.y +0.8f); - Debug.Log (ab); - //Normalise AB - ab.Normalize(); - Debug.Log (ab); - //Multiple AB by push magnitude - ab = ab * pushMagnitude; - Debug.Log (ab); - //Push opponent by AB * magnitude - col.gameObject.rigidbody2D.AddForce (ab, ForceMode2D.Force); - col.gameObject.GetComponent().Pushed(); - } - } - - // Update is called once per frame - -} \ No newline at end of file diff --git a/PinataSmackdown_unity/Assets/P2_weapon.cs.meta b/PinataSmackdown_unity/Assets/P2_weapon.cs.meta deleted file mode 100644 index dc87fb3..0000000 --- a/PinataSmackdown_unity/Assets/P2_weapon.cs.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f348d28f3452e574c9fe07574e3ca5ee -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: diff --git a/PinataSmackdown_unity/Assets/Platform_obj.fbx b/PinataSmackdown_unity/Assets/Platform_obj.fbx deleted file mode 100644 index 0cc2ed7..0000000 Binary files a/PinataSmackdown_unity/Assets/Platform_obj.fbx and /dev/null differ diff --git a/PinataSmackdown_unity/Assets/Platform_obj.fbx.meta b/PinataSmackdown_unity/Assets/Platform_obj.fbx.meta deleted file mode 100644 index bdc3bb4..0000000 --- a/PinataSmackdown_unity/Assets/Platform_obj.fbx.meta +++ /dev/null @@ -1,99 +0,0 @@ -fileFormatVersion: 2 -guid: 96897ea8068e16045a2b6b10cf1b62dd -ModelImporter: - serializedVersion: 16 - fileIDToRecycleName: - 100000: pCube1 - 100002: pCylinder1 - 100004: //RootNode - 100006: polySurface2 - 100008: polySurface3 - 100010: polySurface4 - 100012: polySurface5 - 100014: polySurface6 - 100016: polySurface7 - 100018: polySurface9 - 100020: transform1 - 100022: transform2 - 100024: transform3 - 100026: transform4 - 100028: transform5 - 100030: transform6 - 100032: transform7 - 100034: transform8 - 400000: pCube1 - 400002: pCylinder1 - 400004: //RootNode - 400006: polySurface2 - 400008: polySurface3 - 400010: polySurface4 - 400012: polySurface5 - 400014: polySurface6 - 400016: polySurface7 - 400018: polySurface9 - 400020: transform1 - 400022: transform2 - 400024: transform3 - 400026: transform4 - 400028: transform5 - 400030: transform6 - 400032: transform7 - 400034: transform8 - 2300000: polySurface9 - 3300000: polySurface9 - 4300000: polySurface9 - 9500000: //RootNode - materials: - importMaterials: 1 - materialName: 0 - materialSearch: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - optimizeGameObjects: 0 - motionNodeName: - animationCompression: 1 - animationRotationError: .5 - animationPositionError: .5 - animationScaleError: .5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - clipAnimations: [] - isReadable: 1 - meshes: - lODScreenPercentages: [] - globalScale: .00999999978 - meshCompression: 0 - addColliders: 0 - importBlendShapes: 1 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - optimizeMeshForGPU: 1 - weldVertices: 1 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVPackMargin: 4 - 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: diff --git a/PinataSmackdown_unity/Assets/PlayerControler.cs b/PinataSmackdown_unity/Assets/PlayerControler.cs deleted file mode 100644 index 96296bf..0000000 --- a/PinataSmackdown_unity/Assets/PlayerControler.cs +++ /dev/null @@ -1,62 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class PlayerControler : MonoBehaviour { - - void Start () { - } - - bool pushed = false; - public float speed; - public Vector2 jumpVector; - public GameObject bullet; - bool canJump = true; - bool facingLeft = true; - float currentSpeed; - float pushtime; - - void Update() { - if (!pushed) { - Vector2 velo = rigidbody2D.velocity; - velo.x = (Input.GetAxis ("Horizontal_P1") * speed); - rigidbody2D.velocity = velo; - } else { - Vector2 velo = rigidbody2D.velocity; - if (velo.x < 0.4f && Time.time > pushtime) - pushed = false; - } - - if (Input.GetKey (KeyCode.UpArrow)){ - if (canJump == true){ - rigidbody2D.velocity = jumpVector; - canJump = false; - } - } - - if (Input.GetKeyDown ("RightArrow") && facingLeft) { - transform.Rotate (Vector3.up * 180); - facingLeft = false; - } - - if (Input.GetKeyDown ("LeftArrow") && !facingLeft) { - transform.Rotate (Vector3.up * 180); - facingLeft = true; - } - - transform.eulerAngles = new Vector3 (transform.eulerAngles.x, transform.eulerAngles.y,0); - -} - - void OnCollisionEnter2D(Collision2D col){ - if (col.collider.tag == "ground") - canJump = true; - else if(col.collider.tag == "Player") - canJump = true; -} - - public void Pushed(){ - pushed = true; - pushtime = Time.time + 0.5f; - } - -} \ No newline at end of file diff --git a/PinataSmackdown_unity/Assets/PlayerControler.cs.meta b/PinataSmackdown_unity/Assets/PlayerControler.cs.meta deleted file mode 100644 index 8794a99..0000000 --- a/PinataSmackdown_unity/Assets/PlayerControler.cs.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2f110149822ba46b39723c6d01336581 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: diff --git a/PinataSmackdown_unity/Assets/bounce.physicsMaterial2D b/PinataSmackdown_unity/Assets/bounce.physicsMaterial2D deleted file mode 100644 index 7559879..0000000 Binary files a/PinataSmackdown_unity/Assets/bounce.physicsMaterial2D and /dev/null differ diff --git a/PinataSmackdown_unity/Assets/bounce.physicsMaterial2D.meta b/PinataSmackdown_unity/Assets/bounce.physicsMaterial2D.meta deleted file mode 100644 index c4a19cc..0000000 --- a/PinataSmackdown_unity/Assets/bounce.physicsMaterial2D.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 0b5d5cd6009d64349bcb76767e5bf374 -NativeFormatImporter: - userData: diff --git a/PinataSmackdown_unity/Assets/bullet.prefab b/PinataSmackdown_unity/Assets/bullet.prefab deleted file mode 100644 index f9061be..0000000 Binary files a/PinataSmackdown_unity/Assets/bullet.prefab and /dev/null differ diff --git a/PinataSmackdown_unity/Assets/bullet.prefab.meta b/PinataSmackdown_unity/Assets/bullet.prefab.meta deleted file mode 100644 index 0bdaf41..0000000 --- a/PinataSmackdown_unity/Assets/bullet.prefab.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: ebb0d5e70fdd4442f970c56d96d1458a -NativeFormatImporter: - userData: diff --git a/PinataSmackdown_unity/Assets/bulletScript.cs b/PinataSmackdown_unity/Assets/bulletScript.cs deleted file mode 100644 index eef6c2f..0000000 --- a/PinataSmackdown_unity/Assets/bulletScript.cs +++ /dev/null @@ -1,15 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class bulletScript : MonoBehaviour { - - // Use this for initialization - void Start () { - - } - - // Update is called once per frame - void Update () { - - } -} diff --git a/PinataSmackdown_unity/Assets/bulletScript.cs.meta b/PinataSmackdown_unity/Assets/bulletScript.cs.meta deleted file mode 100644 index 4f3b724..0000000 --- a/PinataSmackdown_unity/Assets/bulletScript.cs.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 23f72220ec483487aa9bf941388b45e7 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: diff --git a/PinataSmackdown_unity/Assets/camera_controls.cs b/PinataSmackdown_unity/Assets/camera_controls.cs deleted file mode 100644 index feb8f97..0000000 --- a/PinataSmackdown_unity/Assets/camera_controls.cs +++ /dev/null @@ -1,13 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class camera_controls : MonoBehaviour { - - - public Transform target; - - // Update is called once per frame - void Update () { - transform.LookAt (target); - } -} diff --git a/PinataSmackdown_unity/Assets/camera_controls.cs.meta b/PinataSmackdown_unity/Assets/camera_controls.cs.meta deleted file mode 100644 index 45bbff6..0000000 --- a/PinataSmackdown_unity/Assets/camera_controls.cs.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 045a6233a4cf68244bcbd915a1ce4eb0 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: diff --git a/PinataSmackdown_unity/Assets/floating_platform_02.mb b/PinataSmackdown_unity/Assets/floating_platform_02.mb deleted file mode 100644 index b9b1cbd..0000000 Binary files a/PinataSmackdown_unity/Assets/floating_platform_02.mb and /dev/null differ diff --git a/PinataSmackdown_unity/Assets/floating_platform_02.mb.meta b/PinataSmackdown_unity/Assets/floating_platform_02.mb.meta deleted file mode 100644 index aae8047..0000000 --- a/PinataSmackdown_unity/Assets/floating_platform_02.mb.meta +++ /dev/null @@ -1,105 +0,0 @@ -fileFormatVersion: 2 -guid: 46d43006d4940ab48a54b4aff194420e -ModelImporter: - serializedVersion: 16 - fileIDToRecycleName: - 100000: //RootNode - 100002: pCube1 - 100004: pCylinder1 - 100006: polySurface2 - 100008: polySurface3 - 100010: polySurface4 - 100012: polySurface5 - 100014: polySurface6 - 100016: polySurface7 - 100018: polySurface8 - 100020: polySurface9 - 100022: transform1 - 100024: transform2 - 100026: transform3 - 100028: transform4 - 100030: transform5 - 100032: transform6 - 100034: transform7 - 400000: //RootNode - 400002: pCube1 - 400004: pCylinder1 - 400006: polySurface2 - 400008: polySurface3 - 400010: polySurface4 - 400012: polySurface5 - 400014: polySurface6 - 400016: polySurface7 - 400018: polySurface8 - 400020: polySurface9 - 400022: transform1 - 400024: transform2 - 400026: transform3 - 400028: transform4 - 400030: transform5 - 400032: transform6 - 400034: transform7 - 2300000: pCylinder1 - 2300002: polySurface8 - 2300004: polySurface9 - 3300000: pCylinder1 - 3300002: polySurface8 - 3300004: polySurface9 - 4300000: polySurface8 - 4300002: polySurface9 - 4300004: pCylinder1 - 9500000: //RootNode - materials: - importMaterials: 1 - materialName: 0 - materialSearch: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - optimizeGameObjects: 0 - motionNodeName: - 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 - weldVertices: 1 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVPackMargin: 4 - 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: diff --git a/PinataSmackdown_unity/Assets/pillar_obj.fbx b/PinataSmackdown_unity/Assets/pillar_obj.fbx deleted file mode 100644 index 4fd3683..0000000 Binary files a/PinataSmackdown_unity/Assets/pillar_obj.fbx and /dev/null differ diff --git a/PinataSmackdown_unity/Assets/pillar_obj.fbx.meta b/PinataSmackdown_unity/Assets/pillar_obj.fbx.meta deleted file mode 100644 index cd3c22f..0000000 --- a/PinataSmackdown_unity/Assets/pillar_obj.fbx.meta +++ /dev/null @@ -1,83 +0,0 @@ -fileFormatVersion: 2 -guid: c5c501b1516413f4d916ad0a9aa39dee -ModelImporter: - serializedVersion: 16 - fileIDToRecycleName: - 100000: pCube1 - 100002: pCube2 - 100004: //RootNode - 100006: polySurface1 - 100008: polySurface2 - 100010: polySurface3 - 100012: transform1 - 100014: transform2 - 100016: transform3 - 100018: transform4 - 400000: pCube1 - 400002: pCube2 - 400004: //RootNode - 400006: polySurface1 - 400008: polySurface2 - 400010: polySurface3 - 400012: transform1 - 400014: transform2 - 400016: transform3 - 400018: transform4 - 2300000: polySurface3 - 3300000: polySurface3 - 4300000: polySurface3 - 9500000: //RootNode - materials: - importMaterials: 1 - materialName: 0 - materialSearch: 1 - animations: - legacyGenerateAnimations: 4 - bakeSimulation: 0 - optimizeGameObjects: 0 - motionNodeName: - animationCompression: 1 - animationRotationError: .5 - animationPositionError: .5 - animationScaleError: .5 - animationWrapMode: 0 - extraExposedTransformPaths: [] - clipAnimations: [] - isReadable: 1 - meshes: - lODScreenPercentages: [] - globalScale: .00999999978 - meshCompression: 0 - addColliders: 0 - importBlendShapes: 1 - swapUVChannels: 0 - generateSecondaryUV: 0 - useFileUnits: 1 - optimizeMeshForGPU: 1 - weldVertices: 1 - secondaryUVAngleDistortion: 8 - secondaryUVAreaDistortion: 15.000001 - secondaryUVHardAngle: 88 - secondaryUVPackMargin: 4 - 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: diff --git a/PinataSmackdown_unity/Assets/pillar_unrapped.jpg b/PinataSmackdown_unity/Assets/pillar_unrapped.jpg deleted file mode 100644 index f0deb0d..0000000 Binary files a/PinataSmackdown_unity/Assets/pillar_unrapped.jpg and /dev/null differ diff --git a/PinataSmackdown_unity/Assets/pillar_unrapped.jpg.meta b/PinataSmackdown_unity/Assets/pillar_unrapped.jpg.meta deleted file mode 100644 index feafe66..0000000 --- a/PinataSmackdown_unity/Assets/pillar_unrapped.jpg.meta +++ /dev/null @@ -1,47 +0,0 @@ -fileFormatVersion: 2 -guid: f37370ad476d899488b6ffff02c320a0 -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 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 1024 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 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: diff --git a/PinataSmackdown_unity/Assets/platform_texture.jpg b/PinataSmackdown_unity/Assets/platform_texture.jpg deleted file mode 100644 index b0e3654..0000000 Binary files a/PinataSmackdown_unity/Assets/platform_texture.jpg and /dev/null differ diff --git a/PinataSmackdown_unity/Assets/platform_texture.jpg.meta b/PinataSmackdown_unity/Assets/platform_texture.jpg.meta deleted file mode 100644 index bee8720..0000000 --- a/PinataSmackdown_unity/Assets/platform_texture.jpg.meta +++ /dev/null @@ -1,47 +0,0 @@ -fileFormatVersion: 2 -guid: 8126159699ad4be41b6ec1224406e340 -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 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 1024 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 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: diff --git a/PinataSmackdown_unity/Assets/player2_controls.cs b/PinataSmackdown_unity/Assets/player2_controls.cs deleted file mode 100644 index bc7abd0..0000000 --- a/PinataSmackdown_unity/Assets/player2_controls.cs +++ /dev/null @@ -1,62 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class player2_controls : MonoBehaviour { - - void Start () { - } - - bool pushed = false; - public float speed; - public Vector2 jumpVector; - public GameObject bullet; - bool canJump = true; - bool facingRight = true; - float currentSpeed; - float pushtime; - - void Update() { - if (!pushed) { - Vector2 velo = rigidbody2D.velocity; - velo.x = (Input.GetAxis ("Horizontal_P2") * speed); - rigidbody2D.velocity = velo; - } else { - Vector2 velo = rigidbody2D.velocity; - if (velo.x < 0.4f && Time.time > pushtime) - pushed = false; - } - - if (Input.GetKey (KeyCode.W)){ - if (canJump == true){ - rigidbody2D.velocity = jumpVector; - canJump = false; - } - } - - if (Input.GetKeyDown ("a") && facingRight) { - transform.Rotate (Vector3.up * 180); - facingRight = false; - } - - if (Input.GetKeyDown ("d") && !facingRight) { - transform.Rotate (Vector3.up * 180); - facingRight = true; - } - - transform.eulerAngles = new Vector3 (transform.eulerAngles.x, transform.eulerAngles.y,0); - -} - - void OnCollisionEnter2D(Collision2D col){ - if (col.collider.tag == "ground") - canJump = true; - else if(col.collider.tag == "Player") - canJump = true; - } - - public void Pushed(){ - pushed = true; - pushtime = Time.time + 0.5f; - } - -} \ No newline at end of file diff --git a/PinataSmackdown_unity/Assets/player2_controls.cs.meta b/PinataSmackdown_unity/Assets/player2_controls.cs.meta deleted file mode 100644 index 746abb2..0000000 --- a/PinataSmackdown_unity/Assets/player2_controls.cs.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e1ccee01ee999524e8c0e99f0e5ac3d8 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: diff --git a/PinataSmackdown_unity/Assets/sc.cs b/PinataSmackdown_unity/Assets/sc.cs deleted file mode 100644 index 48d9bfc..0000000 --- a/PinataSmackdown_unity/Assets/sc.cs +++ /dev/null @@ -1,16 +0,0 @@ -using UnityEngine; -using System.Collections; - -public class sc : MonoBehaviour { - Quaternion rotation; - - // Use this for initialization - void Awake () { - rotation = transform.rotation; - } - - // Update is called once per frame - void LateUpdate () { - transform.rotation = rotation; - } -} diff --git a/PinataSmackdown_unity/Assets/sc.cs.meta b/PinataSmackdown_unity/Assets/sc.cs.meta deleted file mode 100644 index 6a19955..0000000 --- a/PinataSmackdown_unity/Assets/sc.cs.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8664bb421145d654e8a7367a64b7ca5e -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: diff --git a/PinataSmackdown_unity/ProjectSettings/AudioManager.asset b/PinataSmackdown_unity/ProjectSettings/AudioManager.asset deleted file mode 100644 index e971d21..0000000 Binary files a/PinataSmackdown_unity/ProjectSettings/AudioManager.asset and /dev/null differ diff --git a/PinataSmackdown_unity/ProjectSettings/DynamicsManager.asset b/PinataSmackdown_unity/ProjectSettings/DynamicsManager.asset deleted file mode 100644 index 655a767..0000000 Binary files a/PinataSmackdown_unity/ProjectSettings/DynamicsManager.asset and /dev/null differ diff --git a/PinataSmackdown_unity/ProjectSettings/EditorBuildSettings.asset b/PinataSmackdown_unity/ProjectSettings/EditorBuildSettings.asset deleted file mode 100644 index d02b9cd..0000000 Binary files a/PinataSmackdown_unity/ProjectSettings/EditorBuildSettings.asset and /dev/null differ diff --git a/PinataSmackdown_unity/ProjectSettings/EditorSettings.asset b/PinataSmackdown_unity/ProjectSettings/EditorSettings.asset deleted file mode 100644 index 7fa5ee5..0000000 Binary files a/PinataSmackdown_unity/ProjectSettings/EditorSettings.asset and /dev/null differ diff --git a/PinataSmackdown_unity/ProjectSettings/GraphicsSettings.asset b/PinataSmackdown_unity/ProjectSettings/GraphicsSettings.asset deleted file mode 100644 index c0ee0ec..0000000 Binary files a/PinataSmackdown_unity/ProjectSettings/GraphicsSettings.asset and /dev/null differ diff --git a/PinataSmackdown_unity/ProjectSettings/InputManager.asset b/PinataSmackdown_unity/ProjectSettings/InputManager.asset deleted file mode 100644 index 8a974c2..0000000 Binary files a/PinataSmackdown_unity/ProjectSettings/InputManager.asset and /dev/null differ diff --git a/PinataSmackdown_unity/ProjectSettings/NavMeshLayers.asset b/PinataSmackdown_unity/ProjectSettings/NavMeshLayers.asset deleted file mode 100644 index 22e2058..0000000 Binary files a/PinataSmackdown_unity/ProjectSettings/NavMeshLayers.asset and /dev/null differ diff --git a/PinataSmackdown_unity/ProjectSettings/NetworkManager.asset b/PinataSmackdown_unity/ProjectSettings/NetworkManager.asset deleted file mode 100644 index 3e988a1..0000000 Binary files a/PinataSmackdown_unity/ProjectSettings/NetworkManager.asset and /dev/null differ diff --git a/PinataSmackdown_unity/ProjectSettings/Physics2DSettings.asset b/PinataSmackdown_unity/ProjectSettings/Physics2DSettings.asset deleted file mode 100644 index 9b87d5f..0000000 Binary files a/PinataSmackdown_unity/ProjectSettings/Physics2DSettings.asset and /dev/null differ diff --git a/PinataSmackdown_unity/ProjectSettings/ProjectSettings.asset b/PinataSmackdown_unity/ProjectSettings/ProjectSettings.asset deleted file mode 100644 index 1030463..0000000 Binary files a/PinataSmackdown_unity/ProjectSettings/ProjectSettings.asset and /dev/null differ diff --git a/PinataSmackdown_unity/ProjectSettings/QualitySettings.asset b/PinataSmackdown_unity/ProjectSettings/QualitySettings.asset deleted file mode 100644 index 7b8d57c..0000000 Binary files a/PinataSmackdown_unity/ProjectSettings/QualitySettings.asset and /dev/null differ diff --git a/PinataSmackdown_unity/ProjectSettings/TagManager.asset b/PinataSmackdown_unity/ProjectSettings/TagManager.asset deleted file mode 100644 index 16fc12e..0000000 Binary files a/PinataSmackdown_unity/ProjectSettings/TagManager.asset and /dev/null differ diff --git a/PinataSmackdown_unity/ProjectSettings/TimeManager.asset b/PinataSmackdown_unity/ProjectSettings/TimeManager.asset deleted file mode 100644 index 6a2964f..0000000 Binary files a/PinataSmackdown_unity/ProjectSettings/TimeManager.asset and /dev/null differ diff --git a/playable/Assets/Scenes/Menu_Scene.unity b/playable/Assets/Scenes/Menu_Scene.unity index 072fc4c..e994a2d 100644 Binary files a/playable/Assets/Scenes/Menu_Scene.unity and b/playable/Assets/Scenes/Menu_Scene.unity differ