Merge commit 'origin/master' into diabolik/ignisplayermodel

diff --git a/models/player/pyria.iqm_0.tga b/models/player/pyria.iqm_0.tga
index 96f53c8ff1d2468e94a51e586e3cac5fb97599d8..7b81093b853deac56976cf6f12c4ab8eb5723508 100644 (file)
Binary files a/models/player/pyria.iqm_0.tga and b/models/player/pyria.iqm_0.tga differ

diff --git a/models/player/umbra.iqm_0.tga b/models/player/umbra.iqm_0.tga
index f515b2feb6049b42e94ef2772e8aaa865bdadacb..726d3298190e184e23a2a65a5be13e86c12370fb 100644 (file)
Binary files a/models/player/umbra.iqm_0.tga and b/models/player/umbra.iqm_0.tga differ

diff --git a/models/weapons/h_crylink.iqm b/models/weapons/h_crylink.iqm
index d05151e5548164c9b114516e97574e9ec662412c..2aadd3991249c1cc867546c268d602f44fcdfac6 100644 (file)
Binary files a/models/weapons/h_crylink.iqm and b/models/weapons/h_crylink.iqm differ

diff --git a/models/weapons/h_fireball.iqm b/models/weapons/h_fireball.iqm
index 4bb062f1a21a6d71bf67497b3b82c9c9233fd132..9fb4af5015ccb6ba4528f9858dccd34f42fdb715 100644 (file)
Binary files a/models/weapons/h_fireball.iqm and b/models/weapons/h_fireball.iqm differ

diff --git a/models/weapons/h_hagar.iqm.md3 b/models/weapons/h_hagar.iqm.md3
deleted file mode 100644 (file)
index 012578b..0000000
Binary files a/models/weapons/h_hagar.iqm.md3 and /dev/null differ

diff --git a/models/weapons/h_hlac.iqm b/models/weapons/h_hlac.iqm
index 910214535866632862da4f1817fd1bea20194c0f..157a56bb7a1d7219bdbc62b555974b415e949500 100644 (file)
Binary files a/models/weapons/h_hlac.iqm and b/models/weapons/h_hlac.iqm differ

diff --git a/models/weapons/h_laser.iqm b/models/weapons/h_laser.iqm
index 6f9c657a12d1fa283303e9ab46a210c7a86a7ea9..0ca28e9800634d7706c3e5f8b82cbdddfcc658ba 100644 (file)
Binary files a/models/weapons/h_laser.iqm and b/models/weapons/h_laser.iqm differ

diff --git a/models/weapons/h_minstanex.iqm b/models/weapons/h_minstanex.iqm
index 66f6bc86c57ea84c4f65df31a033d26b4e55ab36..77d677529ec1d6fca17061bbfde16f4e03070667 100644 (file)
Binary files a/models/weapons/h_minstanex.iqm and b/models/weapons/h_minstanex.iqm differ

diff --git a/models/weapons/h_rl.iqm b/models/weapons/h_rl.iqm
index 6fe1117f8b43e26b92862753939a4454d9628677..d10b1db53923febe0107be768a654304a6c94bbc 100644 (file)
Binary files a/models/weapons/h_rl.iqm and b/models/weapons/h_rl.iqm differ

diff --git a/models/weapons/h_seeker.iqm b/models/weapons/h_seeker.iqm
index 4bb062f1a21a6d71bf67497b3b82c9c9233fd132..9fb4af5015ccb6ba4528f9858dccd34f42fdb715 100644 (file)
Binary files a/models/weapons/h_seeker.iqm and b/models/weapons/h_seeker.iqm differ

diff --git a/physicsNoQWBunny.cfg b/physicsNoQWBunny.cfg
index 88290d68c4c1feb0676d57b3544704473b9e7dc3..7806e4c24f78f7cba8c8151ad671dfa0a2565f5f 100644 (file)
--- a/physicsNoQWBunny.cfg
+++ b/physicsNoQWBunny.cfg
@@ -12,7 +12,7 @@ sv_jumpvelocity 300
 sv_wateraccelerate -1
 sv_waterfriction -1
 sv_airaccel_sideways_friction -0.125
