Jace 95f9065037 Merge branch 'master' into Dirtybit ...

# Conflicts:
#	include/Engine/Sound/SoundManager.h

2016-03-13 01:07:17 +01:00

..

AssaultWeaponBehaviour.cpp

Merge branch 'master' into Dirtybit

2016-03-13 01:07:17 +01:00

AssaultWeaponBehaviour.cpp_

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

2016-03-02 15:59:16 +01:00

DefenderWeaponBehaviour.cpp

Merge branch 'master' into Dirtybit

2016-03-13 01:07:17 +01:00

SidearmWeaponBehaviour.cpp

Turned the Transform namespace into TransformSystem so it would be able to subscribe to EntityDeleted and clean up after itself

2016-03-13 00:57:00 +01:00

WeaponSystem.cpp_

WIP multi-weapon behaviours

2016-02-29 06:58:57 +01:00