3 Commits

Author	SHA1	Message	Date
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
Jace	d1213f9f59	Working damage dealing, a super cool reload effect and hit markers!	2016-02-11 22:50:44 +01:00
Jace	e47201ff61	First person shoot animations	2016-02-11 17:06:34 +01:00