From: Mario Date: Mon, 8 Feb 2016 20:56:31 +0000 (+0000) Subject: Merge branch 'terencehill/csqc_cursor' into 'master' X-Git-Tag: xonotic-v0.8.2~1195 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=99dd6efe892a86f7b34451eb85b3dfb7fcbb0403;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'terencehill/csqc_cursor' into 'master' csqc cursor fix * Properly detect the path of the current menu skin in the client * Load csqc cursor attributes from the current menu skin file rather than using constant values (fixes incorrect cursor offset) See merge request !283 --- 99dd6efe892a86f7b34451eb85b3dfb7fcbb0403