Jace 53dd96d44d Merge branch 'master' into UnpickableComponent ...

# Conflicts:
#	resources/Schema/Components.xsd
#	resources/Schema/Types/Entity.xsd

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

..

Engine

Merge branch 'master' into UnpickableComponent

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

Game

Fixed merge conflicts. Scoreboard updates team when a team is picked. Fixed some code standard violations and misspellings.

2016-03-13 14:23:56 +01:00