Merge remote-tracking branch 'origin/Jay' into NewBranch

Conflicts:
	Assets/Prefab/CirclePowerUpPrefab.prefab
	Assets/Prefab/Enemy.prefab
	Assets/Prefab/PowerUpManagerPrefab.prefab
	Assets/Scenes/GameScene.unity
	Assets/Scripts/BulletManager.cs
	Assets/Scripts/Enemy.cs
	Assets/Scripts/GameManager.cs
	Assets/Scripts/HeroManager.cs
	Assets/Scripts/PowerUpManager.cs
	Assets/Scripts/WeaponManager.cs
	Assets/Scripts/WeaponPickupManager.cs
	Assets/SpawnController/Example/Skeletons/Materials/skeletonBody.mat
	Assets/SpawnController/Example/Skeletons/Materials/skeletonHead.mat
	Assets/SpawnController/Example/Skeletons/Prefabs/Skeleton.prefab
	Assets/SpawnController/Plugins/Breed/Example/Prefabs/Ball.prefab
	Assets/SpawnController/Plugins/Breed/Example/Prefabs/Bouncy.physicmaterial
	Assets/SpawnController/Plugins/Breed/Example/Prefabs/Capsule.prefab
	Assets/SpawnController/Plugins/Breed/Example/Prefabs/Cube.prefab
	Assets/SpawnController/Prefabs/SpawnController.prefab
	Assets/SpawnController/Prefabs/Spawner.prefab
	Assets/SpawnController/Prefabs/SpawnerMaterial.mat
	Assets/Sprites/Hero/Legs/RunDown.anim
	Assets/Sprites/Hero/Legs/RunLeft.anim
	Assets/Sprites/Hero/Legs/RunRight.anim
	Assets/Sprites/Hero/Legs/RunUp.anim
	Assets/Sprites/Hero/Legs/legs_idle.png.meta
	Assets/Sprites/Hero/Legs/run_down_01.png.meta
	Assets/Sprites/Hero/Legs/run_down_03.png.meta
	Assets/Sprites/Hero/Legs/run_down_04.png.meta
	Assets/Sprites/Hero/Legs/run_down_05.png.meta
	Assets/Sprites/Hero/Legs/run_left_02.png.meta
	Assets/Sprites/Hero/Legs/run_left_03.png.meta
	Assets/Sprites/Hero/Legs/run_left_05.png.meta
	Assets/Sprites/Hero/Legs/run_left_06.png.meta
	Assets/Sprites/Hero/Legs/run_right_02.png.meta
	Assets/Sprites/Hero/Legs/run_right_03.png.meta
	Assets/Sprites/Hero/Legs/run_right_04.png.meta
	Assets/Sprites/Hero/Legs/run_right_05.png.meta
	Assets/Sprites/Hero/Legs/run_right_06.png.meta
	Assets/Sprites/Hero/Legs/run_up_01.png.meta
	Assets/Sprites/Hero/Legs/run_up_02.png.meta
	Assets/Sprites/Hero/Legs/run_up_03.png.meta
	Assets/Sprites/Hero/Legs/run_up_04.png.meta
	Assets/Sprites/Hero/Legs/run_up_05.png.meta
	Assets/Sprites/Hero/Legs/run_up_06.png.meta
	Assets/Sprites/Hero/Legs/torso_down.png.meta
	Assets/Sprites/Hero/Legs/torso_left.png.meta
	Assets/Sprites/Hero/Legs/torso_leftdown.png.meta
	Assets/Sprites/Hero/Legs/torso_leftup.png.meta
	Assets/Sprites/Hero/Legs/torso_right.png.meta
	Assets/Sprites/Hero/Legs/torso_rightdown.png.meta
	Assets/Sprites/Hero/Legs/torso_rightup.png.meta
	Assets/Sprites/Hero/Legs/torso_up.png.meta
	Assets/Sprites/WeaponCards/PU_MachineGun_01.png.meta
	Assets/Sprites/WeaponCards/PU_MachineGun_02.png.meta
	Assets/Sprites/WeaponCards/PU_MachineGun_03.png.meta
	Assets/Sprites/WeaponCards/PU_MachineGun_04.png.meta
	Assets/Sprites/WeaponCards/PU_MachineGun_05.png.meta
	Assets/Sprites/WeaponCards/PU_MachineGun_06.png.meta
	Assets/Sprites/WeaponCards/PU_MachineGun_07.png.meta
	Assets/Sprites/WeaponCards/PU_Rocket_01.png.meta
	Assets/Sprites/WeaponCards/PU_Rocket_02.png.meta
	Assets/Sprites/WeaponCards/PU_Rocket_03.png.meta
	Assets/Sprites/WeaponCards/PU_Rocket_04.png.meta
	Assets/Sprites/WeaponCards/PU_Rocket_05.png.meta
	Assets/Sprites/WeaponCards/PU_Rocket_06.png.meta
	Assets/Sprites/WeaponCards/PU_Rocket_07.png.meta
	Assets/Sprites/WeaponCards/PU_ShotGun_01.png.meta
	Assets/Sprites/WeaponCards/PU_ShotGun_02.png.meta
	Assets/Sprites/WeaponCards/PU_ShotGun_03.png.meta
	Assets/Sprites/WeaponCards/PU_ShotGun_04.png.meta
	Assets/Sprites/WeaponCards/PU_ShotGun_05.png.meta
	Assets/Sprites/WeaponCards/PU_ShotGun_06.png.meta
	Assets/Sprites/WeaponCards/PU_ShotGun_07.png.meta
	Assets/Sprites/WeaponCards/WeaponPickupController.controller
	ProjectSettings/TagManager.asset
Merge remote-tracking branch 'origin/Jay' into NewBranch

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Prefab/CirclePowerUpPrefab.prefab
	Assets/Prefab/Drone.prefab
	Assets/Scenes/TESTE.unity
	Assets/Scripts/BulletManager.cs
	Assets/Scripts/Enemy.cs
	Assets/Scripts/HeroManager.cs
	Assets/Scripts/WeaponPickupManager.cs
	ProjectSettings/TagManager.asset
	ld29-csharp.sln
	ld29.sln
	ld29.userprefs
Coisas invisiveis
Commit to refresh
Merge commit '7e6c968d7278063c801fdfc2b3bf51536b9a1e75' into Jay

# By Emanuel Maués da Costa Tavares (1) and Jay Santos (1)
# Via Emanuel Maués da Costa Tavares (3) and Jay Santos (1)
* commit '7e6c968d7278063c801fdfc2b3bf51536b9a1e75':
  Coisas invisiveis
  Tons of new stuff.