Merge remote branch 'origin/master' into divVerent/crypto2

diff --combined defaultXonotic.cfg
index 7312a34e4aed51515b0c52ef1c62b623f97a0a58,2296c1e56a81721a4203571cb39b530fe342d50e..49e65928478fabb3c41eaee1961258baafc60b0f
--- 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"
@@@ -119,6 -127,12 +127,12 @@@ seta crosshair_grenadelauncher_color_gr
  seta crosshair_grenadelauncher_color_blue 0   "crosshair color blue component to display when wielding the mortar"
  seta crosshair_grenadelauncher_color_alpha 1.15       "crosshair alpha value to display when wielding the mortar"
  seta crosshair_grenadelauncher_size 0.7       "crosshair size when wielding the mortar"
+ seta crosshair_minelayer ""   "crosshair to display when wielding the mortar"
+ seta crosshair_minelayer_color_red 0.75       "crosshair color red component to display when wielding the mortar"
+ seta crosshair_minelayer_color_green 0.75     "crosshair color green component to display when wielding the mortar"
+ seta crosshair_minelayer_color_blue 0 "crosshair color blue component to display when wielding the mortar"
+ seta crosshair_minelayer_color_alpha 1.15     "crosshair alpha value to display when wielding the mortar"
+ seta crosshair_minelayer_size 0.9     "crosshair size when wielding the mortar"
  seta crosshair_electro ""     "crosshair to display when wielding the electro"
  seta crosshair_electro_color_red 0.35 "crosshair color red component to display when wielding the electro"
  seta crosshair_electro_color_green 0.5        "crosshair color green component to display when wielding the electro"
@@@ -185,7 -199,6 +199,6 @@@ seta crosshair_campingrifle_color_gree
  seta crosshair_campingrifle_color_blue 0.25   "crosshair color blue component to display when wielding the campingrifle"
  seta crosshair_campingrifle_color_alpha 1     "crosshair alpha value to display when wielding the campingrifle"
  seta crosshair_campingrifle_size 0.65 "crosshair size when wielding the campingrifle"
- seta crosshair_campingrifle_ring_size 1.5     "bullet counter ring size around campingrifle crosshair, multiple of crosshair_campingrifle_size"
  seta crosshair_tuba ""        "crosshair to display when wielding the tuba"
  seta crosshair_tuba_color_red 0.85    "crosshair color red component to display when wielding the tuba"
  seta crosshair_tuba_color_green 0.5   "crosshair color green component to display when wielding the tuba"
@@@ -198,10 -211,9 +211,9 @@@ seta crosshair_fireball_color_green 1.
  seta crosshair_fireball_color_blue 0.2        "crosshair color blue component to display when wielding the fireball"
  seta crosshair_fireball_color_alpha 1 "crosshair alpha value to display when wielding the fireball"
  seta crosshair_fireball_size 1        "crosshair size when wielding the fireball"
- seta crosshair_nexvelocity_color_red 0.8
- seta crosshair_nexvelocity_color_green 0
- seta crosshair_nexvelocity_color_blue 0
- seta crosshair_nexvelocity_alpha 0.25
+ seta crosshair_ring_size 3    "bullet counter ring size for Rifle, velocity ring for Nex"
+ seta crosshair_campingrifle_bulletcounter_alpha 0.15
+ seta crosshair_nexvelocity_alpha 0.15
  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"
  seta cl_reticle_item_normal 1 "draw recticle when zooming with the zoom button, 0 disables and values between 0 and 1 change alpha"
@@@ -342,10 -354,10 +354,10 @@@ set sv_fragmessage_information_typefra
  set sv_friction_on_land 0
  exec physicsNoQWBunny-xpmbased.cfg
  
- set sv_player_viewoffset "0 0 35" "view offset of the player model"
+ set sv_player_viewoffset "0 0 42" "view offset of the player model"
  set sv_player_mins "-16 -16 -24" "playermodel mins"
  set sv_player_maxs "16 16 45" "playermodel maxs"
- set sv_player_crouch_viewoffset "0 0 15" "view offset of the player model when crouched"
+ set sv_player_crouch_viewoffset "0 0 20" "view offset of the player model when crouched"
  set sv_player_crouch_mins "-16 -16 -24" "mins of a crouched playermodel"
  set sv_player_crouch_maxs "16 16 25" "maxs of a crouched playermodel"
  
