Merge remote branch 'origin/fruitiex/crosshairs'

diff --combined defaultXonotic.cfg
index 3eb0c28df25d018e022d720bdf4a702fe6adb921,71b745860215300af7db84fbb8698e21e5bb7016..da7cf68a4eb71ea235d6ba87e90b06dfcc06cf9b
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -87,7 -87,15 +87,15 @@@ _cl_color 10
  _cl_name Player
  _cl_playermodel models/player/umbra.iqm
  _cl_playerskin 0
- crosshair 1
+ seta crosshair 3
+ seta crosshair_color_red 0.6
+ seta crosshair_color_green 0.8
+ seta crosshair_color_blue 1
+ seta crosshair_alpha 1
+ seta crosshair_size 0.35
+ seta crosshair_dot 1
+ seta crosshair_dot_alpha 1
+ seta crosshair_dot_size 1
  seta crosshair_per_weapon 0   "when 1, each gun will display a different crosshair"
  seta crosshair_color_override 0       "when 1, crosshair_color_* overrides the per-weapon color"
  seta crosshair_effect_speed -1 "how fast (in seconds) some crosshair effects should take place, 0 = instant, -1 = 2x weapon switch time"
@@@ -1391,8 -1399,8 +1399,8 @@@ seta scoreboard_accuracy_border_thickne
  seta scoreboard_accuracy_doublerows 0 "use two rows instead of one"
  seta scoreboard_accuracy 1 "0 = no weapon accuracy stats panel on scoreboard"
  seta scoreboard_color_bg_r 0 "red color component of the HUD background"
 -seta scoreboard_color_bg_g 0.25 "green color component of the HUD background"
 -seta scoreboard_color_bg_b 0.17 "blue color component of the HUD background"
 +seta scoreboard_color_bg_g 0.4 "green color component of the HUD background"
 +seta scoreboard_color_bg_b 0.6 "blue color component of the HUD background"
  seta scoreboard_color_bg_team 0.5 "team color multiplier of the HUD background"
  seta scoreboard_alpha_bg 0.6 "scoreboard background alpha"
  seta scoreboard_alpha_fg 1 "scoreboard foreground alpha"