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

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

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

..

AssaultWeaponBehaviour.h

First attempt at AssaultWeapon animations!

2016-03-04 02:48:03 +01:00

DefenderWeaponBehaviour.h

Merge remote-tracking branch 'origin/master' into Kill-streak-sounds

2016-03-08 10:39:52 +01:00

SidearmWeaponBehaviour.h

Working AssaultWeapon

2016-03-03 20:00:42 +01:00

WeaponBehaviour.h

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

2016-03-12 04:09:53 +01:00

WeaponSystem.h

Renamed EntityFile to EntityXMLFile to be able to separate file parsing from entity creation

2016-03-02 18:53:40 +01:00