stiffly 1cdcbf9b32 Merge remote-tracking branch 'origin/master' into Sound ...

# Conflicts:
#	src/Game/Systems/PlayerSpawnSystem.cpp
#	src/Game/Systems/Weapon/AssaultWeaponBehaviour.cpp

2016-02-12 08:19:29 +01:00

..

AssaultWeaponBehaviour.h

Merge remote-tracking branch 'origin/master' into Sound

2016-02-12 08:19:29 +01:00

WeaponBehaviour.h

Working damage dealing, a super cool reload effect and hit markers!

2016-02-11 22:50:44 +01:00

WeaponSystem.h

Working damage dealing, a super cool reload effect and hit markers!

2016-02-11 22:50:44 +01:00