Teejoon f59a9e1d2b Merge remote-tracking branch 'origin/master' into MSAA ...

Conflicts:
	resources/Schema/Entities/CP_Rocky2.xml

2016-03-13 21:28:38 +01:00

..

Engine

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

2016-03-13 21:28:38 +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