Merge remote branch 'origin/master' into samual/updatecommands

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 6909037f675c67ce866d09e3cea1135c87fa4ade..82511d4e587f3abb3ad572a476674e5d6c71e882 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -259,13 +259,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

diff --git a/demos/little-bot-orchestra.dem b/demos/little-bot-orchestra.dem
new file mode 100644 (file)
index 0000000..81acdd1
Binary files /dev/null and b/demos/little-bot-orchestra.dem differ

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 1a6c9124b8d4f0df84772a80dfe64772a0800c63..3d393755a0f3749d33793dc7b6de1e574c1284c2 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1051,6 +1051,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));