Merge remote branch 'refs/remotes/origin/terencehill/newpanelhud'

diff --combined defaultXonotic.cfg
index cc423547bea86081c59fa65fb3a82f94a8f46b53,6c1cf698e5fbb5f29fd40e3446b430c6dbdbae31..1f909014e46690ba779902e115a94e3b978a824d
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -209,7 -209,7 +209,7 @@@ seta cl_zoomspeed 3.5      "how fast it wil
  seta cl_zoomsensitivity 0     "how zoom changes sensitivity (0 = weakest, 1 = strongest)"
  freelook 1
  sensitivity 6
 -v_gamma 1.125000
 +v_gamma 1
  viewsize 100
  bgmvolume 1
  volume 0.5
@@@ -1118,7 -1118,6 +1118,7 @@@ set quit_and_redirect ""        "set to an IP 
  
  // singleplayer campaign
  set g_campaign 0
 +set g_campaign_forceteam 0 "Forces the player to a given team in campaign mode, 1 = red, 2 = blue, 3 = yellow, 4 = pink"
  seta g_campaign_name "xonotic25"
  set g_campaign_skill 0
  set g_campaignxonotic20_index 0
@@@ -1370,7 -1369,7 +1370,7 @@@ seta hud_panel_radar_rotation 0 "rotati
  seta hud_panel_radar_zoommode 0       "zoom mode: 0 = zoomed by default, 1 = zoomed when +zoom, 2 = always zoomed, 3 = always zoomed out"
  alias hud_panel_radar_rotate "toggle hud_panel_radar_rotation 0 1 2 3 4"
  
- seta hud_panel_engineinfo_framecounter_time 1 "time between framerate display updates, smaller values yield less accuracy"
+ seta hud_panel_engineinfo_framecounter_time 0.1 "time between framerate display updates"
  seta hud_panel_engineinfo_framecounter_decimals 0 "amount of decimals to show"
  seta hud_panel_engineinfo_framecounter_exponentialmovingaverage 1 "use an averaging method for calculating fps instead of counting frametime like engine does"
  seta hud_panel_engineinfo_framecounter_exponentialmovingaverage_new_weight 0.1 "weight of latest data point"