@@@ -430,9 -442,9 +442,9 @@@ set bot_ai_keyboard_treshold 0.5
  set bot_ai_aimskill_offset 0.3 "Amount of error induced to the bots aim"
  set bot_ai_aimskill_think 1 "Aiming velocity. Use values below 1 for slower aiming"
  set bot_ai_custom_weapon_priority_distances "300 850" "Define close and far distances in any order. Based on the distance to the enemy bots will choose different weapons"
- set bot_ai_custom_weapon_priority_far   "minstanex nex campingrifle rocketlauncher grenadelauncher electro hagar hlac crylink laser uzi fireball seeker shotgun tuba" "Desired weapons for far distances ordered by priority"
- set bot_ai_custom_weapon_priority_mid   "minstanex rocketlauncher nex fireball seeker grenadelauncher electro uzi campingrifle crylink hlac hagar shotgun laser tuba" "Desired weapons for middle distances ordered by priority"
- set bot_ai_custom_weapon_priority_close "minstanex nex uzi hlac tuba seeker hagar crylink grenadelauncher shotgun electro campingrifle rocketlauncher laser fireball" "Desired weapons for close distances ordered by priority"
+ set bot_ai_custom_weapon_priority_far   "minstanex nex campingrifle rocketlauncher minelayer grenadelauncher electro hagar hlac crylink laser uzi fireball seeker shotgun tuba"       "Desired weapons for far distances ordered by priority"
+ set bot_ai_custom_weapon_priority_mid   "minstanex rocketlauncher nex fireball seeker minelayer grenadelauncher electro uzi campingrifle crylink hlac hagar shotgun laser tuba"       "Desired weapons for middle distances ordered by priority"
+ set bot_ai_custom_weapon_priority_close "minstanex nex uzi hlac tuba seeker hagar crylink minelayer grenadelauncher shotgun electro campingrifle rocketlauncher laser fireball"       "Desired weapons for close distances ordered by priority"
  set bot_ai_weapon_combo 1     "Enable bots to do weapon combos"
  set bot_ai_weapon_combo_threshold 0.3 "Try to make a combo N seconds after the last attack"
  set bot_ai_friends_aware_pickup_radius "500"  "Bots will not pickup items if a team mate is this distance near the item"
@@@ -1054,13 -1066,13 +1066,13 @@@ set rcon_restricted_commands "restart f
  set sv_vote_call 1    "users can call a vote for the above commands"
  set sv_vote_master 1  "users can call a vote to become master"
  set sv_vote_master_password ""        "when set, users can use \"vlogin PASSWORD\" to log in as master"
- set sv_vote_change 0  "set to 1 to allow to change you vote/mind"
+ set sv_vote_change 1  "set to 1 to allow to change you vote/mind"
  set sv_vote_singlecount 0     "set to 1 to count votes once after timeout or to 0 to count with every vote"
- set sv_vote_timeout 60        "a vote will timeout after this many seconds"
+ set sv_vote_timeout 30        "a vote will timeout after this many seconds"
  set sv_vote_wait 120  "a player can not call a vote again for this many seconds when his vote was not accepted"
  set sv_vote_stop 15   "a player can not call a vote again for this many seconds when he stopped this vote (e.g. to correct it)"
  set sv_vote_majority_factor 0.5       "which quotient of the PLAYERS constitute a majority? (try: 0.667, 0.75 when using the above)"
- set sv_vote_simple_majority_factor 0  "which quotient of the VOTERS constitute a majority too? (0 = off, otherwise it must be higher than or equal to sv_vote_majority_factor)"
+ set sv_vote_simple_majority_factor 0.667      "which quotient of the VOTERS constitute a majority too? (0 = off, otherwise it must be higher than or equal to sv_vote_majority_factor)"
  // when disabled, don't allow game type changes "note: set these two equal to JUST support simple majorities"
  set sv_vote_override_mostrecent 0
  alias vhelp "cmd vote help"
@@@ -1262,7 -1274,6 +1274,7 @@@ set cl_gravity 800      "but ignored anyway
  set g_ban_default_bantime 5400        "90 minutes"
  set g_ban_default_masksize 3  "masksize 0 means banning by UID only, 1 means banning by /8 (IPv6: /32) network, 2 means banning by /16 (IPv6: /48) network, 3 means banning by /24 (IPv6: /56) network, 4 means banning by single IP (IPv6: /64 network)"
  set g_banned_list ""  "format: IP remainingtime IP remainingtime ..."
 +set g_banned_list_idmode "1"  "when set, the IP banning system always uses the ID over the IP address (so a user in a banned IP range can connect if they have a valid signed ID)"
  alias bans "sv_cmd bans"
  alias ban "sv_cmd ban $*"         // usage: ban address(maybe incomplete, like 1.2.3) bantime(seconds)
  alias kickban "sv_cmd kickban $*" // usage: kickban # playerno bantime(seconds) masksize(bytes)
