Browse Source

Prototype

Submit_prototype
Lachlan 9 years ago
parent
commit
d58f4d33bf
267 changed files with 92 additions and 699 deletions
  1. +0
    -0
      Pinata Smackdown/.DS_Store
  2. +0
    -0
      Pinata Smackdown/._Mac_Build_01.app
  3. +0
    -0
      Pinata Smackdown/._PC_pinatasmackdown_Data
  4. +0
    -0
      Pinata Smackdown/Assets/.DS_Store
  5. BIN
      Pinata Smackdown/Assets/HammerWeapon01.fbx
  6. +25
    -24
      Pinata Smackdown/Assets/HammerWeapon01.fbx.meta
  7. +0
    -0
      Pinata Smackdown/Assets/Heart.png
  8. +0
    -0
      Pinata Smackdown/Assets/Heart.png.meta
  9. +0
    -0
      Pinata Smackdown/Assets/Horn1.fbx
  10. +0
    -0
      Pinata Smackdown/Assets/Horn1.fbx.meta
  11. +0
    -0
      Pinata Smackdown/Assets/Horn2.fbx
  12. +0
    -0
      Pinata Smackdown/Assets/Horn2.fbx.meta
  13. +0
    -0
      Pinata Smackdown/Assets/KatanaWeapon01.fbx
  14. +0
    -0
      Pinata Smackdown/Assets/KatanaWeapon01.fbx.meta
  15. BIN
      Pinata Smackdown/Assets/Lachlan_jump_work.unity
  16. +0
    -0
      Pinata Smackdown/Assets/Lachlan_jump_work.unity.meta
  17. +0
    -0
      Pinata Smackdown/Assets/Main Camera.prefab
  18. +0
    -0
      Pinata Smackdown/Assets/Main Camera.prefab.meta
  19. +0
    -0
      Pinata Smackdown/Assets/Materials.meta
  20. BIN
      Pinata Smackdown/Assets/Materials/Katana_output01_lambert2.mat
  21. +4
    -0
      Pinata Smackdown/Assets/Materials/Katana_output01_lambert2.mat.meta
  22. +0
    -0
      Pinata Smackdown/Assets/Materials/No Name.mat
  23. +0
    -0
      Pinata Smackdown/Assets/Materials/No Name.mat.meta
  24. +0
    -0
      Pinata Smackdown/Assets/Materials/blade 1.mat
  25. +0
    -0
      Pinata Smackdown/Assets/Materials/blade 1.mat.meta
  26. +0
    -0
      Pinata Smackdown/Assets/Materials/blade 2.mat
  27. +0
    -0
      Pinata Smackdown/Assets/Materials/blade 2.mat.meta
  28. +0
    -0
      Pinata Smackdown/Assets/Materials/blade.mat
  29. +0
    -0
      Pinata Smackdown/Assets/Materials/blade.mat.meta
  30. +0
    -0
      Pinata Smackdown/Assets/Materials/blinn1.mat
  31. +0
    -0
      Pinata Smackdown/Assets/Materials/blinn1.mat.meta
  32. +0
    -0
      Pinata Smackdown/Assets/Materials/blinn2.mat
  33. +0
    -0
      Pinata Smackdown/Assets/Materials/blinn2.mat.meta
  34. +0
    -0
      Pinata Smackdown/Assets/Materials/blinn5.mat
  35. +0
    -0
      Pinata Smackdown/Assets/Materials/blinn5.mat.meta
  36. +0
    -0
      Pinata Smackdown/Assets/Materials/katanaHandle 1.mat
  37. +0
    -0
      Pinata Smackdown/Assets/Materials/katanaHandle 1.mat.meta
  38. +0
    -0
      Pinata Smackdown/Assets/Materials/katanaHandle 2.mat
  39. +0
    -0
      Pinata Smackdown/Assets/Materials/katanaHandle 2.mat.meta
  40. +0
    -0
      Pinata Smackdown/Assets/Materials/katanaHandle 3.mat
  41. +0
    -0
      Pinata Smackdown/Assets/Materials/katanaHandle 3.mat.meta
  42. BIN
      Pinata Smackdown/Assets/Materials/katanaHandle 4.mat
  43. +4
    -0
      Pinata Smackdown/Assets/Materials/katanaHandle 4.mat.meta
  44. +0
    -0
      Pinata Smackdown/Assets/Materials/katanaHandle.mat
  45. +0
    -0
      Pinata Smackdown/Assets/Materials/katanaHandle.mat.meta
  46. +0
    -0
      Pinata Smackdown/Assets/Materials/katanaHolder 1.mat
  47. +0
    -0
      Pinata Smackdown/Assets/Materials/katanaHolder 1.mat.meta
  48. BIN
      Pinata Smackdown/Assets/Materials/katanaHolder 2.mat
  49. +4
    -0
      Pinata Smackdown/Assets/Materials/katanaHolder 2.mat.meta
  50. BIN
      Pinata Smackdown/Assets/Materials/katanaHolder 3.mat
  51. +4
    -0
      Pinata Smackdown/Assets/Materials/katanaHolder 3.mat.meta
  52. +0
    -0
      Pinata Smackdown/Assets/Materials/katanaHolder.mat
  53. +0
    -0
      Pinata Smackdown/Assets/Materials/katanaHolder.mat.meta
  54. +0
    -0
      Pinata Smackdown/Assets/Materials/lambert1.mat
  55. +0
    -0
      Pinata Smackdown/Assets/Materials/lambert1.mat.meta
  56. +0
    -0
      Pinata Smackdown/Assets/Materials/lambert2.mat
  57. +0
    -0
      Pinata Smackdown/Assets/Materials/lambert2.mat.meta
  58. +0
    -0
      Pinata Smackdown/Assets/Materials/leather_texture1.mat
  59. +0
    -0
      Pinata Smackdown/Assets/Materials/leather_texture1.mat.meta
  60. BIN
      Pinata Smackdown/Assets/Materials/mallet_texture.mat
  61. +4
    -0
      Pinata Smackdown/Assets/Materials/mallet_texture.mat.meta
  62. +0
    -0
      Pinata Smackdown/Assets/Materials/pillar_unrapped 1.mat
  63. +0
    -0
      Pinata Smackdown/Assets/Materials/pillar_unrapped 1.mat.meta
  64. +0
    -0
      Pinata Smackdown/Assets/Materials/pillar_unrapped.mat
  65. +0
    -0
      Pinata Smackdown/Assets/Materials/pillar_unrapped.mat.meta
  66. +0
    -0
      Pinata Smackdown/Assets/Materials/platform_texture.mat
  67. +0
    -0
      Pinata Smackdown/Assets/Materials/platform_texture.mat.meta
  68. +0
    -0
      Pinata Smackdown/Assets/Menu.cs
  69. +0
    -0
      Pinata Smackdown/Assets/Menu.cs.meta
  70. +0
    -0
      Pinata Smackdown/Assets/Music.meta
  71. +0
    -0
      Pinata Smackdown/Assets/Music/Guajiras.mp3.mp3
  72. +0
    -0
      Pinata Smackdown/Assets/Music/Guajiras.mp3.mp3.meta
  73. +0
    -0
      Pinata Smackdown/Assets/Music/Machinimasound.com_-_Battle_of_Kings.mp3
  74. +0
    -0
      Pinata Smackdown/Assets/Music/Machinimasound.com_-_Battle_of_Kings.mp3.meta
  75. +0
    -0
      Pinata Smackdown/Assets/New Terrain.asset
  76. +0
    -0
      Pinata Smackdown/Assets/New Terrain.asset.meta
  77. +0
    -0
      Pinata Smackdown/Assets/Pinata.anim
  78. +0
    -0
      Pinata Smackdown/Assets/Pinata.anim.meta
  79. +0
    -0
      Pinata Smackdown/Assets/Pinata.controller
  80. +0
    -0
      Pinata Smackdown/Assets/Pinata.controller.meta
  81. +0
    -0
      Pinata Smackdown/Assets/Pinata.meta
  82. +0
    -0
      Pinata Smackdown/Assets/Pinata/Pinata.fbx
  83. +0
    -0
      Pinata Smackdown/Assets/Pinata/Pinata.fbx.meta
  84. +0
    -0
      Pinata Smackdown/Assets/Pinata/Pinata_Fall.fbx
  85. +0
    -0
      Pinata Smackdown/Assets/Pinata/Pinata_Fall.fbx.meta
  86. +0
    -0
      Pinata Smackdown/Assets/Pinata/Pinata_Idle.fbx
  87. +0
    -0
      Pinata Smackdown/Assets/Pinata/Pinata_Idle.fbx.meta
  88. +0
    -0
      Pinata Smackdown/Assets/Platform_obj.fbx
  89. +0
    -0
      Pinata Smackdown/Assets/Platform_obj.fbx.meta
  90. +0
    -0
      Pinata Smackdown/Assets/Prefabs.meta
  91. +0
    -0
      Pinata Smackdown/Assets/Prefabs/Confetti.prefab
  92. +0
    -0
      Pinata Smackdown/Assets/Prefabs/Confetti.prefab.meta
  93. +0
    -0
      Pinata Smackdown/Assets/Prefabs/Heart 1.prefab
  94. +0
    -0
      Pinata Smackdown/Assets/Prefabs/Heart 1.prefab.meta
  95. +0
    -0
      Pinata Smackdown/Assets/Prefabs/Heart.prefab
  96. +0
    -0
      Pinata Smackdown/Assets/Prefabs/Heart.prefab.meta
  97. +0
    -0
      Pinata Smackdown/Assets/Prefabs/candy.prefab
  98. +0
    -0
      Pinata Smackdown/Assets/Prefabs/candy.prefab.meta
  99. +0
    -0
      Pinata Smackdown/Assets/Scripts.meta
  100. +0
    -0
      Pinata Smackdown/Assets/Scripts/bulletScript.cs

