Merge remote branch 'origin/fruitiex/fbfix'

diff --combined defaultXonotic.cfg
index d7e3f2a957d77604a4ca304ebc69521307957b57,fd3bd114fc2377c20629f50f32269e4240012137..0c96872bdd4382084d4cea46c71546620e99de60
--- 1/defaultXonotic.cfg
--- 2/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@@ -178,19 -178,16 +178,19 @@@ seta crosshair_fireball ""      "crosshair t
  seta crosshair_fireball_color "0.2 1.0 0.2"   "crosshair color to display when wielding the fireball"
  seta crosshair_fireball_alpha 1       "crosshair alpha value to display when wielding the fireball"
  seta crosshair_fireball_size 1        "crosshair size when wielding the fireball"
 +
 +// ring around crosshair, used for various purposes (such as indicating bullets left in clip, nex charge)
  seta crosshair_ring_size 2    "bullet counter ring size for Rifle, velocity ring for Nex"
 -seta crosshair_campingrifle_bulletcounter_alpha 0.15
  
 -seta crosshair_nexvelocity_alpha 0.15
 -seta crosshair_nexvelocity_currentcharge_scale 30
 -seta crosshair_nexvelocity_currentcharge_alpha 0.15
 -seta crosshair_nexvelocity_currentcharge_color_red 0.8
 -seta crosshair_nexvelocity_currentcharge_color_green 0
 -seta crosshair_nexvelocity_currentcharge_color_blue 0
 -seta crosshair_nexvelocity_currentcharge_movingavg_rate 0.05
 +seta crosshair_ring_campingrifle_alpha 0.15
 +
 +seta crosshair_ring_nex_outer_alpha 0.15
 +seta crosshair_ring_nex_inner_alpha 0.15
 +seta crosshair_ring_nex_inner_color_red 0.8
 +seta crosshair_ring_nex_inner_color_green 0
 +seta crosshair_ring_nex_inner_color_blue 0
 +seta crosshair_ring_nex_currentcharge_scale 30
 +seta crosshair_ring_nex_currentcharge_movingavg_rate 0.05
  
  seta cl_reticle_stretch 0 "whether to stretch reticles so they fit the screen (brakes image proportions)"
  seta cl_reticle_item_nex 1 "draw aiming recticle for the nex weapon's zoom, 0 disables and values between 0 and 1 change alpha"
@@@ -487,7 -484,8 +487,7 @@@ set g_minstagib_extralives 2       "how many 
  set g_minstagib_ammo_start 10 "starting ammo"
  set g_minstagib_ammo_drop 5   "how much ammo you'll get for weapons or cells"
  set g_minstagib_invis_alpha 0.15
 -set g_minstagib_speed_jumpheight 1.8 "jump height multiplier that applies while you carry the invincibility powerup"
 -set g_minstagib_speed_moverate 1.25 "speed-multiplier that applies while you carry the invincibility powerup"
 +set g_minstagib_speed_highspeed 1.5 "speed-multiplier that applies while you carry the invincibility powerup"
  set g_vampire 0 "set to 1 to enable the vampire mode, where the damage done to your opponent gets added to your own health"
  set g_weaponarena "0" "put in a list of weapons to enable a weapon arena mode, or try \"all\" or \"most\""
  set g_weaponarena_random "0"  "if set to a number, only that weapon count is given on every spawn (randomly)"
@@@ -713,9 -711,12 +713,9 @@@ set g_balance_rune_regen_combo_limitmo
  set g_balance_rune_speed_atkrate                              0.66
  set g_balance_curse_slow_atkrate                              1.5
  set g_balance_rune_speed_combo_atkrate                        1.2
 -set g_balance_rune_speed_moverate                     1.25
 -set g_balance_curse_slow_moverate                     0.8
 -set g_balance_rune_speed_combo_moverate                       0.9
 -set g_balance_rune_speed_jumpheight                   1.4
 -set g_balance_curse_slow_jumpheight                   1.0
 -set g_balance_rune_speed_combo_jumpheight             1.0
 +set g_balance_rune_speed_highspeed                    1.5
 +set g_balance_curse_slow_highspeed                    0.6
 +set g_balance_rune_speed_combo_highspeed                      0.9
  
  // domination
  set g_domination                      0 "Domination: capture and hold control points to gain points"