@@@ -1323,7 -1334,9 +1335,9 @@@ seta menu_sounds 0 "enables menu sound 
  
  r_textbrightness 0.2
  r_textcontrast 0.8
- r_textshadow 1
+ r_textshadow 0
+ r_font_postprocess_blur 1
+ r_font_postprocess_outline 1
  
  // good settings for these fonts
  con_chat 5
@@@ -1392,8 -1405,8 +1406,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"
@@@ -1549,13 -1562,13 +1563,13 @@@ set g_jump_grunt 0   "Do you make a grunt
  
  alias allready "sv_cmd allready"
  
- seta cl_weaponpriority "minstanex rocketlauncher nex grenadelauncher fireball hlac hagar seeker crylink campingrifle uzi electro tuba shotgun laser hook porto" "weapon priority list"
+ seta cl_weaponpriority "minstanex rocketlauncher nex minelayer grenadelauncher fireball hlac hagar seeker crylink campingrifle uzi electro tuba shotgun laser hook porto" "weapon priority list"
  seta cl_weaponpriority_useforcycling 0 "when set, weapon cycling by the mouse wheel makes use of the weapon priority list (the special value 2 uses the weapon ID list for cycling)"
  seta cl_weaponpriority0 "rocketlauncher grenadelauncher hagar seeker fireball" "use impulse 200 for prev gun from this list, 210 for best gun, 220 for next gun.  Default value: explosives"
  seta cl_weaponpriority1 "minstanex nex crylink hlac electro laser"             "use impulse 201 for prev gun from this list, 211 for best gun, 221 for next gun.  Default value: energy"
  seta cl_weaponpriority2 "minstanex nex campingrifle"                           "use impulse 202 for prev gun from this list, 212 for best gun, 222 for next gun.  Default value: hitscan exact"
  seta cl_weaponpriority3 "minstanex nex campingrifle uzi shotgun"               "use impulse 203 for prev gun from this list, 213 for best gun, 223 for next gun.  Default value: hitscan all"
- seta cl_weaponpriority4 "grenadelauncher hlac hagar crylink seeker shotgun"    "use impulse 204 for prev gun from this list, 214 for best gun, 224 for next gun.  Default value: spam weapons"
+ seta cl_weaponpriority4 "minelayer grenadelauncher hlac hagar crylink seeker shotgun"    "use impulse 204 for prev gun from this list, 214 for best gun, 224 for next gun.  Default value: spam weapons"
  seta cl_weaponpriority5 "laser hook porto"                                     "use impulse 205 for prev gun from this list, 215 for best gun, 225 for next gun.  Default value: weapons for moving"
  seta cl_weaponpriority6 "" "use impulse 206 for prev gun from this list, 216 for best gun, 226 for next gun"
  seta cl_weaponpriority7 "" "use impulse 207 for prev gun from this list, 217 for best gun, 227 for next gun"
@@@ -1895,6 -1908,7 +1909,7 @@@ cl_decals_newsystem 
  set g_weaponreplace_laser ""
  set g_weaponreplace_shotgun ""
  set g_weaponreplace_uzi ""
+ set g_weaponreplace_minelayer ""
  set g_weaponreplace_grenadelauncher ""
  set g_weaponreplace_electro ""
  set g_weaponreplace_crylink ""
@@@ -1928,6 -1942,11 +1943,11 @@@ scr_conscroll3_y 
  scr_conscroll_x -0.1
  scr_conscroll_y -0.3
  
+ scr_loadingscreen_background 0
+ scr_loadingscreen_barcolor "0 0.5 1"
+ scr_loadingscreen_barheight 20
+ scr_loadingscreen_count 1
+ 
  // DP cannot properly detect this, so rather turn off the detection
  r_texture_dds_load_dxt1_noalpha 1
  

