From: Mario Date: Tue, 11 Aug 2015 16:30:30 +0000 (+0000) Subject: Merge branch 'terencehill/itemstime' into 'master' X-Git-Tag: xonotic-v0.8.1~12 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ab15353de5babf142bbdd57052652541f4e2db4d;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'terencehill/itemstime' into 'master' Items Time Features: * Panel that displays left time until important items respawn in the map: mega health, large armor, powerups (strenght, invincible, jetpack, fuel regenerator) and superweapons. * Waypoints for mega health and large armor, displayed just like the existing powerup waypoints, obviously visible only to spectators Panel and waypoints can be enabled when spectating (g_waypointsprite_itemstime 1, hud_panel_itemstime 1) or also when playing in warmup stage (g_waypointsprite_itemstime 2, hud_panel_itemstime 2). In order to prevent cheating, server can completely disable this feature by setting sv_itemstime to 0 (1 by default). See merge request !133 --- ab15353de5babf142bbdd57052652541f4e2db4d