verysecrethero 456cd35a12 Merge remote-tracking branch 'origin/master' into AssaultBoost ...

# Conflicts:
#	resources/Schema/Components.xsd

2016-02-17 11:52:06 +01:00

..

Engine

Merge remote-tracking branch 'origin/FixNetworkToPlayTest'

2016-02-12 09:18:32 +01:00

Game

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

2016-02-17 11:52:06 +01:00

Tests

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

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