minor tweaks on some attacks
recommit
Merge remote-tracking branch 'origin/dev' into Seth
sped up block, adjusted heavy/amateratsu attacks
add knocback state, add fury effect, add new projectile for amaterasu
add particle effect on coldshoulder
Merge branch 'Hieu_1' into jonathan

# By hnguyen091188
# Via hnguyen091188
* Hieu_1:
  add particle effect on coldshoulder
  add knocback state, add fury effect, add new projectile for amaterasu

Conflicts:
	Assets/Resources/Fighters/Fighter_Amaterasu.prefab
	Assets/Scripts/Model/Attacks/Amaterasu/Amaterasu_Backdraft.cs
	Assets/Scripts/Model/Attacks/Amaterasu/Amaterasu_Fury.cs
	Assets/Scripts/Model/Attacks/Amaterasu/Amaterasu_LightFlash.cs
	Assets/Scripts/Model/Attacks/Amaterasu/Amaterasu_QuakeWithFear.cs
	Assets/Scripts/Model/Attacks/Heavy/Heavy_123Fire.cs
	Assets/Scripts/Model/Attacks/Heavy/Heavy_FireCarpet.cs
	Assets/Scripts/Model/Attacks/Heavy/Heavy_NapalmFlameThrower.cs
	Assets/Scripts/Model/FSM/Actions/Attack/Action_AttackExit.cs
	Assets/Scripts/Model/Fighters/A_Fighter.cs
	Assets/Scripts/Model/Hitboxes/A_HitBoxInstruction.cs
	Assets/Scripts/Model/Hitboxes/HitBox.cs
	Assets/Scripts/Model/Hitboxes/HitBoxInput.cs
fixed residual merge conflict issues
Merge branch 'Seth' into jonathan

# By sseng (2) and Sothearith Seng (1)
# Via Sothearith Seng (1) and sseng (1)
* Seth:
  sped up block, adjusted heavy/amateratsu attacks
  recommit
  minor tweaks on some attacks

Conflicts:
	Assets/Resources/Fighters/Fighter_Amaterasu.prefab
	Assets/Scripts/Model/Attacks/Amaterasu/Amaterasu_Backdraft.cs
	Assets/Scripts/Model/Attacks/Amaterasu/Amaterasu_LightFlash.cs
	Assets/Scripts/Model/Attacks/Heavy/Heavy_ColdShoulder.cs
	Assets/Scripts/Model/Attacks/Heavy/Heavy_MegatonPunch.cs
	Assets/Scripts/Model/FSM/Actions/Attack/Action_AttackEnter.cs
	Assets/Scripts/Model/FSM/Actions/Block/Action_BlockUpdate.cs
	Assets/Scripts/Model/Fighters/A_Fighter.cs
	Assets/Scripts/Model/Hitboxes/ProjectileInput.cs
post-seth merge fixes