Merge branch 'master' into divVerent/csqcmodel

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index a44d14be06b7bcce447da82d501db33924107bed..cea643b1688f8f4022bc97ef461bf53a4d5674ee 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -292,13 +292,6 @@ gl_polyblend 0 // whether to use screen tints, this has now been replaced by a b
 r_motionblur 0 // motion blur value, default is 0
 r_damageblur 0 // motion blur when damaged, default is 0 (removed in Xonotic)
 
-r_bloom_blur 6
-r_bloom_brighten 1.5
-r_bloom_colorexponent 2
-r_bloom_colorscale 1.75
-r_bloom_colorsubtract 0.1
-r_bloom_resolution 320
-
 seta vid_x11_display ""        "xonotic-linux-*.sh will use this to start xonotic on an other/new X display"
 // This can have three possible settings:
 //     ""              run as usual
@@ -1064,6 +1057,7 @@ alias weapon_group_7 "impulse 7"
 alias weapon_group_8 "impulse 8"
 alias weapon_group_9 "impulse 9"
 alias weapon_group_0 "impulse 14" // cycles the superweapons
+exec weapons.cfg
 bind 0 weapon_group_0
 bind 1 weapon_group_1
 bind 2 weapon_group_2
@@ -1646,7 +1640,7 @@ set g_jump_grunt 0        "Do you make a grunting noise every time you jump? Is it the
 
 alias allready "sv_cmd allready"
 
-seta cl_weaponpriority "minstanex rocketlauncher nex grenadelauncher minelayer fireball hlac hagar seeker crylink rifle uzi electro tuba shotgun laser hook porto" "weapon priority list"
+seta cl_weaponpriority "minstanex nex fireball grenadelauncher uzi hagar rifle electro rocketlauncher crylink minelayer shotgun hlac tuba laser porto seeker hook" "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"

diff --git a/keybinds.txt b/keybinds.txt
index d7ec276f57f9d541057d42ebaccc63776a177069..5cba08f707132a1332cdd2ed01d3db89b229d49b 100644 (file)
--- a/keybinds.txt
+++ b/keybinds.txt
@@ -23,7 +23,7 @@
 "weapon_group_4"                        "Mortar / Mine Layer"
 "weapon_group_5"                        "Electro"
 "weapon_group_6"                        "Crylink / HLAC"
-"weapon_group_7"                        "Nex / MinstaNex / Rifle"
+"weapon_group_7"                        "Nex / Rifle"
 "weapon_group_8"                        "Hagar / Seeker"
 "weapon_group_9"                        "Rocket Launcher / Fireball"
 "weapon_group_0"                        "Port-O-Launch / Hook"

diff --git a/qcsrc/server/antilag.qc b/qcsrc/server/antilag.qc
index 0f6434eab68e3330c5807a4f46c664e8721cdf9f..3db0540fc83f424f08d16340f80a18c52f0c6bf8 100644 (file)
--- a/qcsrc/server/antilag.qc
+++ b/qcsrc/server/antilag.qc
@@ -111,3 +111,16 @@ void antilag_restore(entity e)
        setorigin(e, e.antilag_saved_origin);
        e.antilag_takenback = FALSE;
 }
+
+void antilag_clear(entity e)
+{
+       float i;
+
+       antilag_restore(e);
+       for(i = 0; i < ANTILAG_MAX_ORIGINS; ++i)
+       {
+               e.(antilag_times[i]) = -2342;
+               e.(antilag_origins[i]) = self.origin;
+       }
+       e.antilag_index = 0;
+}

diff --git a/qcsrc/server/antilag.qh b/qcsrc/server/antilag.qh
index 08e33e2e58c07c9ed8f18f703342826f0ddd7949..cadb45a14d981fa0d2e9b26449dff0474eb38099 100644 (file)
--- a/qcsrc/server/antilag.qh
+++ b/qcsrc/server/antilag.qh
@@ -3,6 +3,7 @@ vector antilag_takebackorigin(entity e, float t);
 vector antilag_takebackavgvelocity(entity e, float t0, float t1);
 void antilag_takeback(entity e, float t);
 void antilag_restore(entity e);
+void antilag_clear(entity e);
 
 #define ANTILAG_LATENCY(e) min(0.4, e.ping * 0.001)
 // add one ticrate?

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index c2baf5bcc26c557d66309affcc77c0a2f92c3204..171fcf35b27e28a021acb742494e311debd0e0c1 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -925,6 +925,8 @@ void PutClientInServer (void)
 
                if(!self.alivetime)
                        self.alivetime = time;
+
+               antilag_clear(self);
        } else if(self.classname == "observer" || (g_ca && !allowed_to_spawn)) {
                PutObserverInServer ();
        }

diff --git a/qcsrc/server/playerstats.qc b/qcsrc/server/playerstats.qc
index a3b8571737702e12f837040de5e6812491884067..2eeb5682a418b7ea2017326b57fb5e2c18cdb2af 100644 (file)
--- a/qcsrc/server/playerstats.qc
+++ b/qcsrc/server/playerstats.qc
@@ -169,10 +169,11 @@ void PlayerStats_TeamScore(float t, string event_id, float value) // TODO: doesn
        T: time at which the game ended
        G: game type
        M: map name
+       I: match ID (see "matchid" in g_world.qc
        S: "hostname" of the server
        C: number of "unpure" cvar changes
+       U: UDP port number of the server
        P: player ID of an existing player; this also sets the owner for all following "n", "e" and "t" lines (lower case!)
-       I: match ID (see "matchid" in g_world.qc
        n: nickname of the player (optional)
        t: team ID
        e: followed by an event name, a space, and the event count/score
@@ -213,6 +214,7 @@ void PlayerStats_ready(entity fh, entity pass, float status)
                        url_fputs(fh, sprintf("I %s\n", matchid));
                        url_fputs(fh, sprintf("S %s\n", cvar_string("hostname")));
                        url_fputs(fh, sprintf("C %d\n", cvar_purechanges_count));
+                       url_fputs(fh, sprintf("U %d\n", cvar("port")));
                        for(p = playerstats_last; (pn = db_get(playerstats_db, sprintf("%s:*", p))) != ""; p = pn)
                        {
                                url_fputs(fh, sprintf("P %s\n", p));

diff --git a/weapons.cfg b/weapons.cfg
new file mode 100644 (file)
index 0000000..80305a5
--- /dev/null
+++ b/weapons.cfg
@@ -0,0 +1,18 @@
+alias weapon_laser "impulse 230"
+alias weapon_shotgun "impulse 231"
+alias weapon_uzi "impulse 232"
+alias weapon_grenadelauncher "impulse 233"
+alias weapon_minelayer "impulse 234"
+alias weapon_electro "impulse 235"
+alias weapon_crylink "impulse 236"
+alias weapon_nex "impulse 237"
+alias weapon_hagar "impulse 238"
+alias weapon_rocketlauncher "impulse 239"
+alias weapon_porto "impulse 240"
+alias weapon_minstanex "impulse 241"
+alias weapon_hook "impulse 242"
+alias weapon_hlac "impulse 243"
+alias weapon_tuba "impulse 244"
+alias weapon_rifle "impulse 245"
+alias weapon_fireball "impulse 246"
+alias weapon_seeker "impulse 247"

diff --git a/weapons.cfg.sh b/weapons.cfg.sh
new file mode 100755 (executable)
index 0000000..f02d43c
--- /dev/null
+++ b/weapons.cfg.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+<qcsrc/server/w_all.qc perl -ne 'BEGIN{$i=230}/w_(.*?)\./ or+next;printf qq{alias weapon_%s "impulse %d"\n},$1,$i++;'