@@@ -811,7 -812,7 +811,7 @@@ set g_nexball_basketball_delay_hol
  set g_nexball_basketball_delay_hold_forteam   60    "time before a ball reset when a team holds the ball for too long"
  set g_nexball_basketball_teamsteal             1    "1 to allow players to steal from teammates, 0 to disallow"
  
 -set g_nexball_basketball_carrier_speed         0.9  "speed multiplier for the ballcarrier"
 +set g_nexball_basketball_carrier_highspeed         0.8  "speed multiplier for the ballcarrier"
  
  set g_nexball_meter_period                  1    "time to make a full cycle on the power meter"
  set g_nexball_basketball_meter              1    "use the power meter for basketball"
@@@ -1125,10 -1126,10 +1125,10 @@@ alias cl_fbskin_green "playermodel mode
  alias cl_fbskin_red "playermodel models/player/erebus.iqm; playerskin 1; color 4 4"
  alias cl_fbskin_orange "playermodel models/player/erebus.iqm; playerskin 1; color 14 14"
  alias cl_fbskin_off "playermodel models/player/erebus.iqm; playerskin 0"
- alias sv_fbskin_green "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 51"
- alias sv_fbskin_red "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 68"
- alias sv_fbskin_orange "g_fullbrightplayers 1; sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 238"
- alias sv_fbskin_off "g_fullbrightplayers 0; sv_defaultcharacter 0; sv_defaultplayerskin 0; sv_defaultplayercolors \"\""
+ alias sv_fbskin_green "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 51"
+ alias sv_fbskin_red "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 68"
+ alias sv_fbskin_orange "sv_defaultcharacter 1; sv_defaultplayermodel models/player/erebus.iqm; sv_defaultplayerskin 1; sv_defaultplayercolors 238"
+ alias sv_fbskin_off "sv_defaultcharacter 0; sv_defaultplayerskin 0; sv_defaultplayercolors \"\""
  
  seta sv_servermodelsonly 1
  

diff --combined qcsrc/server/g_world.qc
index b2029ae70aabc8cbdfd4c5ad9b014cd493f51672,f6707b54dd6dde9a87137be9136efaedfde3a637..2ea47d81afdf483edad25bab787d7b5c5961fecd
--- 1/qcsrc/server/g_world.qc
--- 2/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@@ -426,9 -426,6 +426,6 @@@ void cvar_changes_init(
                BADCVAR("sv_adminnick");
                BADCVAR("sv_autoscreenshot");
                BADCVAR("sv_curl_defaulturl");
-               BADCVAR("sv_defaultcharacter");
-               BADCVAR("sv_defaultplayermodel");
-               BADCVAR("sv_defaultplayerskin");
                BADCVAR("sv_maxidle");
                BADCVAR("sv_maxrate");
                BADCVAR("sv_motd");
@@@ -808,7 -805,6 +805,7 @@@ void spawnfunc_worldspawn (void
        addstat(STAT_LAST_PICKUP, AS_FLOAT, last_pickup);
  
        addstat(STAT_NEX_CHARGE, AS_FLOAT, nex_charge);
 +      addstat(STAT_NEX_CHARGEPOOL, AS_FLOAT, nex_charge_pool_ammo);
  
        if(g_ca)
        {
@@@ -817,7 -813,6 +814,7 @@@
        }
        // g_movementspeed hack
        addstat(STAT_MOVEVARS_AIRSPEEDLIMIT_NONQW, AS_FLOAT, stat_sv_airspeedlimit_nonqw);
 +      addstat(STAT_MOVEVARS_MAXSPEED, AS_FLOAT, stat_sv_maxspeed);
        addstat(STAT_MOVEVARS_AIRACCEL_QW, AS_FLOAT, stat_sv_airaccel_qw);
        addstat(STAT_MOVEVARS_AIRSTRAFEACCEL_QW, AS_FLOAT, stat_sv_airstrafeaccel_qw);