Teejoon 77eaa45702 Merge remote-tracking branch 'origin/master' into HEAD ...

Conflicts:
	src/Engine/Rendering/CubeMapPass.cpp
	src/Engine/Rendering/DrawFinalPass.cpp

2016-03-01 12:11:27 +01:00

..

AssaultWeaponBehaviour.h

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

2016-03-01 12:11:27 +01:00

DefenderWeaponBehaviour.h

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

2016-03-01 12:11:27 +01:00

WeaponBehaviour.h

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

2016-03-01 12:11:27 +01:00

WeaponSystem.h

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

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