# Added setters, getters to ClientPlayer # Added Attack Type Classes
Merge remote-tracking branch 'origin/dev_gameplay' into dev_gameplay