Merge remote branch 'origin/fruitiex/fruitbalance'

Conflicts:
	qcsrc/client/View.qc

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/client/View.qc
index 9953af664b7b4db76233623bfa69a9c8d2aa166c,89681c32a6d2febb42a2e2490565eb7d63545489..2fbb07d4eb524692b5155e9fdc516ff2004122cd
--- 1/qcsrc/client/View.qc
--- 2/qcsrc/client/View.qc
+++ b/qcsrc/client/View.qc
@@@ -890,16 -882,7 +882,11 @@@ void CSQC_UpdateView(float w, float h
                                }
  
                                wcross_size = drawgetimagesize(wcross_name) * wcross_scale;
-                               if(bullets)
-                               {
-                                       CROSSHAIR_DO_BLUR(CROSSHAIR_DRAW_RING, wcross_resolution, wcross_name, wcross_alpha);
-                               }
- 
                                CROSSHAIR_DRAW(wcross_resolution, wcross_name, wcross_alpha * f);
 +
 +                              if(cvar("crosshair_dot"))
 +                                      CROSSHAIR_DRAW(wcross_resolution * cvar("crosshair_dot_size"), "gfx/crosshairdot.tga", wcross_alpha * f * cvar("crosshair_dot_alpha"));
 +
                                wcross_name_alpha_goal_prev = f;
                        }
                }