I think a simple solution would have just to make the servers decide whether it will allow players with controllers to have autoaim, or to have servers specify if it will allow only mouse/keyboard usage, only xbox360 controller usage, or allow both. No matter how hard they try, you can't balance the handicaps given to controllers users with autoaim and match them up with keyboard users and that really fux things up for tournaments since they can't verify whether a player has autoaim or not.
Bookmarks