setup for implementing new input system
add knockback parameter under addjoinhitbot function
Merge branch 'dev' into jonathan

Conflicts:
	Assets/Scenes/Levels/TestLevel.unity
add knocback state, add fury effect, add new projectile for amaterasu
add particle effect on coldshoulder
ALTERED EXISTING GUI TO BE MODULAR FUNCTIONS
Added Stamina bars and Portraits to Main GUI

filler portraits put in resources/portraits to work
- added stage particle effects
- added ama fury
- overhaul of attacks class hierarchy
- added buff application system
- added new level assets
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
- fixed cold shoulder particle effects and projectile damage
- push opponent back when blocking against a wall
- re-integrated knockdown
- adjusted heavy speed
Merge branch 'wolfeMan' into jonathan

# By Thomas Wolfe
# Via Thomas Wolfe
* wolfeMan:
  Added Stamina bars and Portraits to Main GUI
  ALTERED EXISTING GUI TO BE MODULAR FUNCTIONS
merged in ui elements