Merge remote-tracking branch 'origin/Mario/hook_color'
authorRudolf Polzer <divverent@xonotic.org>
Thu, 8 May 2014 17:08:12 +0000 (19:08 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 8 May 2014 17:08:12 +0000 (19:08 +0200)
commit3fa123e5452bc5c746a7df6f7e4c44a6fb3c6d46
tree1c95dcc6af39db1ef94ee79ca6d8a28eaaf301ee
parentbcbd012b085ddd75110eb933df6ebf0d613963e9
parentdbb2bb34d4fe962a65e3019663947ac59902093a
Merge remote-tracking branch 'origin/Mario/hook_color'

* origin/Mario/hook_color:
  Player colored hooks, also show hook coming from player in 3rd person mode