Tleety 971beb29d8 Merge remote-tracking branch 'origin/master' into DefenderShield ...

# Conflicts:
#	resources/Schema/Components.xsd

2016-02-08 12:30:41 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

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

2016-02-08 12:30:41 +01:00

Shaders

Defender shield should now be working

2016-02-08 11:47:35 +01:00

DefaultConfig.ini

Merge remote-tracking branch 'origin/PlayerMovement' into Networking

2016-01-22 16:19:35 +01:00

DefaultInput.ini

Put SpecialAbility on left shift, and Sprint on left shift in DefaultInput.

2016-02-05 17:34:19 +01:00