PinataSmackdown_unity/.DS_Store → Pinata Smackdown/.DS_Store View File


playable/._Mac_Build_01.app → Pinata Smackdown/._Mac_Build_01.app View File


playable/._PC_pinatasmackdown_Data → Pinata Smackdown/._PC_pinatasmackdown_Data View File


PinataSmackdown_unity/Assets/.DS_Store → Pinata Smackdown/Assets/.DS_Store View File


BIN
Pinata Smackdown/Assets/HammerWeapon01.fbx View File


playable/Assets/pillar_obj.fbx.meta → Pinata Smackdown/Assets/HammerWeapon01.fbx.meta View File

@ -1,31 +1,32 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: c5c501b1516413f4d916ad0a9aa39dee
guid: 2694ee955a23d77468182051fc36deaf
ModelImporter: ModelImporter:
serializedVersion: 16 serializedVersion: 16
fileIDToRecycleName: 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 9500000: //RootNode
materials: materials:
importMaterials: 1 importMaterials: 1

playable/Assets/Heart.png → Pinata Smackdown/Assets/Heart.png View File


playable/Assets/Heart.png.meta → Pinata Smackdown/Assets/Heart.png.meta View File


playable/Assets/Horn1.fbx → Pinata Smackdown/Assets/Horn1.fbx View File


playable/Assets/Horn1.fbx.meta → Pinata Smackdown/Assets/Horn1.fbx.meta View File


playable/Assets/Horn2.fbx → Pinata Smackdown/Assets/Horn2.fbx View File


playable/Assets/Horn2.fbx.meta → Pinata Smackdown/Assets/Horn2.fbx.meta View File


playable/Assets/KatanaWeapon01.fbx → Pinata Smackdown/Assets/KatanaWeapon01.fbx View File


playable/Assets/KatanaWeapon01.fbx.meta → Pinata Smackdown/Assets/KatanaWeapon01.fbx.meta View File


BIN
playable/Assets/Lachlan_jump_work.unity → Pinata Smackdown/Assets/Lachlan_jump_work.unity View File


PinataSmackdown_unity/Assets/Lachlan_jump_work.unity.meta → Pinata Smackdown/Assets/Lachlan_jump_work.unity.meta View File


PinataSmackdown_unity/Assets/Main Camera.prefab → Pinata Smackdown/Assets/Main Camera.prefab View File


PinataSmackdown_unity/Assets/Main Camera.prefab.meta → Pinata Smackdown/Assets/Main Camera.prefab.meta View File


PinataSmackdown_unity/Assets/Materials.meta → Pinata Smackdown/Assets/Materials.meta View File


BIN
Pinata Smackdown/Assets/Materials/Katana_output01_lambert2.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/Katana_output01_lambert2.mat.meta View File

@ -0,0 +1,4 @@
fileFormatVersion: 2
guid: 7a1b07fb262d67247a35f5387f2de8b7
NativeFormatImporter:
userData:

playable/Assets/Materials/No Name.mat → Pinata Smackdown/Assets/Materials/No Name.mat View File


playable/Assets/Materials/No Name.mat.meta → Pinata Smackdown/Assets/Materials/No Name.mat.meta View File


playable/Assets/Materials/blade 1.mat → Pinata Smackdown/Assets/Materials/blade 1.mat View File


playable/Assets/Materials/blade 1.mat.meta → Pinata Smackdown/Assets/Materials/blade 1.mat.meta View File


playable/Assets/Materials/blade 2.mat → Pinata Smackdown/Assets/Materials/blade 2.mat View File


playable/Assets/Materials/blade 2.mat.meta → Pinata Smackdown/Assets/Materials/blade 2.mat.meta View File


playable/Assets/Materials/blade.mat → Pinata Smackdown/Assets/Materials/blade.mat View File


playable/Assets/Materials/blade.mat.meta → Pinata Smackdown/Assets/Materials/blade.mat.meta View File


playable/Assets/Materials/blinn1.mat → Pinata Smackdown/Assets/Materials/blinn1.mat View File


playable/Assets/Materials/blinn1.mat.meta → Pinata Smackdown/Assets/Materials/blinn1.mat.meta View File


playable/Assets/Materials/blinn2.mat → Pinata Smackdown/Assets/Materials/blinn2.mat View File


playable/Assets/Materials/blinn2.mat.meta → Pinata Smackdown/Assets/Materials/blinn2.mat.meta View File


playable/Assets/Materials/blinn5.mat → Pinata Smackdown/Assets/Materials/blinn5.mat View File


playable/Assets/Materials/blinn5.mat.meta → Pinata Smackdown/Assets/Materials/blinn5.mat.meta View File


playable/Assets/Materials/katanaHandle 1.mat → Pinata Smackdown/Assets/Materials/katanaHandle 1.mat View File


playable/Assets/Materials/katanaHandle 1.mat.meta → Pinata Smackdown/Assets/Materials/katanaHandle 1.mat.meta View File


playable/Assets/Materials/katanaHandle 2.mat → Pinata Smackdown/Assets/Materials/katanaHandle 2.mat View File


playable/Assets/Materials/katanaHandle 2.mat.meta → Pinata Smackdown/Assets/Materials/katanaHandle 2.mat.meta View File


playable/Assets/Materials/katanaHandle 3.mat → Pinata Smackdown/Assets/Materials/katanaHandle 3.mat View File


playable/Assets/Materials/katanaHandle 3.mat.meta → Pinata Smackdown/Assets/Materials/katanaHandle 3.mat.meta View File


BIN
Pinata Smackdown/Assets/Materials/katanaHandle 4.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/katanaHandle 4.mat.meta View File

@ -0,0 +1,4 @@
fileFormatVersion: 2
guid: 45290483ecca74d458a4794a30d4ac59
NativeFormatImporter:
userData:

playable/Assets/Materials/katanaHandle.mat → Pinata Smackdown/Assets/Materials/katanaHandle.mat View File


playable/Assets/Materials/katanaHandle.mat.meta → Pinata Smackdown/Assets/Materials/katanaHandle.mat.meta View File


playable/Assets/Materials/katanaHolder 1.mat → Pinata Smackdown/Assets/Materials/katanaHolder 1.mat View File


playable/Assets/Materials/katanaHolder 1.mat.meta → Pinata Smackdown/Assets/Materials/katanaHolder 1.mat.meta View File


BIN
Pinata Smackdown/Assets/Materials/katanaHolder 2.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/katanaHolder 2.mat.meta View File

@ -0,0 +1,4 @@
fileFormatVersion: 2
guid: ec95dfedc9fda8d4784ea8d1a1ddbf0d
NativeFormatImporter:
userData:

BIN
Pinata Smackdown/Assets/Materials/katanaHolder 3.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/katanaHolder 3.mat.meta View File

@ -0,0 +1,4 @@
fileFormatVersion: 2
guid: e569815894f83604baf8c423f2371751
NativeFormatImporter:
userData:

playable/Assets/Materials/katanaHolder.mat → Pinata Smackdown/Assets/Materials/katanaHolder.mat View File


playable/Assets/Materials/katanaHolder.mat.meta → Pinata Smackdown/Assets/Materials/katanaHolder.mat.meta View File


PinataSmackdown_unity/Assets/Materials/lambert1.mat → Pinata Smackdown/Assets/Materials/lambert1.mat View File


PinataSmackdown_unity/Assets/Materials/lambert1.mat.meta → Pinata Smackdown/Assets/Materials/lambert1.mat.meta View File


playable/Assets/Materials/lambert2.mat → Pinata Smackdown/Assets/Materials/lambert2.mat View File


playable/Assets/Materials/lambert2.mat.meta → Pinata Smackdown/Assets/Materials/lambert2.mat.meta View File


playable/Assets/Materials/leather_texture1.mat → Pinata Smackdown/Assets/Materials/leather_texture1.mat View File


playable/Assets/Materials/leather_texture1.mat.meta → Pinata Smackdown/Assets/Materials/leather_texture1.mat.meta View File


BIN
Pinata Smackdown/Assets/Materials/mallet_texture.mat View File


+ 4
- 0
Pinata Smackdown/Assets/Materials/mallet_texture.mat.meta View File

@ -0,0 +1,4 @@
fileFormatVersion: 2
guid: b48d0f3626bedad4f84e5af4e4535e2d
NativeFormatImporter:
userData:

PinataSmackdown_unity/Assets/Materials/pillar_unrapped 1.mat → Pinata Smackdown/Assets/Materials/pillar_unrapped 1.mat View File


PinataSmackdown_unity/Assets/Materials/pillar_unrapped 1.mat.meta → Pinata Smackdown/Assets/Materials/pillar_unrapped 1.mat.meta View File


PinataSmackdown_unity/Assets/Materials/pillar_unrapped.mat → Pinata Smackdown/Assets/Materials/pillar_unrapped.mat View File


PinataSmackdown_unity/Assets/Materials/pillar_unrapped.mat.meta → Pinata Smackdown/Assets/Materials/pillar_unrapped.mat.meta View File


PinataSmackdown_unity/Assets/Materials/platform_texture.mat → Pinata Smackdown/Assets/Materials/platform_texture.mat View File


PinataSmackdown_unity/Assets/Materials/platform_texture.mat.meta → Pinata Smackdown/Assets/Materials/platform_texture.mat.meta View File


playable/Assets/Menu.cs → Pinata Smackdown/Assets/Menu.cs View File


playable/Assets/Menu.cs.meta → Pinata Smackdown/Assets/Menu.cs.meta View File


playable/Assets/Music.meta → Pinata Smackdown/Assets/Music.meta View File


playable/Assets/Music/Guajiras.mp3.mp3 → Pinata Smackdown/Assets/Music/Guajiras.mp3.mp3 View File


playable/Assets/Music/Guajiras.mp3.mp3.meta → Pinata Smackdown/Assets/Music/Guajiras.mp3.mp3.meta View File


playable/Assets/Music/Machinimasound.com_-_Battle_of_Kings.mp3 → Pinata Smackdown/Assets/Music/Machinimasound.com_-_Battle_of_Kings.mp3 View File


playable/Assets/Music/Machinimasound.com_-_Battle_of_Kings.mp3.meta → Pinata Smackdown/Assets/Music/Machinimasound.com_-_Battle_of_Kings.mp3.meta View File


PinataSmackdown_unity/Assets/New Terrain.asset → Pinata Smackdown/Assets/New Terrain.asset View File


PinataSmackdown_unity/Assets/New Terrain.asset.meta → Pinata Smackdown/Assets/New Terrain.asset.meta View File


playable/Assets/Pinata.anim → Pinata Smackdown/Assets/Pinata.anim View File


playable/Assets/Pinata.anim.meta → Pinata Smackdown/Assets/Pinata.anim.meta View File


playable/Assets/Pinata.controller → Pinata Smackdown/Assets/Pinata.controller View File


playable/Assets/Pinata.controller.meta → Pinata Smackdown/Assets/Pinata.controller.meta View File


playable/Assets/Pinata.meta → Pinata Smackdown/Assets/Pinata.meta View File


playable/Assets/Pinata/Pinata.fbx → Pinata Smackdown/Assets/Pinata/Pinata.fbx View File


playable/Assets/Pinata/Pinata.fbx.meta → Pinata Smackdown/Assets/Pinata/Pinata.fbx.meta View File


playable/Assets/Pinata/Pinata_Fall.fbx → Pinata Smackdown/Assets/Pinata/Pinata_Fall.fbx View File


playable/Assets/Pinata/Pinata_Fall.fbx.meta → Pinata Smackdown/Assets/Pinata/Pinata_Fall.fbx.meta View File


playable/Assets/Pinata/Pinata_Idle.fbx → Pinata Smackdown/Assets/Pinata/Pinata_Idle.fbx View File


playable/Assets/Pinata/Pinata_Idle.fbx.meta → Pinata Smackdown/Assets/Pinata/Pinata_Idle.fbx.meta View File


PinataSmackdown_unity/Assets/Platform_obj.fbx → Pinata Smackdown/Assets/Platform_obj.fbx View File


PinataSmackdown_unity/Assets/Platform_obj.fbx.meta → Pinata Smackdown/Assets/Platform_obj.fbx.meta View File


playable/Assets/Prefabs.meta → Pinata Smackdown/Assets/Prefabs.meta View File


playable/Assets/Prefabs/Confetti.prefab → Pinata Smackdown/Assets/Prefabs/Confetti.prefab View File


playable/Assets/Prefabs/Confetti.prefab.meta → Pinata Smackdown/Assets/Prefabs/Confetti.prefab.meta View File


playable/Assets/Prefabs/Heart 1.prefab → Pinata Smackdown/Assets/Prefabs/Heart 1.prefab View File


playable/Assets/Prefabs/Heart 1.prefab.meta → Pinata Smackdown/Assets/Prefabs/Heart 1.prefab.meta View File


playable/Assets/Prefabs/Heart.prefab → Pinata Smackdown/Assets/Prefabs/Heart.prefab View File


playable/Assets/Prefabs/Heart.prefab.meta → Pinata Smackdown/Assets/Prefabs/Heart.prefab.meta View File


playable/Assets/Prefabs/candy.prefab → Pinata Smackdown/Assets/Prefabs/candy.prefab View File


playable/Assets/Prefabs/candy.prefab.meta → Pinata Smackdown/Assets/Prefabs/candy.prefab.meta View File


playable/Assets/Scripts.meta → Pinata Smackdown/Assets/Scripts.meta View File


PinataSmackdown_unity/Assets/bulletScript.cs → Pinata Smackdown/Assets/Scripts/bulletScript.cs View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save