Jace 7cae84d4ee Merge remote-tracking branch 'origin/master' into WeaponSystem ...

# Conflicts:
#	include/Engine/Core/EPlayerDamage.h
#	src/Game/Game.cpp
#	src/Game/Systems/Weapon/WeaponSystem.cpp

2016-02-11 22:52:51 +01:00

..

Engine

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

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

Game

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

2016-02-11 22:52:51 +01:00