-sv_airaccel_qw -0.95
+sv_airaccel_qw -0.965
 sv_airstopaccelerate 0
 sv_airstrafeaccelerate 0
 sv_maxairstrafespeed 0

diff --git a/qcsrc/server/bot/bot.qc b/qcsrc/server/bot/bot.qc
index b4285304570c574c1ba0a8160e3da29ef12f1930..44ece52bfd9c66cd2caf0d67af3ce2c4c0256d4e 100644 (file)
--- a/qcsrc/server/bot/bot.qc
+++ b/qcsrc/server/bot/bot.qc
@@ -200,6 +200,20 @@ void bot_setnameandstuff()
        else
                name = bot_name;
 
+       self.cleanname = strzone(name);
+
+       // number bots with identical names
+       float i;
+       i = 0;
+       FOR_EACH_CLIENT(p)
+       {
+               if(clienttype(p) == CLIENTTYPE_BOT)
+                       if(p.cleanname == name)
+                               ++i;
+       }
+       if (i)
+               name = strcat(name, "(", ftos(i), ")");
+
        // pick the model and skin
        if(substring(bot_model, -4, 1) != ".")
                bot_model = strcat(bot_model, ".iqm");
@@ -338,12 +352,15 @@ void bot_clientdisconnect()
 {
        if (clienttype(self) != CLIENTTYPE_BOT)
                return;
+       if(self.cleanname)
+               strunzone(self.cleanname);
        if(self.netname_freeme)
                strunzone(self.netname_freeme);
        if(self.playermodel_freeme)
                strunzone(self.playermodel_freeme);
        if(self.playerskin_freeme)
                strunzone(self.playerskin_freeme);
+       self.cleanname = string_null;
        self.netname_freeme = string_null;
        self.playermodel_freeme = string_null;
        self.playerskin_freeme = string_null;

diff --git a/qcsrc/server/bot/bot.qh b/qcsrc/server/bot/bot.qh
index 75619e19b786633e198a2063bac65bf0e34655ae..0550431e968bd8b31b49a7c7546a89faed272bd5 100644 (file)
--- a/qcsrc/server/bot/bot.qh
+++ b/qcsrc/server/bot/bot.qh
@@ -53,6 +53,7 @@ entity bot_list;
 entity player_list;
 .entity nextbot;
 .entity nextplayer;
+.string cleanname;
 .string netname_freeme;
 .string playermodel_freeme;
 .string playerskin_freeme;

diff --git a/qcsrc/server/extensions.qh b/qcsrc/server/extensions.qh
index ea6f0b068945772a13e3aecf340e2dc461fcd35d..18119546c63d1b82d5bd6a188961647d98f39968 100644 (file)
--- a/qcsrc/server/extensions.qh
+++ b/qcsrc/server/extensions.qh
@@ -572,12 +572,10 @@ float(float a) tan = #475; // returns tangent value (which is simply sin(a)/cos(
 // string autocvar__cl_name;
 //NOTE: copying a string-typed autocvar to another variable/field, and then
 //changing the cvar or returning from progs is UNDEFINED. Writing to autocvar
-//globals is UNDEFINED.  Accessing autocvar globals after cvar_set()ing that
+//globals is UNDEFINED. Accessing autocvar globals after cvar_set()ing that
 //cvar is IMPLEMENTATION DEFINED (an implementation may either yield the
-//previous, or the current, value). Whether autocvar globals, after restoring
-//a savegame, have the cvar's current value, or the original value at time of
-//saving, is UNDEFINED. Restoring a savegame however must not restore the
-//cvar values themselves.
+//previous, or the current, value). Writing to an autocvar global is NOT
+//ALLOWED.
 //In case the cvar does NOT exist, then it is automatically created with the
 //value of the autocvar initializer, if given. This is possible with e.g.
 //frikqcc and fteqcc the following way: