fixed some staff mechanics

Fixed how weapon swiching worked with staff. Created an animation for
staff.
New branch changes to reflect OUYA plugin things
Made a few small chcangeds to ZombieAI and changed the name of weaponmonster to be zombieweapon.
Merge branch 'ZachTest' into Zach2
Quick
Added in all of the common enemies all with very similar looking AI's. They behave closely to what I would like them at, but I am going to tweak each of them little by little from here. This should allow us to have all the enemies in the maze however for Alpha release... BTW, spiders are creepy as hell and tear you apart. :) Have fun. -Zach
Added a comment to fix the death sequence for the player. Found a bug where if no damage is being dealt the game won't reset.
Changed the way that the enemies are detecting the player. Now using a spherecollider to detect when the player is within a specific radius of the enemy. This is a lot more reliable than using the distances in unity. I also changed the game over screen to utilize a wait function correctly. Now the game will reset after 5 seconds every time. Lastly, I added in a spiderweapon so that I could change the amount of damage that they are doing. This still needs some tweaking to make sure that the player doesn't die in 2 seconds flat. Also I need to remind Ari that I took the rigid body off of the enemies, this is because there was some unspecified behavior that was occuring. This may be fixed if we make sure that the rigid bodies are kinematic and turn off gravity. This should get the designated behavior that we desire. -Zach
Equipping items is no longer done every frame that the inventory is open.
Merge remote-tracking branch 'origin/Victor_Sprint2' into Sprint2_InventoryStuff

Conflicts:
	Assets/Models/quad.prefab
	Assets/Models/wall_quad.prefab
	Assets/mainGame.unity
Added a GUI for crafting. Not fully finished, but right now I'm going to integrate it with Ari's backend code
More item framework. Created an item factory.
fix a thing with the dragging and dropping of scripts

the blockdestroyer script was not associated with the weapon pickaxe and
needed to be.
Merge remote-tracking branch 'origin/Victor_Sprint2' into Ari_Sprint2, shaweeeet

Conflicts:
	Assets/mainGame.unity
ari and victor's wonderful adventure in itemfactory land

Created and modified GUI's and hooks for crafting
Changed the distance formula that the enemies were using to make it so they attack at the appropriate distances. I also made it so the enemies stop moving when they are attacking again. Particularly for the skeleton. Couldn't get the projectile working for either the player or the enemy.... Not sure what's going on, but I can't get this to work. :P May need Ari's help. Looked into how to save the game and have a few things that I can use. Need to look into this more and then we should be good to go. -Zach
committing up to date meta files
Merge branch 'Ari_Sprint2'
premerge.
merged zach's branch with master