diff --git a/PinataSmackdown_unity/.DS_Store b/Pinata Smackdown/.DS_Store similarity index 100% rename from PinataSmackdown_unity/.DS_Store rename to Pinata Smackdown/.DS_Store diff --git a/playable/._Mac_Build_01.app b/Pinata Smackdown/._Mac_Build_01.app similarity index 100% rename from playable/._Mac_Build_01.app rename to Pinata Smackdown/._Mac_Build_01.app diff --git a/playable/._PC_pinatasmackdown_Data b/Pinata Smackdown/._PC_pinatasmackdown_Data similarity index 100% rename from playable/._PC_pinatasmackdown_Data rename to Pinata Smackdown/._PC_pinatasmackdown_Data diff --git a/PinataSmackdown_unity/Assets/.DS_Store b/Pinata Smackdown/Assets/.DS_Store similarity index 100% rename from PinataSmackdown_unity/Assets/.DS_Store rename to Pinata Smackdown/Assets/.DS_Store diff --git a/Pinata Smackdown/Assets/HammerWeapon01.fbx b/Pinata Smackdown/Assets/HammerWeapon01.fbx new file mode 100644 index 0000000..0c4c9ad Binary files /dev/null and b/Pinata Smackdown/Assets/HammerWeapon01.fbx differ diff --git a/playable/Assets/pillar_obj.fbx.meta b/Pinata Smackdown/Assets/HammerWeapon01.fbx.meta similarity index 65% rename from playable/Assets/pillar_obj.fbx.meta rename to Pinata Smackdown/Assets/HammerWeapon01.fbx.meta index cd3c22f..a7ed224 100644 --- a/playable/Assets/pillar_obj.fbx.meta +++ b/Pinata Smackdown/Assets/HammerWeapon01.fbx.meta @@ -1,31 +1,32 @@ fileFormatVersion: 2 -guid: c5c501b1516413f4d916ad0a9aa39dee +guid: 2694ee955a23d77468182051fc36deaf 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 + 100000: //RootNode + 100002: Katana_output01:pCylinder1 + 100004: Katana_output01:pCylinder2 + 100006: locator1 + 100008: pCube2 + 100010: pCylinder2 + 400000: //RootNode + 400002: Katana_output01:pCylinder1 + 400004: Katana_output01:pCylinder2 + 400006: locator1 + 400008: pCube2 + 400010: pCylinder2 + 2300000: Katana_output01:pCylinder1 + 2300002: Katana_output01:pCylinder2 + 2300004: pCube2 + 2300006: pCylinder2 + 3300000: Katana_output01:pCylinder1 + 3300002: Katana_output01:pCylinder2 + 3300004: pCube2 + 3300006: pCylinder2 + 4300000: pCylinder2 + 4300002: pCube2 + 4300004: Katana_output01:pCylinder1 + 4300006: Katana_output01:pCylinder2 9500000: //RootNode materials: importMaterials: 1 diff --git a/playable/Assets/Heart.png b/Pinata Smackdown/Assets/Heart.png similarity index 100% rename from playable/Assets/Heart.png rename to Pinata Smackdown/Assets/Heart.png diff --git a/playable/Assets/Heart.png.meta b/Pinata Smackdown/Assets/Heart.png.meta similarity index 100% rename from playable/Assets/Heart.png.meta rename to Pinata Smackdown/Assets/Heart.png.meta diff --git a/playable/Assets/Horn1.fbx b/Pinata Smackdown/Assets/Horn1.fbx similarity index 100% rename from playable/Assets/Horn1.fbx rename to Pinata Smackdown/Assets/Horn1.fbx diff --git a/playable/Assets/Horn1.fbx.meta b/Pinata Smackdown/Assets/Horn1.fbx.meta similarity index 100% rename from playable/Assets/Horn1.fbx.meta rename to Pinata Smackdown/Assets/Horn1.fbx.meta diff --git a/playable/Assets/Horn2.fbx b/Pinata Smackdown/Assets/Horn2.fbx similarity index 100% rename from playable/Assets/Horn2.fbx rename to Pinata Smackdown/Assets/Horn2.fbx diff --git a/playable/Assets/Horn2.fbx.meta b/Pinata Smackdown/Assets/Horn2.fbx.meta similarity index 100% rename from playable/Assets/Horn2.fbx.meta rename to Pinata Smackdown/Assets/Horn2.fbx.meta diff --git a/playable/Assets/KatanaWeapon01.fbx b/Pinata Smackdown/Assets/KatanaWeapon01.fbx similarity index 100% rename from playable/Assets/KatanaWeapon01.fbx rename to Pinata Smackdown/Assets/KatanaWeapon01.fbx diff --git a/playable/Assets/KatanaWeapon01.fbx.meta b/Pinata Smackdown/Assets/KatanaWeapon01.fbx.meta similarity index 100% rename from playable/Assets/KatanaWeapon01.fbx.meta rename to Pinata Smackdown/Assets/KatanaWeapon01.fbx.meta diff --git a/playable/Assets/Lachlan_jump_work.unity b/Pinata Smackdown/Assets/Lachlan_jump_work.unity similarity index 82% rename from playable/Assets/Lachlan_jump_work.unity rename to Pinata Smackdown/Assets/Lachlan_jump_work.unity index 73c0234..b59274d 100644 Binary files a/playable/Assets/Lachlan_jump_work.unity and b/Pinata Smackdown/Assets/Lachlan_jump_work.unity differ diff --git a/PinataSmackdown_unity/Assets/Lachlan_jump_work.unity.meta b/Pinata Smackdown/Assets/Lachlan_jump_work.unity.meta similarity index 100% rename from PinataSmackdown_unity/Assets/Lachlan_jump_work.unity.meta rename to Pinata Smackdown/Assets/Lachlan_jump_work.unity.meta diff --git a/PinataSmackdown_unity/Assets/Main Camera.prefab b/Pinata Smackdown/Assets/Main Camera.prefab similarity index 100% rename from PinataSmackdown_unity/Assets/Main Camera.prefab rename to Pinata Smackdown/Assets/Main Camera.prefab diff --git a/PinataSmackdown_unity/Assets/Main Camera.prefab.meta b/Pinata Smackdown/Assets/Main Camera.prefab.meta similarity index 100% rename from PinataSmackdown_unity/Assets/Main Camera.prefab.meta rename to Pinata Smackdown/Assets/Main Camera.prefab.meta diff --git a/PinataSmackdown_unity/Assets/Materials.meta b/Pinata Smackdown/Assets/Materials.meta similarity index 100% rename from PinataSmackdown_unity/Assets/Materials.meta rename to Pinata Smackdown/Assets/Materials.meta diff --git a/Pinata Smackdown/Assets/Materials/Katana_output01_lambert2.mat b/Pinata Smackdown/Assets/Materials/Katana_output01_lambert2.mat new file mode 100644 index 0000000..da37032 Binary files /dev/null and b/Pinata Smackdown/Assets/Materials/Katana_output01_lambert2.mat differ diff --git a/Pinata Smackdown/Assets/Materials/Katana_output01_lambert2.mat.meta b/Pinata Smackdown/Assets/Materials/Katana_output01_lambert2.mat.meta new file mode 100644 index 0000000..2f8b76a --- /dev/null +++ b/Pinata Smackdown/Assets/Materials/Katana_output01_lambert2.mat.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 7a1b07fb262d67247a35f5387f2de8b7 +NativeFormatImporter: + userData: diff --git a/playable/Assets/Materials/No Name.mat b/Pinata Smackdown/Assets/Materials/No Name.mat similarity index 100% rename from playable/Assets/Materials/No Name.mat rename to Pinata Smackdown/Assets/Materials/No Name.mat diff --git a/playable/Assets/Materials/No Name.mat.meta b/Pinata Smackdown/Assets/Materials/No Name.mat.meta similarity index 100% rename from playable/Assets/Materials/No Name.mat.meta rename to Pinata Smackdown/Assets/Materials/No Name.mat.meta diff --git a/playable/Assets/Materials/blade 1.mat b/Pinata Smackdown/Assets/Materials/blade 1.mat similarity index 100% rename from playable/Assets/Materials/blade 1.mat rename to Pinata Smackdown/Assets/Materials/blade 1.mat diff --git a/playable/Assets/Materials/blade 1.mat.meta b/Pinata Smackdown/Assets/Materials/blade 1.mat.meta similarity index 100% rename from playable/Assets/Materials/blade 1.mat.meta rename to Pinata Smackdown/Assets/Materials/blade 1.mat.meta diff --git a/playable/Assets/Materials/blade 2.mat b/Pinata Smackdown/Assets/Materials/blade 2.mat similarity index 100% rename from playable/Assets/Materials/blade 2.mat rename to Pinata Smackdown/Assets/Materials/blade 2.mat diff --git a/playable/Assets/Materials/blade 2.mat.meta b/Pinata Smackdown/Assets/Materials/blade 2.mat.meta similarity index 100% rename from playable/Assets/Materials/blade 2.mat.meta rename to Pinata Smackdown/Assets/Materials/blade 2.mat.meta diff --git a/playable/Assets/Materials/blade.mat b/Pinata Smackdown/Assets/Materials/blade.mat similarity index 100% rename from playable/Assets/Materials/blade.mat rename to Pinata Smackdown/Assets/Materials/blade.mat diff --git a/playable/Assets/Materials/blade.mat.meta b/Pinata Smackdown/Assets/Materials/blade.mat.meta similarity index 100% rename from playable/Assets/Materials/blade.mat.meta rename to Pinata Smackdown/Assets/Materials/blade.mat.meta diff --git a/playable/Assets/Materials/blinn1.mat b/Pinata Smackdown/Assets/Materials/blinn1.mat similarity index 100% rename from playable/Assets/Materials/blinn1.mat rename to Pinata Smackdown/Assets/Materials/blinn1.mat diff --git a/playable/Assets/Materials/blinn1.mat.meta b/Pinata Smackdown/Assets/Materials/blinn1.mat.meta similarity index 100% rename from playable/Assets/Materials/blinn1.mat.meta rename to Pinata Smackdown/Assets/Materials/blinn1.mat.meta diff --git a/playable/Assets/Materials/blinn2.mat b/Pinata Smackdown/Assets/Materials/blinn2.mat similarity index 100% rename from playable/Assets/Materials/blinn2.mat rename to Pinata Smackdown/Assets/Materials/blinn2.mat diff --git a/playable/Assets/Materials/blinn2.mat.meta b/Pinata Smackdown/Assets/Materials/blinn2.mat.meta similarity index 100% rename from playable/Assets/Materials/blinn2.mat.meta rename to Pinata Smackdown/Assets/Materials/blinn2.mat.meta diff --git a/playable/Assets/Materials/blinn5.mat b/Pinata Smackdown/Assets/Materials/blinn5.mat similarity index 100% rename from playable/Assets/Materials/blinn5.mat rename to Pinata Smackdown/Assets/Materials/blinn5.mat diff --git a/playable/Assets/Materials/blinn5.mat.meta b/Pinata Smackdown/Assets/Materials/blinn5.mat.meta similarity index 100% rename from playable/Assets/Materials/blinn5.mat.meta rename to Pinata Smackdown/Assets/Materials/blinn5.mat.meta diff --git a/playable/Assets/Materials/katanaHandle 1.mat b/Pinata Smackdown/Assets/Materials/katanaHandle 1.mat similarity index 100% rename from playable/Assets/Materials/katanaHandle 1.mat rename to Pinata Smackdown/Assets/Materials/katanaHandle 1.mat diff --git a/playable/Assets/Materials/katanaHandle 1.mat.meta b/Pinata Smackdown/Assets/Materials/katanaHandle 1.mat.meta similarity index 100% rename from playable/Assets/Materials/katanaHandle 1.mat.meta rename to Pinata Smackdown/Assets/Materials/katanaHandle 1.mat.meta diff --git a/playable/Assets/Materials/katanaHandle 2.mat b/Pinata Smackdown/Assets/Materials/katanaHandle 2.mat similarity index 100% rename from playable/Assets/Materials/katanaHandle 2.mat rename to Pinata Smackdown/Assets/Materials/katanaHandle 2.mat diff --git a/playable/Assets/Materials/katanaHandle 2.mat.meta b/Pinata Smackdown/Assets/Materials/katanaHandle 2.mat.meta similarity index 100% rename from playable/Assets/Materials/katanaHandle 2.mat.meta rename to Pinata Smackdown/Assets/Materials/katanaHandle 2.mat.meta diff --git a/playable/Assets/Materials/katanaHandle 3.mat b/Pinata Smackdown/Assets/Materials/katanaHandle 3.mat similarity index 100% rename from playable/Assets/Materials/katanaHandle 3.mat rename to Pinata Smackdown/Assets/Materials/katanaHandle 3.mat diff --git a/playable/Assets/Materials/katanaHandle 3.mat.meta b/Pinata Smackdown/Assets/Materials/katanaHandle 3.mat.meta similarity index 100% rename from playable/Assets/Materials/katanaHandle 3.mat.meta rename to Pinata Smackdown/Assets/Materials/katanaHandle 3.mat.meta diff --git a/Pinata Smackdown/Assets/Materials/katanaHandle 4.mat b/Pinata Smackdown/Assets/Materials/katanaHandle 4.mat new file mode 100644 index 0000000..c1bc130 Binary files /dev/null and b/Pinata Smackdown/Assets/Materials/katanaHandle 4.mat differ diff --git a/Pinata Smackdown/Assets/Materials/katanaHandle 4.mat.meta b/Pinata Smackdown/Assets/Materials/katanaHandle 4.mat.meta new file mode 100644 index 0000000..6a714c6 --- /dev/null +++ b/Pinata Smackdown/Assets/Materials/katanaHandle 4.mat.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 45290483ecca74d458a4794a30d4ac59 +NativeFormatImporter: + userData: diff --git a/playable/Assets/Materials/katanaHandle.mat b/Pinata Smackdown/Assets/Materials/katanaHandle.mat similarity index 100% rename from playable/Assets/Materials/katanaHandle.mat rename to Pinata Smackdown/Assets/Materials/katanaHandle.mat diff --git a/playable/Assets/Materials/katanaHandle.mat.meta b/Pinata Smackdown/Assets/Materials/katanaHandle.mat.meta similarity index 100% rename from playable/Assets/Materials/katanaHandle.mat.meta rename to Pinata Smackdown/Assets/Materials/katanaHandle.mat.meta diff --git a/playable/Assets/Materials/katanaHolder 1.mat b/Pinata Smackdown/Assets/Materials/katanaHolder 1.mat similarity index 100% rename from playable/Assets/Materials/katanaHolder 1.mat rename to Pinata Smackdown/Assets/Materials/katanaHolder 1.mat diff --git a/playable/Assets/Materials/katanaHolder 1.mat.meta b/Pinata Smackdown/Assets/Materials/katanaHolder 1.mat.meta similarity index 100% rename from playable/Assets/Materials/katanaHolder 1.mat.meta rename to Pinata Smackdown/Assets/Materials/katanaHolder 1.mat.meta diff --git a/Pinata Smackdown/Assets/Materials/katanaHolder 2.mat b/Pinata Smackdown/Assets/Materials/katanaHolder 2.mat new file mode 100644 index 0000000..efd2e76 Binary files /dev/null and b/Pinata Smackdown/Assets/Materials/katanaHolder 2.mat differ diff --git a/Pinata Smackdown/Assets/Materials/katanaHolder 2.mat.meta b/Pinata Smackdown/Assets/Materials/katanaHolder 2.mat.meta new file mode 100644 index 0000000..ee879b5 --- /dev/null +++ b/Pinata Smackdown/Assets/Materials/katanaHolder 2.mat.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: ec95dfedc9fda8d4784ea8d1a1ddbf0d +NativeFormatImporter: + userData: diff --git a/Pinata Smackdown/Assets/Materials/katanaHolder 3.mat b/Pinata Smackdown/Assets/Materials/katanaHolder 3.mat new file mode 100644 index 0000000..b0d91d4 Binary files /dev/null and b/Pinata Smackdown/Assets/Materials/katanaHolder 3.mat differ diff --git a/Pinata Smackdown/Assets/Materials/katanaHolder 3.mat.meta b/Pinata Smackdown/Assets/Materials/katanaHolder 3.mat.meta new file mode 100644 index 0000000..7c4272c --- /dev/null +++ b/Pinata Smackdown/Assets/Materials/katanaHolder 3.mat.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: e569815894f83604baf8c423f2371751 +NativeFormatImporter: + userData: diff --git a/playable/Assets/Materials/katanaHolder.mat b/Pinata Smackdown/Assets/Materials/katanaHolder.mat similarity index 100% rename from playable/Assets/Materials/katanaHolder.mat rename to Pinata Smackdown/Assets/Materials/katanaHolder.mat diff --git a/playable/Assets/Materials/katanaHolder.mat.meta b/Pinata Smackdown/Assets/Materials/katanaHolder.mat.meta similarity index 100% rename from playable/Assets/Materials/katanaHolder.mat.meta rename to Pinata Smackdown/Assets/Materials/katanaHolder.mat.meta diff --git a/PinataSmackdown_unity/Assets/Materials/lambert1.mat b/Pinata Smackdown/Assets/Materials/lambert1.mat similarity index 100% rename from PinataSmackdown_unity/Assets/Materials/lambert1.mat rename to Pinata Smackdown/Assets/Materials/lambert1.mat diff --git a/PinataSmackdown_unity/Assets/Materials/lambert1.mat.meta b/Pinata Smackdown/Assets/Materials/lambert1.mat.meta similarity index 100% rename from PinataSmackdown_unity/Assets/Materials/lambert1.mat.meta rename to Pinata Smackdown/Assets/Materials/lambert1.mat.meta diff --git a/playable/Assets/Materials/lambert2.mat b/Pinata Smackdown/Assets/Materials/lambert2.mat similarity index 100% rename from playable/Assets/Materials/lambert2.mat rename to Pinata Smackdown/Assets/Materials/lambert2.mat diff --git a/playable/Assets/Materials/lambert2.mat.meta b/Pinata Smackdown/Assets/Materials/lambert2.mat.meta similarity index 100% rename from playable/Assets/Materials/lambert2.mat.meta rename to Pinata Smackdown/Assets/Materials/lambert2.mat.meta diff --git a/playable/Assets/Materials/leather_texture1.mat b/Pinata Smackdown/Assets/Materials/leather_texture1.mat similarity index 100% rename from playable/Assets/Materials/leather_texture1.mat rename to Pinata Smackdown/Assets/Materials/leather_texture1.mat diff --git a/playable/Assets/Materials/leather_texture1.mat.meta b/Pinata Smackdown/Assets/Materials/leather_texture1.mat.meta similarity index 100% rename from playable/Assets/Materials/leather_texture1.mat.meta rename to Pinata Smackdown/Assets/Materials/leather_texture1.mat.meta diff --git a/Pinata Smackdown/Assets/Materials/mallet_texture.mat b/Pinata Smackdown/Assets/Materials/mallet_texture.mat new file mode 100644 index 0000000..4d8558f Binary files /dev/null and b/Pinata Smackdown/Assets/Materials/mallet_texture.mat differ diff --git a/Pinata Smackdown/Assets/Materials/mallet_texture.mat.meta b/Pinata Smackdown/Assets/Materials/mallet_texture.mat.meta new file mode 100644 index 0000000..f387eb6 --- /dev/null +++ b/Pinata Smackdown/Assets/Materials/mallet_texture.mat.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: b48d0f3626bedad4f84e5af4e4535e2d +NativeFormatImporter: + userData: diff --git a/PinataSmackdown_unity/Assets/Materials/pillar_unrapped 1.mat b/Pinata Smackdown/Assets/Materials/pillar_unrapped 1.mat similarity index 100% rename from PinataSmackdown_unity/Assets/Materials/pillar_unrapped 1.mat rename to Pinata Smackdown/Assets/Materials/pillar_unrapped 1.mat diff --git a/PinataSmackdown_unity/Assets/Materials/pillar_unrapped 1.mat.meta b/Pinata Smackdown/Assets/Materials/pillar_unrapped 1.mat.meta similarity index 100% rename from PinataSmackdown_unity/Assets/Materials/pillar_unrapped 1.mat.meta rename to Pinata Smackdown/Assets/Materials/pillar_unrapped 1.mat.meta diff --git a/PinataSmackdown_unity/Assets/Materials/pillar_unrapped.mat b/Pinata Smackdown/Assets/Materials/pillar_unrapped.mat similarity index 100% rename from PinataSmackdown_unity/Assets/Materials/pillar_unrapped.mat rename to Pinata Smackdown/Assets/Materials/pillar_unrapped.mat diff --git a/PinataSmackdown_unity/Assets/Materials/pillar_unrapped.mat.meta b/Pinata Smackdown/Assets/Materials/pillar_unrapped.mat.meta similarity index 100% rename from PinataSmackdown_unity/Assets/Materials/pillar_unrapped.mat.meta rename to Pinata Smackdown/Assets/Materials/pillar_unrapped.mat.meta diff --git a/PinataSmackdown_unity/Assets/Materials/platform_texture.mat b/Pinata Smackdown/Assets/Materials/platform_texture.mat similarity index 100% rename from PinataSmackdown_unity/Assets/Materials/platform_texture.mat rename to Pinata Smackdown/Assets/Materials/platform_texture.mat diff --git a/PinataSmackdown_unity/Assets/Materials/platform_texture.mat.meta b/Pinata Smackdown/Assets/Materials/platform_texture.mat.meta similarity index 100% rename from PinataSmackdown_unity/Assets/Materials/platform_texture.mat.meta rename to Pinata Smackdown/Assets/Materials/platform_texture.mat.meta diff --git a/playable/Assets/Menu.cs b/Pinata Smackdown/Assets/Menu.cs similarity index 100% rename from playable/Assets/Menu.cs rename to Pinata Smackdown/Assets/Menu.cs diff --git a/playable/Assets/Menu.cs.meta b/Pinata Smackdown/Assets/Menu.cs.meta similarity index 100% rename from playable/Assets/Menu.cs.meta rename to Pinata Smackdown/Assets/Menu.cs.meta diff --git a/playable/Assets/Music.meta b/Pinata Smackdown/Assets/Music.meta similarity index 100% rename from playable/Assets/Music.meta rename to Pinata Smackdown/Assets/Music.meta diff --git a/playable/Assets/Music/Guajiras.mp3.mp3 b/Pinata Smackdown/Assets/Music/Guajiras.mp3.mp3 similarity index 100% rename from playable/Assets/Music/Guajiras.mp3.mp3 rename to Pinata Smackdown/Assets/Music/Guajiras.mp3.mp3 diff --git a/playable/Assets/Music/Guajiras.mp3.mp3.meta b/Pinata Smackdown/Assets/Music/Guajiras.mp3.mp3.meta similarity index 100% rename from playable/Assets/Music/Guajiras.mp3.mp3.meta rename to Pinata Smackdown/Assets/Music/Guajiras.mp3.mp3.meta diff --git a/playable/Assets/Music/Machinimasound.com_-_Battle_of_Kings.mp3 b/Pinata Smackdown/Assets/Music/Machinimasound.com_-_Battle_of_Kings.mp3 similarity index 100% rename from playable/Assets/Music/Machinimasound.com_-_Battle_of_Kings.mp3 rename to Pinata Smackdown/Assets/Music/Machinimasound.com_-_Battle_of_Kings.mp3 diff --git a/playable/Assets/Music/Machinimasound.com_-_Battle_of_Kings.mp3.meta b/Pinata Smackdown/Assets/Music/Machinimasound.com_-_Battle_of_Kings.mp3.meta similarity index 100% rename from playable/Assets/Music/Machinimasound.com_-_Battle_of_Kings.mp3.meta rename to Pinata Smackdown/Assets/Music/Machinimasound.com_-_Battle_of_Kings.mp3.meta diff --git a/PinataSmackdown_unity/Assets/New Terrain.asset b/Pinata Smackdown/Assets/New Terrain.asset similarity index 100% rename from PinataSmackdown_unity/Assets/New Terrain.asset rename to Pinata Smackdown/Assets/New Terrain.asset diff --git a/PinataSmackdown_unity/Assets/New Terrain.asset.meta b/Pinata Smackdown/Assets/New Terrain.asset.meta similarity index 100% rename from PinataSmackdown_unity/Assets/New Terrain.asset.meta rename to Pinata Smackdown/Assets/New Terrain.asset.meta diff --git a/playable/Assets/Pinata.anim b/Pinata Smackdown/Assets/Pinata.anim similarity index 100% rename from playable/Assets/Pinata.anim rename to Pinata Smackdown/Assets/Pinata.anim diff --git a/playable/Assets/Pinata.anim.meta b/Pinata Smackdown/Assets/Pinata.anim.meta similarity index 100% rename from playable/Assets/Pinata.anim.meta rename to Pinata Smackdown/Assets/Pinata.anim.meta diff --git a/playable/Assets/Pinata.controller b/Pinata Smackdown/Assets/Pinata.controller similarity index 100% rename from playable/Assets/Pinata.controller rename to Pinata Smackdown/Assets/Pinata.controller diff --git a/playable/Assets/Pinata.controller.meta b/Pinata Smackdown/Assets/Pinata.controller.meta similarity index 100% rename from playable/Assets/Pinata.controller.meta rename to Pinata Smackdown/Assets/Pinata.controller.meta diff --git a/playable/Assets/Pinata.meta b/Pinata Smackdown/Assets/Pinata.meta similarity index 100% rename from playable/Assets/Pinata.meta rename to Pinata Smackdown/Assets/Pinata.meta diff --git a/playable/Assets/Pinata/Pinata.fbx b/Pinata Smackdown/Assets/Pinata/Pinata.fbx similarity index 100% rename from playable/Assets/Pinata/Pinata.fbx rename to Pinata Smackdown/Assets/Pinata/Pinata.fbx diff --git a/playable/Assets/Pinata/Pinata.fbx.meta b/Pinata Smackdown/Assets/Pinata/Pinata.fbx.meta similarity index 100% rename from playable/Assets/Pinata/Pinata.fbx.meta rename to Pinata Smackdown/Assets/Pinata/Pinata.fbx.meta diff --git a/playable/Assets/Pinata/Pinata_Fall.fbx b/Pinata Smackdown/Assets/Pinata/Pinata_Fall.fbx similarity index 100% rename from playable/Assets/Pinata/Pinata_Fall.fbx rename to Pinata Smackdown/Assets/Pinata/Pinata_Fall.fbx diff --git a/playable/Assets/Pinata/Pinata_Fall.fbx.meta b/Pinata Smackdown/Assets/Pinata/Pinata_Fall.fbx.meta similarity index 100% rename from playable/Assets/Pinata/Pinata_Fall.fbx.meta rename to Pinata Smackdown/Assets/Pinata/Pinata_Fall.fbx.meta diff --git a/playable/Assets/Pinata/Pinata_Idle.fbx b/Pinata Smackdown/Assets/Pinata/Pinata_Idle.fbx similarity index 100% rename from playable/Assets/Pinata/Pinata_Idle.fbx rename to Pinata Smackdown/Assets/Pinata/Pinata_Idle.fbx diff --git a/playable/Assets/Pinata/Pinata_Idle.fbx.meta b/Pinata Smackdown/Assets/Pinata/Pinata_Idle.fbx.meta similarity index 100% rename from playable/Assets/Pinata/Pinata_Idle.fbx.meta rename to Pinata Smackdown/Assets/Pinata/Pinata_Idle.fbx.meta diff --git a/PinataSmackdown_unity/Assets/Platform_obj.fbx b/Pinata Smackdown/Assets/Platform_obj.fbx similarity index 100% rename from PinataSmackdown_unity/Assets/Platform_obj.fbx rename to Pinata Smackdown/Assets/Platform_obj.fbx diff --git a/PinataSmackdown_unity/Assets/Platform_obj.fbx.meta b/Pinata Smackdown/Assets/Platform_obj.fbx.meta similarity index 100% rename from PinataSmackdown_unity/Assets/Platform_obj.fbx.meta rename to Pinata Smackdown/Assets/Platform_obj.fbx.meta diff --git a/playable/Assets/Prefabs.meta b/Pinata Smackdown/Assets/Prefabs.meta similarity index 100% rename from playable/Assets/Prefabs.meta rename to Pinata Smackdown/Assets/Prefabs.meta diff --git a/playable/Assets/Prefabs/Confetti.prefab b/Pinata Smackdown/Assets/Prefabs/Confetti.prefab similarity index 100% rename from playable/Assets/Prefabs/Confetti.prefab rename to Pinata Smackdown/Assets/Prefabs/Confetti.prefab diff --git a/playable/Assets/Prefabs/Confetti.prefab.meta b/Pinata Smackdown/Assets/Prefabs/Confetti.prefab.meta similarity index 100% rename from playable/Assets/Prefabs/Confetti.prefab.meta rename to Pinata Smackdown/Assets/Prefabs/Confetti.prefab.meta diff --git a/playable/Assets/Prefabs/Heart 1.prefab b/Pinata Smackdown/Assets/Prefabs/Heart 1.prefab similarity index 100% rename from playable/Assets/Prefabs/Heart 1.prefab rename to Pinata Smackdown/Assets/Prefabs/Heart 1.prefab diff --git a/playable/Assets/Prefabs/Heart 1.prefab.meta b/Pinata Smackdown/Assets/Prefabs/Heart 1.prefab.meta similarity index 100% rename from playable/Assets/Prefabs/Heart 1.prefab.meta rename to Pinata Smackdown/Assets/Prefabs/Heart 1.prefab.meta diff --git a/playable/Assets/Prefabs/Heart.prefab b/Pinata Smackdown/Assets/Prefabs/Heart.prefab similarity index 100% rename from playable/Assets/Prefabs/Heart.prefab rename to Pinata Smackdown/Assets/Prefabs/Heart.prefab diff --git a/playable/Assets/Prefabs/Heart.prefab.meta b/Pinata Smackdown/Assets/Prefabs/Heart.prefab.meta similarity index 100% rename from playable/Assets/Prefabs/Heart.prefab.meta rename to Pinata Smackdown/Assets/Prefabs/Heart.prefab.meta diff --git a/playable/Assets/Prefabs/candy.prefab b/Pinata Smackdown/Assets/Prefabs/candy.prefab similarity index 100% rename from playable/Assets/Prefabs/candy.prefab rename to Pinata Smackdown/Assets/Prefabs/candy.prefab diff --git a/playable/Assets/Prefabs/candy.prefab.meta b/Pinata Smackdown/Assets/Prefabs/candy.prefab.meta similarity index 100% rename from playable/Assets/Prefabs/candy.prefab.meta rename to Pinata Smackdown/Assets/Prefabs/candy.prefab.meta diff --git a/playable/Assets/Scripts.meta b/Pinata Smackdown/Assets/Scripts.meta similarity index 100% rename from playable/Assets/Scripts.meta rename to Pinata Smackdown/Assets/Scripts.meta diff --git a/PinataSmackdown_unity/Assets/bulletScript.cs b/Pinata Smackdown/Assets/Scripts/bulletScript.cs similarity index 100% rename from PinataSmackdown_unity/Assets/bulletScript.cs rename to Pinata Smackdown/Assets/Scripts/bulletScript.cs diff --git a/PinataSmackdown_unity/Assets/bulletScript.cs.meta b/Pinata Smackdown/Assets/Scripts/bulletScript.cs.meta similarity index 100% rename from PinataSmackdown_unity/Assets/bulletScript.cs.meta rename to Pinata Smackdown/Assets/Scripts/bulletScript.cs.meta diff --git a/PinataSmackdown_unity/Assets/camera_controls.cs b/Pinata Smackdown/Assets/Scripts/camera_controls.cs similarity index 100% rename from PinataSmackdown_unity/Assets/camera_controls.cs rename to Pinata Smackdown/Assets/Scripts/camera_controls.cs diff --git a/PinataSmackdown_unity/Assets/camera_controls.cs.meta b/Pinata Smackdown/Assets/Scripts/camera_controls.cs.meta similarity index 100% rename from PinataSmackdown_unity/Assets/camera_controls.cs.meta rename to Pinata Smackdown/Assets/Scripts/camera_controls.cs.meta diff --git a/playable/Assets/Scripts/collectable.cs b/Pinata Smackdown/Assets/Scripts/collectable.cs similarity index 100% rename from playable/Assets/Scripts/collectable.cs rename to Pinata Smackdown/Assets/Scripts/collectable.cs diff --git a/playable/Assets/Scripts/collectable.cs.meta b/Pinata Smackdown/Assets/Scripts/collectable.cs.meta similarity index 100% rename from playable/Assets/Scripts/collectable.cs.meta rename to Pinata Smackdown/Assets/Scripts/collectable.cs.meta diff --git a/playable/Assets/Scripts/confettiController.cs b/Pinata Smackdown/Assets/Scripts/confettiController.cs similarity index 100% rename from playable/Assets/Scripts/confettiController.cs rename to Pinata Smackdown/Assets/Scripts/confettiController.cs diff --git a/playable/Assets/Scripts/confettiController.cs.meta b/Pinata Smackdown/Assets/Scripts/confettiController.cs.meta similarity index 100% rename from playable/Assets/Scripts/confettiController.cs.meta rename to Pinata Smackdown/Assets/Scripts/confettiController.cs.meta diff --git a/playable/Assets/Scripts/playerController.cs b/Pinata Smackdown/Assets/Scripts/playerController.cs similarity index 100% rename from playable/Assets/Scripts/playerController.cs rename to Pinata Smackdown/Assets/Scripts/playerController.cs diff --git a/playable/Assets/Scripts/playerController.cs.meta b/Pinata Smackdown/Assets/Scripts/playerController.cs.meta similarity index 100% rename from playable/Assets/Scripts/playerController.cs.meta rename to Pinata Smackdown/Assets/Scripts/playerController.cs.meta diff --git a/playable/Assets/Scripts/spotLightController.cs b/Pinata Smackdown/Assets/Scripts/spotLightController.cs similarity index 100% rename from playable/Assets/Scripts/spotLightController.cs rename to Pinata Smackdown/Assets/Scripts/spotLightController.cs diff --git a/playable/Assets/Scripts/spotLightController.cs.meta b/Pinata Smackdown/Assets/Scripts/spotLightController.cs.meta similarity index 100% rename from playable/Assets/Scripts/spotLightController.cs.meta rename to Pinata Smackdown/Assets/Scripts/spotLightController.cs.meta diff --git a/playable/Assets/Scripts/stickController.cs b/Pinata Smackdown/Assets/Scripts/stickController.cs similarity index 100% rename from playable/Assets/Scripts/stickController.cs rename to Pinata Smackdown/Assets/Scripts/stickController.cs diff --git a/playable/Assets/Scripts/stickController.cs.meta b/Pinata Smackdown/Assets/Scripts/stickController.cs.meta similarity index 100% rename from playable/Assets/Scripts/stickController.cs.meta rename to Pinata Smackdown/Assets/Scripts/stickController.cs.meta diff --git a/playable/Assets/Shaders.meta b/Pinata Smackdown/Assets/Shaders.meta similarity index 100% rename from playable/Assets/Shaders.meta rename to Pinata Smackdown/Assets/Shaders.meta diff --git a/playable/Assets/Shaders/ItemGlow.shader b/Pinata Smackdown/Assets/Shaders/ItemGlow.shader similarity index 100% rename from playable/Assets/Shaders/ItemGlow.shader rename to Pinata Smackdown/Assets/Shaders/ItemGlow.shader diff --git a/playable/Assets/Shaders/ItemGlow.shader.meta b/Pinata Smackdown/Assets/Shaders/ItemGlow.shader.meta similarity index 100% rename from playable/Assets/Shaders/ItemGlow.shader.meta rename to Pinata Smackdown/Assets/Shaders/ItemGlow.shader.meta diff --git a/playable/Assets/blade.jpg b/Pinata Smackdown/Assets/blade.jpg similarity index 100% rename from playable/Assets/blade.jpg rename to Pinata Smackdown/Assets/blade.jpg diff --git a/playable/Assets/blade.jpg.meta b/Pinata Smackdown/Assets/blade.jpg.meta similarity index 100% rename from playable/Assets/blade.jpg.meta rename to Pinata Smackdown/Assets/blade.jpg.meta diff --git a/PinataSmackdown_unity/Assets/bounce.physicsMaterial2D b/Pinata Smackdown/Assets/bounce.physicsMaterial2D similarity index 100% rename from PinataSmackdown_unity/Assets/bounce.physicsMaterial2D rename to Pinata Smackdown/Assets/bounce.physicsMaterial2D diff --git a/PinataSmackdown_unity/Assets/bounce.physicsMaterial2D.meta b/Pinata Smackdown/Assets/bounce.physicsMaterial2D.meta similarity index 100% rename from PinataSmackdown_unity/Assets/bounce.physicsMaterial2D.meta rename to Pinata Smackdown/Assets/bounce.physicsMaterial2D.meta diff --git a/PinataSmackdown_unity/Assets/bullet.prefab b/Pinata Smackdown/Assets/bullet.prefab similarity index 100% rename from PinataSmackdown_unity/Assets/bullet.prefab rename to Pinata Smackdown/Assets/bullet.prefab diff --git a/PinataSmackdown_unity/Assets/bullet.prefab.meta b/Pinata Smackdown/Assets/bullet.prefab.meta similarity index 100% rename from PinataSmackdown_unity/Assets/bullet.prefab.meta rename to Pinata Smackdown/Assets/bullet.prefab.meta diff --git a/playable/Assets/chainsaw01.fbx b/Pinata Smackdown/Assets/chainsaw01.fbx similarity index 100% rename from playable/Assets/chainsaw01.fbx rename to Pinata Smackdown/Assets/chainsaw01.fbx diff --git a/playable/Assets/chainsaw01.fbx.meta b/Pinata Smackdown/Assets/chainsaw01.fbx.meta similarity index 100% rename from playable/Assets/chainsaw01.fbx.meta rename to Pinata Smackdown/Assets/chainsaw01.fbx.meta diff --git a/PinataSmackdown_unity/Assets/floating_platform_02.mb b/Pinata Smackdown/Assets/floating_platform_02.mb similarity index 100% rename from PinataSmackdown_unity/Assets/floating_platform_02.mb rename to Pinata Smackdown/Assets/floating_platform_02.mb diff --git a/PinataSmackdown_unity/Assets/floating_platform_02.mb.meta b/Pinata Smackdown/Assets/floating_platform_02.mb.meta similarity index 100% rename from PinataSmackdown_unity/Assets/floating_platform_02.mb.meta rename to Pinata Smackdown/Assets/floating_platform_02.mb.meta diff --git a/playable/Assets/katanaHandle.jpg b/Pinata Smackdown/Assets/katanaHandle.jpg similarity index 100% rename from playable/Assets/katanaHandle.jpg rename to Pinata Smackdown/Assets/katanaHandle.jpg diff --git a/playable/Assets/katanaHandle.jpg.meta b/Pinata Smackdown/Assets/katanaHandle.jpg.meta similarity index 100% rename from playable/Assets/katanaHandle.jpg.meta rename to Pinata Smackdown/Assets/katanaHandle.jpg.meta diff --git a/playable/Assets/katanaHolder.jpg b/Pinata Smackdown/Assets/katanaHolder.jpg similarity index 100% rename from playable/Assets/katanaHolder.jpg rename to Pinata Smackdown/Assets/katanaHolder.jpg diff --git a/playable/Assets/katanaHolder.jpg.meta b/Pinata Smackdown/Assets/katanaHolder.jpg.meta similarity index 100% rename from playable/Assets/katanaHolder.jpg.meta rename to Pinata Smackdown/Assets/katanaHolder.jpg.meta diff --git a/Pinata Smackdown/Assets/mallet_texture.jpg b/Pinata Smackdown/Assets/mallet_texture.jpg new file mode 100644 index 0000000..3ee526a Binary files /dev/null and b/Pinata Smackdown/Assets/mallet_texture.jpg differ diff --git a/Pinata Smackdown/Assets/mallet_texture.jpg.meta b/Pinata Smackdown/Assets/mallet_texture.jpg.meta new file mode 100644 index 0000000..d68a07d --- /dev/null +++ b/Pinata Smackdown/Assets/mallet_texture.jpg.meta @@ -0,0 +1,47 @@ +fileFormatVersion: 2 +guid: 7a66c37bac188b74eb6042cc5c796b55 +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/pillar_obj.fbx b/Pinata Smackdown/Assets/pillar_obj.fbx similarity index 100% rename from PinataSmackdown_unity/Assets/pillar_obj.fbx rename to Pinata Smackdown/Assets/pillar_obj.fbx diff --git a/PinataSmackdown_unity/Assets/pillar_obj.fbx.meta b/Pinata Smackdown/Assets/pillar_obj.fbx.meta similarity index 100% rename from PinataSmackdown_unity/Assets/pillar_obj.fbx.meta rename to Pinata Smackdown/Assets/pillar_obj.fbx.meta diff --git a/PinataSmackdown_unity/Assets/pillar_unrapped.jpg b/Pinata Smackdown/Assets/pillar_unrapped.jpg similarity index 100% rename from PinataSmackdown_unity/Assets/pillar_unrapped.jpg rename to Pinata Smackdown/Assets/pillar_unrapped.jpg diff --git a/PinataSmackdown_unity/Assets/pillar_unrapped.jpg.meta b/Pinata Smackdown/Assets/pillar_unrapped.jpg.meta similarity index 100% rename from PinataSmackdown_unity/Assets/pillar_unrapped.jpg.meta rename to Pinata Smackdown/Assets/pillar_unrapped.jpg.meta diff --git a/PinataSmackdown_unity/Assets/platform_texture.jpg b/Pinata Smackdown/Assets/platform_texture.jpg similarity index 100% rename from PinataSmackdown_unity/Assets/platform_texture.jpg rename to Pinata Smackdown/Assets/platform_texture.jpg diff --git a/PinataSmackdown_unity/Assets/platform_texture.jpg.meta b/Pinata Smackdown/Assets/platform_texture.jpg.meta similarity index 100% rename from PinataSmackdown_unity/Assets/platform_texture.jpg.meta rename to Pinata Smackdown/Assets/platform_texture.jpg.meta diff --git a/playable/Mac_Build_01.app/Contents/Data/Managed/etc/mono/1.0/DefaultWsdlHelpGenerator.aspx b/Pinata Smackdown/Mac_Build_01.app/Contents/Data/Managed/etc/mono/1.0/DefaultWsdlHelpGenerator.aspx similarity index 100% rename from playable/Mac_Build_01.app/Contents/Data/Managed/etc/mono/1.0/DefaultWsdlHelpGenerator.aspx rename to Pinata Smackdown/Mac_Build_01.app/Contents/Data/Managed/etc/mono/1.0/DefaultWsdlHelpGenerator.aspx diff --git a/playable/Mac_Build_01.app/Contents/Data/Managed/etc/mono/1.0/machine.config b/Pinata Smackdown/Mac_Build_01.app/Contents/Data/Managed/etc/mono/1.0/machine.config similarity index 100% rename from playable/Mac_Build_01.app/Contents/Data/Managed/etc/mono/1.0/machine.config rename to Pinata Smackdown/Mac_Build_01.app/Contents/Data/Managed/etc/mono/1.0/machine.config diff --git a/playable/Mac_Build_01.app/Contents/Data/Managed/etc/mono/2.0/Browsers/Compat.browser b/Pinata Smackdown/Mac_Build_01.app/Contents/Data/Managed/etc/mono/2.0/Browsers/Compat.browser similarity index 100% rename from playable/Mac_Build_01.app/Contents/Data/Managed/etc/mono/2.0/Browsers/Compat.browser rename to Pinata Smackdown/Mac_Build_01.app/Contents/Data/Managed/etc/mono/2.0/Browsers/Compat.browser diff --git a/playable/Mac_Build_01.app/Contents/Data/Managed/etc/mono/2.0/DefaultWsdlHelpGenerator.aspx b/Pinata Smackdown/Mac_Build_01.app/Contents/Data/Managed/etc/mono/2.0/DefaultWsdlHelpGenerator.aspx similarity index 100% rename from playable/Mac_Build_01.app/Contents/Data/Managed/etc/mono/2.0/DefaultWsdlHelpGenerator.aspx rename to Pinata Smackdown/Mac_Build_01.app/Contents/Data/Managed/etc/mono/2.0/DefaultWsdlHelpGenerator.aspx diff --git a/playable/Mac_Build_01.app/Contents/Data/Managed/etc/mono/2.0/machine.config b/Pinata Smackdown/Mac_Build_01.app/Contents/Data/Managed/etc/mono/2.0/machine.config similarity index 100% rename from playable/Mac_Build_01.app/Contents/Data/Managed/etc/mono/2.0/machine.config rename to Pinata Smackdown/Mac_Build_01.app/Contents/Data/Managed/etc/mono/2.0/machine.config diff --git a/playable/Mac_Build_01.app/Contents/Data/Managed/etc/mono/2.0/settings.map b/Pinata Smackdown/Mac_Build_01.app/Contents/Data/Managed/etc/mono/2.0/settings.map similarity index 100% rename from playable/Mac_Build_01.app/Contents/Data/Managed/etc/mono/2.0/settings.map rename to Pinata Smackdown/Mac_Build_01.app/Contents/Data/Managed/etc/mono/2.0/settings.map diff --git a/playable/Mac_Build_01.app/Contents/Data/Managed/etc/mono/2.0/web.config b/Pinata Smackdown/Mac_Build_01.app/Contents/Data/Managed/etc/mono/2.0/web.config similarity index 100% rename from playable/Mac_Build_01.app/Contents/Data/Managed/etc/mono/2.0/web.config rename to Pinata Smackdown/Mac_Build_01.app/Contents/Data/Managed/etc/mono/2.0/web.config diff --git a/playable/Mac_Build_01.app/Contents/Data/Managed/etc/mono/browscap.ini b/Pinata Smackdown/Mac_Build_01.app/Contents/Data/Managed/etc/mono/browscap.ini similarity index 100% rename from playable/Mac_Build_01.app/Contents/Data/Managed/etc/mono/browscap.ini rename to Pinata Smackdown/Mac_Build_01.app/Contents/Data/Managed/etc/mono/browscap.ini diff --git a/playable/Mac_Build_01.app/Contents/Data/Managed/etc/mono/config b/Pinata Smackdown/Mac_Build_01.app/Contents/Data/Managed/etc/mono/config similarity index 100% rename from playable/Mac_Build_01.app/Contents/Data/Managed/etc/mono/config rename to Pinata Smackdown/Mac_Build_01.app/Contents/Data/Managed/etc/mono/config diff --git a/playable/Mac_Build_01.app/Contents/Data/Managed/etc/mono/mconfig/config.xml b/Pinata Smackdown/Mac_Build_01.app/Contents/Data/Managed/etc/mono/mconfig/config.xml similarity index 100% rename from playable/Mac_Build_01.app/Contents/Data/Managed/etc/mono/mconfig/config.xml rename to Pinata Smackdown/Mac_Build_01.app/Contents/Data/Managed/etc/mono/mconfig/config.xml diff --git a/playable/Mac_Build_01.app/Contents/Data/PlayerConnectionConfigFile b/Pinata Smackdown/Mac_Build_01.app/Contents/Data/PlayerConnectionConfigFile similarity index 100% rename from playable/Mac_Build_01.app/Contents/Data/PlayerConnectionConfigFile rename to Pinata Smackdown/Mac_Build_01.app/Contents/Data/PlayerConnectionConfigFile diff --git a/playable/Mac_Build_01.app/Contents/Data/Resources/unity_builtin_extra b/Pinata Smackdown/Mac_Build_01.app/Contents/Data/Resources/unity_builtin_extra similarity index 100% rename from playable/Mac_Build_01.app/Contents/Data/Resources/unity_builtin_extra rename to Pinata Smackdown/Mac_Build_01.app/Contents/Data/Resources/unity_builtin_extra diff --git a/playable/Mac_Build_01.app/Contents/Data/mainData b/Pinata Smackdown/Mac_Build_01.app/Contents/Data/mainData similarity index 100% rename from playable/Mac_Build_01.app/Contents/Data/mainData rename to Pinata Smackdown/Mac_Build_01.app/Contents/Data/mainData diff --git a/playable/Mac_Build_01.app/Contents/Data/sharedassets0.assets b/Pinata Smackdown/Mac_Build_01.app/Contents/Data/sharedassets0.assets similarity index 100% rename from playable/Mac_Build_01.app/Contents/Data/sharedassets0.assets rename to Pinata Smackdown/Mac_Build_01.app/Contents/Data/sharedassets0.assets diff --git a/playable/Mac_Build_01.app/Contents/Frameworks/MonoEmbedRuntime/osx/libMonoPosixHelper.dylib b/Pinata Smackdown/Mac_Build_01.app/Contents/Frameworks/MonoEmbedRuntime/osx/libMonoPosixHelper.dylib similarity index 100% rename from playable/Mac_Build_01.app/Contents/Frameworks/MonoEmbedRuntime/osx/libMonoPosixHelper.dylib rename to Pinata Smackdown/Mac_Build_01.app/Contents/Frameworks/MonoEmbedRuntime/osx/libMonoPosixHelper.dylib diff --git a/playable/Mac_Build_01.app/Contents/Frameworks/MonoEmbedRuntime/osx/libmono.0.dylib b/Pinata Smackdown/Mac_Build_01.app/Contents/Frameworks/MonoEmbedRuntime/osx/libmono.0.dylib similarity index 100% rename from playable/Mac_Build_01.app/Contents/Frameworks/MonoEmbedRuntime/osx/libmono.0.dylib rename to Pinata Smackdown/Mac_Build_01.app/Contents/Frameworks/MonoEmbedRuntime/osx/libmono.0.dylib diff --git a/playable/Mac_Build_01.app/Contents/Info.plist b/Pinata Smackdown/Mac_Build_01.app/Contents/Info.plist similarity index 100% rename from playable/Mac_Build_01.app/Contents/Info.plist rename to Pinata Smackdown/Mac_Build_01.app/Contents/Info.plist diff --git a/playable/Mac_Build_01.app/Contents/MacOS/Mac_Build_01 b/Pinata Smackdown/Mac_Build_01.app/Contents/MacOS/Mac_Build_01 similarity index 100% rename from playable/Mac_Build_01.app/Contents/MacOS/Mac_Build_01 rename to Pinata Smackdown/Mac_Build_01.app/Contents/MacOS/Mac_Build_01 diff --git a/playable/Mac_Build_01.app/Contents/Resources/Ageia.tif b/Pinata Smackdown/Mac_Build_01.app/Contents/Resources/Ageia.tif similarity index 100% rename from playable/Mac_Build_01.app/Contents/Resources/Ageia.tif rename to Pinata Smackdown/Mac_Build_01.app/Contents/Resources/Ageia.tif diff --git a/playable/Mac_Build_01.app/Contents/Resources/KeyConfig.nib/classes.nib b/Pinata Smackdown/Mac_Build_01.app/Contents/Resources/KeyConfig.nib/classes.nib similarity index 100% rename from playable/Mac_Build_01.app/Contents/Resources/KeyConfig.nib/classes.nib rename to Pinata Smackdown/Mac_Build_01.app/Contents/Resources/KeyConfig.nib/classes.nib diff --git a/playable/Mac_Build_01.app/Contents/Resources/KeyConfig.nib/info.nib b/Pinata Smackdown/Mac_Build_01.app/Contents/Resources/KeyConfig.nib/info.nib similarity index 100% rename from playable/Mac_Build_01.app/Contents/Resources/KeyConfig.nib/info.nib rename to Pinata Smackdown/Mac_Build_01.app/Contents/Resources/KeyConfig.nib/info.nib diff --git a/playable/Mac_Build_01.app/Contents/Resources/KeyConfig.nib/keyedobjects.nib b/Pinata Smackdown/Mac_Build_01.app/Contents/Resources/KeyConfig.nib/keyedobjects.nib similarity index 100% rename from playable/Mac_Build_01.app/Contents/Resources/KeyConfig.nib/keyedobjects.nib rename to Pinata Smackdown/Mac_Build_01.app/Contents/Resources/KeyConfig.nib/keyedobjects.nib diff --git a/playable/Mac_Build_01.app/Contents/Resources/MainMenu.nib/classes.nib b/Pinata Smackdown/Mac_Build_01.app/Contents/Resources/MainMenu.nib/classes.nib similarity index 100% rename from playable/Mac_Build_01.app/Contents/Resources/MainMenu.nib/classes.nib rename to Pinata Smackdown/Mac_Build_01.app/Contents/Resources/MainMenu.nib/classes.nib diff --git a/playable/Mac_Build_01.app/Contents/Resources/MainMenu.nib/info.nib b/Pinata Smackdown/Mac_Build_01.app/Contents/Resources/MainMenu.nib/info.nib similarity index 100% rename from playable/Mac_Build_01.app/Contents/Resources/MainMenu.nib/info.nib rename to Pinata Smackdown/Mac_Build_01.app/Contents/Resources/MainMenu.nib/info.nib diff --git a/playable/Mac_Build_01.app/Contents/Resources/MainMenu.nib/keyedobjects.nib b/Pinata Smackdown/Mac_Build_01.app/Contents/Resources/MainMenu.nib/keyedobjects.nib similarity index 100% rename from playable/Mac_Build_01.app/Contents/Resources/MainMenu.nib/keyedobjects.nib rename to Pinata Smackdown/Mac_Build_01.app/Contents/Resources/MainMenu.nib/keyedobjects.nib diff --git a/playable/Mac_Build_01.app/Contents/Resources/Mono.tif b/Pinata Smackdown/Mac_Build_01.app/Contents/Resources/Mono.tif similarity index 100% rename from playable/Mac_Build_01.app/Contents/Resources/Mono.tif rename to Pinata Smackdown/Mac_Build_01.app/Contents/Resources/Mono.tif diff --git a/playable/Mac_Build_01.app/Contents/Resources/ScreenSelector.nib/classes.nib b/Pinata Smackdown/Mac_Build_01.app/Contents/Resources/ScreenSelector.nib/classes.nib similarity index 100% rename from playable/Mac_Build_01.app/Contents/Resources/ScreenSelector.nib/classes.nib rename to Pinata Smackdown/Mac_Build_01.app/Contents/Resources/ScreenSelector.nib/classes.nib diff --git a/playable/Mac_Build_01.app/Contents/Resources/ScreenSelector.nib/info.nib b/Pinata Smackdown/Mac_Build_01.app/Contents/Resources/ScreenSelector.nib/info.nib similarity index 100% rename from playable/Mac_Build_01.app/Contents/Resources/ScreenSelector.nib/info.nib rename to Pinata Smackdown/Mac_Build_01.app/Contents/Resources/ScreenSelector.nib/info.nib diff --git a/playable/Mac_Build_01.app/Contents/Resources/ScreenSelector.nib/keyedobjects.nib b/Pinata Smackdown/Mac_Build_01.app/Contents/Resources/ScreenSelector.nib/keyedobjects.nib similarity index 100% rename from playable/Mac_Build_01.app/Contents/Resources/ScreenSelector.nib/keyedobjects.nib rename to Pinata Smackdown/Mac_Build_01.app/Contents/Resources/ScreenSelector.nib/keyedobjects.nib diff --git a/playable/Mac_Build_01.app/Contents/Resources/UnityPlayerIcon.png b/Pinata Smackdown/Mac_Build_01.app/Contents/Resources/UnityPlayerIcon.png similarity index 100% rename from playable/Mac_Build_01.app/Contents/Resources/UnityPlayerIcon.png rename to Pinata Smackdown/Mac_Build_01.app/Contents/Resources/UnityPlayerIcon.png diff --git a/playable/Mac_Build_01.app/Contents/Resources/unity default resources b/Pinata Smackdown/Mac_Build_01.app/Contents/Resources/unity default resources similarity index 100% rename from playable/Mac_Build_01.app/Contents/Resources/unity default resources rename to Pinata Smackdown/Mac_Build_01.app/Contents/Resources/unity default resources diff --git a/playable/PC_pinatasmackdown_Data/Mono/etc/mono/1.0/DefaultWsdlHelpGenerator.aspx b/Pinata Smackdown/PC_pinatasmackdown_Data/Mono/etc/mono/1.0/DefaultWsdlHelpGenerator.aspx similarity index 100% rename from playable/PC_pinatasmackdown_Data/Mono/etc/mono/1.0/DefaultWsdlHelpGenerator.aspx rename to Pinata Smackdown/PC_pinatasmackdown_Data/Mono/etc/mono/1.0/DefaultWsdlHelpGenerator.aspx diff --git a/playable/PC_pinatasmackdown_Data/Mono/etc/mono/1.0/machine.config b/Pinata Smackdown/PC_pinatasmackdown_Data/Mono/etc/mono/1.0/machine.config similarity index 100% rename from playable/PC_pinatasmackdown_Data/Mono/etc/mono/1.0/machine.config rename to Pinata Smackdown/PC_pinatasmackdown_Data/Mono/etc/mono/1.0/machine.config diff --git a/playable/PC_pinatasmackdown_Data/Mono/etc/mono/2.0/Browsers/Compat.browser b/Pinata Smackdown/PC_pinatasmackdown_Data/Mono/etc/mono/2.0/Browsers/Compat.browser similarity index 100% rename from playable/PC_pinatasmackdown_Data/Mono/etc/mono/2.0/Browsers/Compat.browser rename to Pinata Smackdown/PC_pinatasmackdown_Data/Mono/etc/mono/2.0/Browsers/Compat.browser diff --git a/playable/PC_pinatasmackdown_Data/Mono/etc/mono/2.0/DefaultWsdlHelpGenerator.aspx b/Pinata Smackdown/PC_pinatasmackdown_Data/Mono/etc/mono/2.0/DefaultWsdlHelpGenerator.aspx similarity index 100% rename from playable/PC_pinatasmackdown_Data/Mono/etc/mono/2.0/DefaultWsdlHelpGenerator.aspx rename to Pinata Smackdown/PC_pinatasmackdown_Data/Mono/etc/mono/2.0/DefaultWsdlHelpGenerator.aspx diff --git a/playable/PC_pinatasmackdown_Data/Mono/etc/mono/2.0/machine.config b/Pinata Smackdown/PC_pinatasmackdown_Data/Mono/etc/mono/2.0/machine.config similarity index 100% rename from playable/PC_pinatasmackdown_Data/Mono/etc/mono/2.0/machine.config rename to Pinata Smackdown/PC_pinatasmackdown_Data/Mono/etc/mono/2.0/machine.config diff --git a/playable/PC_pinatasmackdown_Data/Mono/etc/mono/2.0/settings.map b/Pinata Smackdown/PC_pinatasmackdown_Data/Mono/etc/mono/2.0/settings.map similarity index 100% rename from playable/PC_pinatasmackdown_Data/Mono/etc/mono/2.0/settings.map rename to Pinata Smackdown/PC_pinatasmackdown_Data/Mono/etc/mono/2.0/settings.map diff --git a/playable/PC_pinatasmackdown_Data/Mono/etc/mono/2.0/web.config b/Pinata Smackdown/PC_pinatasmackdown_Data/Mono/etc/mono/2.0/web.config similarity index 100% rename from playable/PC_pinatasmackdown_Data/Mono/etc/mono/2.0/web.config rename to Pinata Smackdown/PC_pinatasmackdown_Data/Mono/etc/mono/2.0/web.config diff --git a/playable/PC_pinatasmackdown_Data/Mono/etc/mono/browscap.ini b/Pinata Smackdown/PC_pinatasmackdown_Data/Mono/etc/mono/browscap.ini similarity index 100% rename from playable/PC_pinatasmackdown_Data/Mono/etc/mono/browscap.ini rename to Pinata Smackdown/PC_pinatasmackdown_Data/Mono/etc/mono/browscap.ini diff --git a/playable/PC_pinatasmackdown_Data/Mono/etc/mono/config b/Pinata Smackdown/PC_pinatasmackdown_Data/Mono/etc/mono/config similarity index 100% rename from playable/PC_pinatasmackdown_Data/Mono/etc/mono/config rename to Pinata Smackdown/PC_pinatasmackdown_Data/Mono/etc/mono/config diff --git a/playable/PC_pinatasmackdown_Data/Mono/etc/mono/mconfig/config.xml b/Pinata Smackdown/PC_pinatasmackdown_Data/Mono/etc/mono/mconfig/config.xml similarity index 100% rename from playable/PC_pinatasmackdown_Data/Mono/etc/mono/mconfig/config.xml rename to Pinata Smackdown/PC_pinatasmackdown_Data/Mono/etc/mono/mconfig/config.xml diff --git a/playable/PC_pinatasmackdown_Data/PlayerConnectionConfigFile b/Pinata Smackdown/PC_pinatasmackdown_Data/PlayerConnectionConfigFile similarity index 100% rename from playable/PC_pinatasmackdown_Data/PlayerConnectionConfigFile rename to Pinata Smackdown/PC_pinatasmackdown_Data/PlayerConnectionConfigFile diff --git a/playable/PC_pinatasmackdown_Data/Resources/unity default resources b/Pinata Smackdown/PC_pinatasmackdown_Data/Resources/unity default resources similarity index 100% rename from playable/PC_pinatasmackdown_Data/Resources/unity default resources rename to Pinata Smackdown/PC_pinatasmackdown_Data/Resources/unity default resources diff --git a/playable/PC_pinatasmackdown_Data/Resources/unity_builtin_extra b/Pinata Smackdown/PC_pinatasmackdown_Data/Resources/unity_builtin_extra similarity index 100% rename from playable/PC_pinatasmackdown_Data/Resources/unity_builtin_extra rename to Pinata Smackdown/PC_pinatasmackdown_Data/Resources/unity_builtin_extra diff --git a/playable/PC_pinatasmackdown_Data/mainData b/Pinata Smackdown/PC_pinatasmackdown_Data/mainData similarity index 100% rename from playable/PC_pinatasmackdown_Data/mainData rename to Pinata Smackdown/PC_pinatasmackdown_Data/mainData diff --git a/playable/PC_pinatasmackdown_Data/sharedassets0.assets b/Pinata Smackdown/PC_pinatasmackdown_Data/sharedassets0.assets similarity index 100% rename from playable/PC_pinatasmackdown_Data/sharedassets0.assets rename to Pinata Smackdown/PC_pinatasmackdown_Data/sharedassets0.assets diff --git a/PinataSmackdown/ProjectSettings/AudioManager.asset b/Pinata Smackdown/ProjectSettings/AudioManager.asset similarity index 100% rename from PinataSmackdown/ProjectSettings/AudioManager.asset rename to Pinata Smackdown/ProjectSettings/AudioManager.asset diff --git a/PinataSmackdown/ProjectSettings/DynamicsManager.asset b/Pinata Smackdown/ProjectSettings/DynamicsManager.asset similarity index 100% rename from PinataSmackdown/ProjectSettings/DynamicsManager.asset rename to Pinata Smackdown/ProjectSettings/DynamicsManager.asset diff --git a/PinataSmackdown/ProjectSettings/EditorBuildSettings.asset b/Pinata Smackdown/ProjectSettings/EditorBuildSettings.asset similarity index 100% rename from PinataSmackdown/ProjectSettings/EditorBuildSettings.asset rename to Pinata Smackdown/ProjectSettings/EditorBuildSettings.asset diff --git a/PinataSmackdown_unity/ProjectSettings/EditorSettings.asset b/Pinata Smackdown/ProjectSettings/EditorSettings.asset similarity index 100% rename from PinataSmackdown_unity/ProjectSettings/EditorSettings.asset rename to Pinata Smackdown/ProjectSettings/EditorSettings.asset diff --git a/PinataSmackdown/ProjectSettings/GraphicsSettings.asset b/Pinata Smackdown/ProjectSettings/GraphicsSettings.asset similarity index 100% rename from PinataSmackdown/ProjectSettings/GraphicsSettings.asset rename to Pinata Smackdown/ProjectSettings/GraphicsSettings.asset diff --git a/playable/ProjectSettings/InputManager.asset b/Pinata Smackdown/ProjectSettings/InputManager.asset similarity index 100% rename from playable/ProjectSettings/InputManager.asset rename to Pinata Smackdown/ProjectSettings/InputManager.asset diff --git a/PinataSmackdown/ProjectSettings/NavMeshLayers.asset b/Pinata Smackdown/ProjectSettings/NavMeshLayers.asset similarity index 100% rename from PinataSmackdown/ProjectSettings/NavMeshLayers.asset rename to Pinata Smackdown/ProjectSettings/NavMeshLayers.asset diff --git a/PinataSmackdown/ProjectSettings/NetworkManager.asset b/Pinata Smackdown/ProjectSettings/NetworkManager.asset similarity index 100% rename from PinataSmackdown/ProjectSettings/NetworkManager.asset rename to Pinata Smackdown/ProjectSettings/NetworkManager.asset diff --git a/PinataSmackdown/ProjectSettings/Physics2DSettings.asset b/Pinata Smackdown/ProjectSettings/Physics2DSettings.asset similarity index 100% rename from PinataSmackdown/ProjectSettings/Physics2DSettings.asset rename to Pinata Smackdown/ProjectSettings/Physics2DSettings.asset diff --git a/PinataSmackdown_unity/ProjectSettings/ProjectSettings.asset b/Pinata Smackdown/ProjectSettings/ProjectSettings.asset similarity index 100% rename from PinataSmackdown_unity/ProjectSettings/ProjectSettings.asset rename to Pinata Smackdown/ProjectSettings/ProjectSettings.asset diff --git a/playable/ProjectSettings/QualitySettings.asset b/Pinata Smackdown/ProjectSettings/QualitySettings.asset similarity index 100% rename from playable/ProjectSettings/QualitySettings.asset rename to Pinata Smackdown/ProjectSettings/QualitySettings.asset diff --git a/playable/ProjectSettings/TagManager.asset b/Pinata Smackdown/ProjectSettings/TagManager.asset similarity index 100% rename from playable/ProjectSettings/TagManager.asset rename to Pinata Smackdown/ProjectSettings/TagManager.asset diff --git a/PinataSmackdown/ProjectSettings/TimeManager.asset b/Pinata Smackdown/ProjectSettings/TimeManager.asset similarity index 100% rename from PinataSmackdown/ProjectSettings/TimeManager.asset rename to Pinata Smackdown/ProjectSettings/TimeManager.asset 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/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/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_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/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/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/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/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/QualitySettings.asset b/PinataSmackdown_unity/ProjectSettings/QualitySettings.asset deleted file mode 100644 index 9cd45cb..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/.DS_Store b/playable/.DS_Store deleted file mode 100644 index 233f08c..0000000 Binary files a/playable/.DS_Store and /dev/null differ diff --git a/playable/Assets/.DS_Store b/playable/Assets/.DS_Store deleted file mode 100644 index c201f4d..0000000 Binary files a/playable/Assets/.DS_Store and /dev/null differ diff --git a/playable/Assets/Lachlan_jump_work.unity.meta b/playable/Assets/Lachlan_jump_work.unity.meta deleted file mode 100644 index e26cfb1..0000000 --- a/playable/Assets/Lachlan_jump_work.unity.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 7929efa0d0fa84d269f932355f708f12 -DefaultImporter: - userData: diff --git a/playable/Assets/Main Camera.prefab b/playable/Assets/Main Camera.prefab deleted file mode 100644 index 2da1082..0000000 Binary files a/playable/Assets/Main Camera.prefab and /dev/null differ diff --git a/playable/Assets/Main Camera.prefab.meta b/playable/Assets/Main Camera.prefab.meta deleted file mode 100644 index 6a11ca1..0000000 --- a/playable/Assets/Main Camera.prefab.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: c9c7412211778407f9c1450e23c597fc -NativeFormatImporter: - userData: diff --git a/playable/Assets/Materials.meta b/playable/Assets/Materials.meta deleted file mode 100644 index 325179b..0000000 --- a/playable/Assets/Materials.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: 334a07353496b3f4682903e0a28dbad0 -folderAsset: yes -DefaultImporter: - userData: diff --git a/playable/Assets/Materials/lambert1.mat b/playable/Assets/Materials/lambert1.mat deleted file mode 100644 index d05ff69..0000000 Binary files a/playable/Assets/Materials/lambert1.mat and /dev/null differ diff --git a/playable/Assets/Materials/lambert1.mat.meta b/playable/Assets/Materials/lambert1.mat.meta deleted file mode 100644 index 1b7cf07..0000000 --- a/playable/Assets/Materials/lambert1.mat.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: ef3b7b6cdc3ee234899234695bd8d7c3 -NativeFormatImporter: - userData: diff --git a/playable/Assets/Materials/pillar_unrapped 1.mat b/playable/Assets/Materials/pillar_unrapped 1.mat deleted file mode 100644 index f3fba7a..0000000 Binary files a/playable/Assets/Materials/pillar_unrapped 1.mat and /dev/null differ diff --git a/playable/Assets/Materials/pillar_unrapped 1.mat.meta b/playable/Assets/Materials/pillar_unrapped 1.mat.meta deleted file mode 100644 index ac13cb0..0000000 --- a/playable/Assets/Materials/pillar_unrapped 1.mat.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 001b004239ebbc846b32fe5e3bbab73c -NativeFormatImporter: - userData: diff --git a/playable/Assets/Materials/pillar_unrapped.mat b/playable/Assets/Materials/pillar_unrapped.mat deleted file mode 100644 index 6399eaa..0000000 Binary files a/playable/Assets/Materials/pillar_unrapped.mat and /dev/null differ diff --git a/playable/Assets/Materials/pillar_unrapped.mat.meta b/playable/Assets/Materials/pillar_unrapped.mat.meta deleted file mode 100644 index 664f70d..0000000 --- a/playable/Assets/Materials/pillar_unrapped.mat.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 4e19020496989f94dba07a0025059bcf -NativeFormatImporter: - userData: diff --git a/playable/Assets/Materials/platform_texture.mat b/playable/Assets/Materials/platform_texture.mat deleted file mode 100644 index a247928..0000000 Binary files a/playable/Assets/Materials/platform_texture.mat and /dev/null differ diff --git a/playable/Assets/Materials/platform_texture.mat.meta b/playable/Assets/Materials/platform_texture.mat.meta deleted file mode 100644 index 9dc3b70..0000000 --- a/playable/Assets/Materials/platform_texture.mat.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 0ed59f0aa227af74e943e157e83fd03e -NativeFormatImporter: - userData: diff --git a/playable/Assets/New Terrain.asset b/playable/Assets/New Terrain.asset deleted file mode 100644 index bb7b28a..0000000 Binary files a/playable/Assets/New Terrain.asset and /dev/null differ diff --git a/playable/Assets/New Terrain.asset.meta b/playable/Assets/New Terrain.asset.meta deleted file mode 100644 index 90162b2..0000000 --- a/playable/Assets/New Terrain.asset.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: a03922fd2222daf45aa6220f0ae167ad -NativeFormatImporter: - userData: diff --git a/playable/Assets/Platform_obj.fbx b/playable/Assets/Platform_obj.fbx deleted file mode 100644 index 0cc2ed7..0000000 Binary files a/playable/Assets/Platform_obj.fbx and /dev/null differ diff --git a/playable/Assets/Platform_obj.fbx.meta b/playable/Assets/Platform_obj.fbx.meta deleted file mode 100644 index bdc3bb4..0000000 --- a/playable/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/playable/Assets/Scripts/bulletScript.cs b/playable/Assets/Scripts/bulletScript.cs deleted file mode 100644 index eef6c2f..0000000 --- a/playable/Assets/Scripts/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/playable/Assets/Scripts/bulletScript.cs.meta b/playable/Assets/Scripts/bulletScript.cs.meta deleted file mode 100644 index 4f3b724..0000000 --- a/playable/Assets/Scripts/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/playable/Assets/Scripts/camera_controls.cs b/playable/Assets/Scripts/camera_controls.cs deleted file mode 100644 index feb8f97..0000000 --- a/playable/Assets/Scripts/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/playable/Assets/Scripts/camera_controls.cs.meta b/playable/Assets/Scripts/camera_controls.cs.meta deleted file mode 100644 index 45bbff6..0000000 --- a/playable/Assets/Scripts/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/playable/Assets/bounce.physicsMaterial2D b/playable/Assets/bounce.physicsMaterial2D deleted file mode 100644 index 7559879..0000000 Binary files a/playable/Assets/bounce.physicsMaterial2D and /dev/null differ diff --git a/playable/Assets/bounce.physicsMaterial2D.meta b/playable/Assets/bounce.physicsMaterial2D.meta deleted file mode 100644 index c4a19cc..0000000 --- a/playable/Assets/bounce.physicsMaterial2D.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: 0b5d5cd6009d64349bcb76767e5bf374 -NativeFormatImporter: - userData: diff --git a/playable/Assets/bullet.prefab b/playable/Assets/bullet.prefab deleted file mode 100644 index f9061be..0000000 Binary files a/playable/Assets/bullet.prefab and /dev/null differ diff --git a/playable/Assets/bullet.prefab.meta b/playable/Assets/bullet.prefab.meta deleted file mode 100644 index 0bdaf41..0000000 --- a/playable/Assets/bullet.prefab.meta +++ /dev/null @@ -1,4 +0,0 @@ -fileFormatVersion: 2 -guid: ebb0d5e70fdd4442f970c56d96d1458a -NativeFormatImporter: - userData: diff --git a/playable/Assets/floating_platform_02.mb b/playable/Assets/floating_platform_02.mb deleted file mode 100644 index b9b1cbd..0000000 Binary files a/playable/Assets/floating_platform_02.mb and /dev/null differ diff --git a/playable/Assets/floating_platform_02.mb.meta b/playable/Assets/floating_platform_02.mb.meta deleted file mode 100644 index aae8047..0000000 --- a/playable/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/playable/Assets/pillar_obj.fbx b/playable/Assets/pillar_obj.fbx deleted file mode 100644 index 4fd3683..0000000 Binary files a/playable/Assets/pillar_obj.fbx and /dev/null differ diff --git a/playable/Assets/pillar_unrapped.jpg b/playable/Assets/pillar_unrapped.jpg deleted file mode 100644 index f0deb0d..0000000 Binary files a/playable/Assets/pillar_unrapped.jpg and /dev/null differ diff --git a/playable/Assets/pillar_unrapped.jpg.meta b/playable/Assets/pillar_unrapped.jpg.meta deleted file mode 100644 index feafe66..0000000 --- a/playable/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/playable/Assets/platform_texture.jpg b/playable/Assets/platform_texture.jpg deleted file mode 100644 index b0e3654..0000000 Binary files a/playable/Assets/platform_texture.jpg and /dev/null differ diff --git a/playable/Assets/platform_texture.jpg.meta b/playable/Assets/platform_texture.jpg.meta deleted file mode 100644 index bee8720..0000000 --- a/playable/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/playable/ProjectSettings/AudioManager.asset b/playable/ProjectSettings/AudioManager.asset deleted file mode 100644 index e971d21..0000000 Binary files a/playable/ProjectSettings/AudioManager.asset and /dev/null differ diff --git a/playable/ProjectSettings/DynamicsManager.asset b/playable/ProjectSettings/DynamicsManager.asset deleted file mode 100644 index 655a767..0000000 Binary files a/playable/ProjectSettings/DynamicsManager.asset and /dev/null differ diff --git a/playable/ProjectSettings/EditorBuildSettings.asset b/playable/ProjectSettings/EditorBuildSettings.asset deleted file mode 100644 index d02b9cd..0000000 Binary files a/playable/ProjectSettings/EditorBuildSettings.asset and /dev/null differ diff --git a/playable/ProjectSettings/EditorSettings.asset b/playable/ProjectSettings/EditorSettings.asset deleted file mode 100644 index 7fa5ee5..0000000 Binary files a/playable/ProjectSettings/EditorSettings.asset and /dev/null differ diff --git a/playable/ProjectSettings/GraphicsSettings.asset b/playable/ProjectSettings/GraphicsSettings.asset deleted file mode 100644 index c0ee0ec..0000000 Binary files a/playable/ProjectSettings/GraphicsSettings.asset and /dev/null differ diff --git a/playable/ProjectSettings/NavMeshLayers.asset b/playable/ProjectSettings/NavMeshLayers.asset deleted file mode 100644 index 22e2058..0000000 Binary files a/playable/ProjectSettings/NavMeshLayers.asset and /dev/null differ diff --git a/playable/ProjectSettings/NetworkManager.asset b/playable/ProjectSettings/NetworkManager.asset deleted file mode 100644 index 3e988a1..0000000 Binary files a/playable/ProjectSettings/NetworkManager.asset and /dev/null differ diff --git a/playable/ProjectSettings/Physics2DSettings.asset b/playable/ProjectSettings/Physics2DSettings.asset deleted file mode 100644 index 9b87d5f..0000000 Binary files a/playable/ProjectSettings/Physics2DSettings.asset and /dev/null differ diff --git a/playable/ProjectSettings/ProjectSettings.asset b/playable/ProjectSettings/ProjectSettings.asset deleted file mode 100644 index 1030463..0000000 Binary files a/playable/ProjectSettings/ProjectSettings.asset and /dev/null differ diff --git a/playable/ProjectSettings/TimeManager.asset b/playable/ProjectSettings/TimeManager.asset deleted file mode 100644 index 6a2964f..0000000 Binary files a/playable/ProjectSettings/TimeManager.asset and /dev/null differ