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

# Conflicts:
#	include/Game/Systems/Weapon/DefenderWeaponBehaviour.h

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

..

Licenses

Fixes for #34 (Licenses)

2016-01-15 17:20:11 +01:00

Schema

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

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

Shaders

Changed shield component to track Active, so it and sprint glow full if they are active.

2016-03-07 14:42:50 +01:00

DefaultConfig.ini

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

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

DefaultInput.ini

PickClass used for class-picking, SwapToClassPick to swap camera.

2016-03-03 16:59:17 +01:00