William Moberg 4f99f6ef74 Merge branch 'master' into RestartMap ...

# Conflicts:
#	src/Game/Systems/CapturePointSystem.cpp

2016-03-13 13:37:51 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

Merge branch 'master' into RestartMap

2016-03-13 13:37:51 +01:00

Shaders

Merge pull request #173 from teamfisk/ExplosionEffectV2

2016-03-12 15:25:12 +01:00

DefaultConfig.ini

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

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

DefaultInput.ini

Mouse always unlocked on game start and on disconnecting (i.e when menu shows).

2016-03-10 12:46:06 +01:00