Jace fc7f57fd5d Merge remote-tracking branch 'origin/master' ...

Conflicts:
	resources/Schema/Entities/ScoreBoard_Main.xml

2016-03-13 22:27:17 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

Merge remote-tracking branch 'origin/master'

2016-03-13 22:27:17 +01:00

Shaders

Merge branch 'master' into Movement

2016-03-13 22:22:36 +01:00

DefaultConfig.ini

Merge branch 'master' into Movement

2016-03-13 22:22:36 +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