diff --combined qcsrc/client/Main.qc
index 8b053cfd38fd553477a140ade161e159aef20dff,79881410d8f9e0123472d6615d9df3652b604ea0..780609d5a9e507bc2ea8899ba4b0f2e9152ba0e1
--- 1/qcsrc/client/Main.qc
--- 2/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@@ -148,6 -148,23 +148,6 @@@ void CSQC_Init(void
        }
        Tuba_Precache();
  
 -#ifdef UID
 -      {
 -              // find the user ID
 -              string uid;
 -              registercvar("_cl_userid", "", CVAR_SAVE);
 -              uid = cvar_string("_cl_userid");
 -              if(strlen(uid) < 16)
 -              {
 -                      uid = "";
 -                      for(i = 0; i < 4; ++i)
 -                              uid = strcat(uid, substring(ftos(floor(10000 + random() * 10000)), 1, -1));
 -              }
 -              cvar_set("_cl_userid", uid);
 -              localcmd(strcat("\ncmd uid ", uid, "\n"));
 -      }
 -#endif
 -
        get_mi_min_max_texcoords(1); // try the CLEVER way first
        minimapname = strcat("gfx/", mi_shortname, "_radar.tga");
        shortmapname = mi_shortname;
@@@ -1335,8 -1352,16 +1335,16 @@@ float CSQC_Parse_TempEntity(
                        bHandled = true;
                        break;
                case TE_CSQC_NEX_VELOCITY:
+                       nex_velocitydependent = ReadByte();
                        nex_minvelocity = ReadShort();
                        nex_maxvelocity = ReadShort();
+                       nex_speed_falloff_rate = ReadByte();
+                       nex_charge = ReadByte();
+                       nex_charge_rate = ReadByte();
+                       bHandled = true;
+                       break;
+               case TE_CSQC_CR_MAXBULLETS:
+                       cr_maxbullets = ReadByte();
                        bHandled = true;
                        break;
                default:

diff --combined qcsrc/server/cl_client.qc
index bf542ab34f8a4f8dc012a369d0dcf41a684a9dd0,7dc5520abfe036f2065f1acd66b526c0e9734645..068912d6589f0f94df85fcb6f02d280a821aedbc
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -10,8 -10,19 +10,19 @@@ void send_CSQC_nexvelocity(entity e) 
        msg_entity = e;
        WriteByte(MSG_ONE, SVC_TEMPENTITY);
        WriteByte(MSG_ONE, TE_CSQC_NEX_VELOCITY);
+       WriteByte(MSG_ONE, bound(0, fabs(cvar("g_balance_nex_velocitydependent_halflife")), 1));
        WriteShort(MSG_ONE, cvar("g_balance_nex_velocitydependent_minspeed"));
        WriteShort(MSG_ONE, cvar("g_balance_nex_velocitydependent_maxspeed"));
+       WriteByte(MSG_ONE, cvar("g_balance_nex_velocitydependent_falloff_rate"));
+       WriteByte(MSG_ONE, cvar("g_balance_nex_secondary_charge"));
+       WriteByte(MSG_ONE, cvar("g_balance_nex_secondary_charge_rate"));
+ }
+ 
+ void send_CSQC_cr_maxbullets(entity e) {
+       msg_entity = e;
+       WriteByte(MSG_ONE, SVC_TEMPENTITY);
+       WriteByte(MSG_ONE, TE_CSQC_CR_MAXBULLETS);
+       WriteByte(MSG_ONE, cvar("g_balance_campingrifle_magazinecapacity"));
  }
  
  void Announce(string snd) {
@@@ -1396,6 -1407,10 +1407,6 @@@ Called when a client connects to the se
  string ColoredTeamName(float t);
  void DecodeLevelParms (void);
  //void dom_player_join_team(entity pl);
 -#ifdef UID
 -.float uid_kicktime;
 -.string uid;
 -#endif
  void ClientConnect (void)
  {
        float t;
@@@ -1573,6 -1588,12 +1584,6 @@@
        else
                self.hitplotfh = -1;
  
 -#ifdef UID
 -      if(clienttype(self) == CLIENTTYPE_REAL)
 -      if not(self.uid)
 -              self.uid_kicktime = time + 60;
 -#endif
 -
        if(g_race || g_cts) {
                string rr;
                if(g_cts)
@@@ -1597,6 -1618,7 +1608,7 @@@
                send_CSQC_teamnagger();
  
        send_CSQC_nexvelocity(self);
+       send_CSQC_cr_maxbullets(self);
  
        CheatInitClient();
  }
@@@ -2912,6 -2934,16 +2924,6 @@@ void PlayerPostThink (void
                self.stat_count -= 1;
        }
  
 -#ifdef UID
 -      if(self.uid_kicktime)
 -      if(time > self.uid_kicktime)
 -      {
 -              bprint("^3", self.netname, "^3 was kicked for missing UID.\n");
 -              dropclient(self);
 -              return;
 -      }
 -#endif
 -
        if(sv_maxidle && frametime)
        {
                // WORKAROUND: only use dropclient in server frames (frametime set). Never use it in cl_movement frames (frametime zero).