stiffly 20c6caa408 Merge remote-tracking branch 'origin/master' into Kill-streak-sounds ...

# Conflicts:
#	resources/DefaultConfig.ini

2016-03-03 17:32:04 +01:00

..

AssaultWeaponBehaviour.h

WIP multi-weapon behaviours

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

DefenderWeaponBehaviour.h

Sets velocity to 0, does not make use of doppler effect atm

2016-03-01 14:48:07 +01:00

WeaponBehaviour.h

WIP multi-weapon behaviours

2016-02-29 06:58:57 +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