Tleety 0a21fe15dd Merge remote-tracking branch 'origin/master' into ScoreBoard ...

# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Entities/Player.xml
#	resources/Schema/Types/Entity.xsd

2016-03-03 22:56:39 +01:00

..

Licenses

Fixes for #34 (Licenses)

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

Schema

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

2016-03-03 22:56:39 +01:00

Shaders

Revert "Shadows"

2016-03-03 14:24:43 +01:00

DefaultConfig.ini

Added Gameplay.AutoReload bool to config

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

DefaultInput.ini

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

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