stiffly 17e2ebeaa7 Merge remote-tracking branch 'origin/master' into FriendlyHost/Join ...

# Conflicts:
#	include/Engine/Network/Client.h

2016-03-08 16:59:24 +01:00

..

Engine

Merge remote-tracking branch 'origin/master' into FriendlyHost/Join

2016-03-08 16:59:24 +01:00

Game

ShiftIcon should now track ability depending on what ability the player has and change icon accordingly.

2016-03-07 13:55:37 +01:00