[nexuiz-commits] r6453 - in branches/nexuiz-2.0: . data data/qcsrc/client data/qcsrc/server data/sound/announcer/male data/sound/cdtracks data/sound/misc data/sound/weapons server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Apr 7 03:40:32 EDT 2009
Author: div0
Date: 2009-04-07 03:40:30 -0400 (Tue, 07 Apr 2009)
New Revision: 6453
Added:
branches/nexuiz-2.0/data/sound/cdtracks/creation.ogg
branches/nexuiz-2.0/data/sound/misc/poweroff.wav
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/defaultHavoc.cfg
branches/nexuiz-2.0/data/defaultNexuiz.cfg
branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
branches/nexuiz-2.0/data/qcsrc/server/havocbot.qc
branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
branches/nexuiz-2.0/data/qcsrc/server/t_items.qc
branches/nexuiz-2.0/data/sound/announcer/male/03kills.ogg
branches/nexuiz-2.0/data/sound/announcer/male/05kills.ogg
branches/nexuiz-2.0/data/sound/announcer/male/10kills.ogg
branches/nexuiz-2.0/data/sound/announcer/male/15kills.ogg
branches/nexuiz-2.0/data/sound/announcer/male/20kills.ogg
branches/nexuiz-2.0/data/sound/announcer/male/25kills.ogg
branches/nexuiz-2.0/data/sound/announcer/male/30kills.ogg
branches/nexuiz-2.0/data/sound/announcer/male/airshot.ogg
branches/nexuiz-2.0/data/sound/announcer/male/botlike.ogg
branches/nexuiz-2.0/data/sound/announcer/male/electrobitch.ogg
branches/nexuiz-2.0/data/sound/announcer/male/headshot.ogg
branches/nexuiz-2.0/data/sound/announcer/male/impressive.ogg
branches/nexuiz-2.0/data/sound/announcer/male/welcome.ogg
branches/nexuiz-2.0/data/sound/announcer/male/yoda.ogg
branches/nexuiz-2.0/data/sound/cdtracks/thunder.ogg
branches/nexuiz-2.0/data/sound/misc/armor25.wav
branches/nexuiz-2.0/data/sound/weapons/brass1.ogg
branches/nexuiz-2.0/data/sound/weapons/brass2.ogg
branches/nexuiz-2.0/data/sound/weapons/brass3.ogg
branches/nexuiz-2.0/data/sound/weapons/campingrifle_fire.ogg
branches/nexuiz-2.0/data/sound/weapons/crylink_impact.ogg
branches/nexuiz-2.0/data/sound/weapons/electro_fly.ogg
branches/nexuiz-2.0/data/sound/weapons/hagexp2.ogg
branches/nexuiz-2.0/data/sound/weapons/hookbomb_impact.ogg
branches/nexuiz-2.0/data/sound/weapons/lasergun_fire.ogg
branches/nexuiz-2.0/data/sound/weapons/minstanexfire.ogg
branches/nexuiz-2.0/data/sound/weapons/ric1.ogg
branches/nexuiz-2.0/data/sound/weapons/ric2.ogg
branches/nexuiz-2.0/data/sound/weapons/ric3.ogg
branches/nexuiz-2.0/data/sound/weapons/rocket_fire.ogg
branches/nexuiz-2.0/data/sound/weapons/rocket_fly.ogg
branches/nexuiz-2.0/data/sound/weapons/rocket_impact.ogg
branches/nexuiz-2.0/data/sound/weapons/shotgun_fire.ogg
branches/nexuiz-2.0/data/sound/weapons/tag_rocket_fly.ogg
branches/nexuiz-2.0/data/sound/weapons/tink1.ogg
branches/nexuiz-2.0/data/sound/weapons/uzi_fire.ogg
branches/nexuiz-2.0/server/server.cfg
Log:
r6449 | esteel | 2009-04-06 16:25:05 +0200 (Mon, 06 Apr 2009) | 1 line
add $g_nexuizversion to the hostname(s)
r6450 | mand1nga | 2009-04-07 03:08:20 +0200 (Tue, 07 Apr 2009) | 1 line
Don't jump if g_midair is set (mid air mutator)
r6451 | div0 | 2009-04-07 08:38:47 +0200 (Tue, 07 Apr 2009) | 2 lines
Tenshihan v6.0
r6452 | div0 | 2009-04-07 09:08:19 +0200 (Tue, 07 Apr 2009) | 2 lines
better indicqation of strength running out
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-04-07 07:08:19 UTC (rev 6452)
+++ branches/nexuiz-2.0/.patchsets 2009-04-07 07:40:30 UTC (rev 6453)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6447
+revisions_applied = 1-6452
Modified: branches/nexuiz-2.0/data/defaultHavoc.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultHavoc.cfg 2009-04-07 07:08:19 UTC (rev 6452)
+++ branches/nexuiz-2.0/data/defaultHavoc.cfg 2009-04-07 07:40:30 UTC (rev 6453)
@@ -8,7 +8,7 @@
cl_bobmodel 0
v_kicktime 0
gl_polyblend 0
-hostname "Nexuiz Havoc Server"
+hostname "Nexuiz Havoc $g_nexuizversion Server"
set g_spawnshieldtime 0.3
set g_norecoil 1
set g_throughfloor 0
Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-04-07 07:08:19 UTC (rev 6452)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-04-07 07:40:30 UTC (rev 6453)
@@ -228,7 +228,7 @@
seta cl_voice_directional_taunt_attenuation 0.5
// server settings
-hostname "Nexuiz Server"
+hostname "Nexuiz $g_nexuizversion Server"
set sv_mapchange_delay 5
set minplayers 0
sv_cullentities_trace 1
Modified: branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/sbar.qc 2009-04-07 07:08:19 UTC (rev 6452)
+++ branches/nexuiz-2.0/data/qcsrc/client/sbar.qc 2009-04-07 07:40:30 UTC (rev 6453)
@@ -1436,9 +1436,11 @@
void CSQC_Strength_Timer() {
float stat_items, dt;
stat_items = getstati(STAT_ITEMS);
+ /*
if not(stat_items & IT_STRENGTH)
if not(stat_items & IT_INVINCIBLE)
return;
+ */
if (getstati(STAT_HEALTH) <= 0)
return;
@@ -1482,6 +1484,11 @@
}
Sbar_DrawXNum(number_position, ceil(dt), 2, countdown_fontsize, '1 1 1', 1, DRAWFLAG_NORMAL);
}
+ else if(dt > -1)
+ {
+ drawpic_expanding(pos, "gfx/sb_str", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,
+ bound(0, -dt / 0.5, 1));
+ }
}
//add some margin to the invincibility icon
@@ -1504,6 +1511,11 @@
}
Sbar_DrawXNum(number_position, ceil(dt), 2, countdown_fontsize, '1 1 1', 1, DRAWFLAG_NORMAL);
}
+ else if(dt > -1)
+ {
+ drawpic_expanding(pos, "gfx/sb_invinc", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,
+ bound(0, -dt / 0.5, 1));
+ }
}
}
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2009-04-07 07:08:19 UTC (rev 6452)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2009-04-07 07:40:30 UTC (rev 6453)
@@ -1538,6 +1538,14 @@
PutClientInServer();
}
+void play_countdown(float finished, string samp)
+{
+ if(clienttype(self) == CLIENTTYPE_REAL)
+ if(floor(finished - time - frametime) != floor(finished - time))
+ if(self.strength_finished - time < 6)
+ sound (self, CHAN_AUTO, samp, VOL_BASE, ATTN_NORM);
+}
+
/**
* When sv_timeout is used this function returs strings like
* "Timeout begins in 2 seconds!\n" or "Timeout ends in 23 seconds!\n".
@@ -1601,6 +1609,7 @@
{
if (self.items & IT_STRENGTH)
{
+ play_countdown(self.strength_finished, "misc/poweroff.wav");
if (time > self.strength_finished)
{
self.alpha = default_player_alpha;
@@ -1622,6 +1631,7 @@
if (self.items & IT_INVINCIBLE)
{
+ play_countdown(self.invincible_finished, "misc/poweroff.wav");
if (time > self.invincible_finished)
{
self.items = self.items - (self.items & IT_INVINCIBLE);
@@ -1641,6 +1651,7 @@
if (self.items & IT_STRENGTH)
{
+ play_countdown(self.strength_finished, "misc/poweroff.wav");
self.effects = self.effects | (EF_BLUE | EF_ADDITIVE | EF_FULLBRIGHT);
if (time > self.strength_finished)
{
@@ -1658,6 +1669,7 @@
}
if (self.items & IT_INVINCIBLE)
{
+ play_countdown(self.invincible_finished, "misc/poweroff.wav");
self.effects = self.effects | (EF_RED | EF_ADDITIVE | EF_FULLBRIGHT);
if (time > self.invincible_finished)
{
@@ -2241,7 +2253,8 @@
self.fixangle = TRUE;
}
- player_powerups();
+ if(frametime)
+ player_powerups();
if (self.deadflag != DEAD_NO)
{
Modified: branches/nexuiz-2.0/data/qcsrc/server/havocbot.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/havocbot.qc 2009-04-07 07:08:19 UTC (rev 6452)
+++ branches/nexuiz-2.0/data/qcsrc/server/havocbot.qc 2009-04-07 07:40:30 UTC (rev 6453)
@@ -147,6 +147,9 @@
local vector deviation;
local float maxspeed;
+ if(cvar("g_midair"))
+ return;
+
if(self.goalcurrent.classname == "player")
return;
@@ -381,7 +384,7 @@
self.BUTTON_HOOK = TRUE;
// If there is no goal try to move forward
-
+
if(self.goalcurrent==world)
dir = v_forward;
else
Modified: branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc 2009-04-07 07:08:19 UTC (rev 6452)
+++ branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc 2009-04-07 07:40:30 UTC (rev 6453)
@@ -1397,6 +1397,7 @@
precache_sound ("misc/spawn.wav");
precache_sound ("misc/talk.wav");
precache_sound ("misc/teleport.wav");
+ precache_sound ("misc/poweroff.wav");
precache_sound ("player/lava.wav");
precache_sound ("player/slime.wav");
Modified: branches/nexuiz-2.0/data/qcsrc/server/t_items.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/t_items.qc 2009-04-07 07:08:19 UTC (rev 6452)
+++ branches/nexuiz-2.0/data/qcsrc/server/t_items.qc 2009-04-07 07:40:30 UTC (rev 6453)
@@ -1189,7 +1189,7 @@
target_item_change(0, ammo_fuel, target_item_func_set, "misc/itempickup.wav", "");
target_item_change(0, health, target_item_func_set, "misc/megahealth.wav", "");
target_item_change(0, armorvalue, target_item_func_set, "misc/armor25.wav", "");
- target_item_change(1, items, target_item_func_itembitset, "misc/powerup.wav", "");
+ target_item_change(1, items, target_item_func_itembitset, "misc/powerup.wav", "misc/poweroff.wav");
target_item_change(1, weapons, target_item_func_bitset, "weapons/weaponpickup.wav", "");
if((self.items & activator.items) & IT_STRENGTH)
@@ -1206,7 +1206,7 @@
target_item_change(0, ammo_fuel, target_item_func_min, "misc/itempickup.wav", "");
target_item_change(0, health, target_item_func_min, "misc/megahealth.wav", "");
target_item_change(0, armorvalue, target_item_func_min, "misc/armor25.wav", "");
- target_item_change(1, items, target_item_func_itemand, "misc/powerup.wav", "");
+ target_item_change(1, items, target_item_func_itemand, "misc/powerup.wav", "misc/poweroff.wav");
target_item_change(1, weapons, target_item_func_and, "weapons/weaponpickup.wav", "");
if((self.items & activator.items) & IT_STRENGTH)
@@ -1223,7 +1223,7 @@
target_item_change(0, ammo_fuel, target_item_func_max, "misc/itempickup.wav", "");
target_item_change(0, health, target_item_func_max, "misc/megahealth.wav", "");
target_item_change(0, armorvalue, target_item_func_max, "misc/armor25.wav", "");
- target_item_change(1, items, target_item_func_or, "misc/powerup.wav", "");
+ target_item_change(1, items, target_item_func_or, "misc/powerup.wav", "misc/poweroff.wav");
target_item_change(1, weapons, target_item_func_or, "weapons/weaponpickup.wav", "");
if((self.items & activator.items) & IT_STRENGTH)
@@ -1240,7 +1240,7 @@
target_item_change(0, ammo_fuel, target_item_func_min, "misc/itempickup.wav", "");
target_item_change(0, health, target_item_func_min, "misc/megahealth.wav", "");
target_item_change(0, armorvalue, target_item_func_min, "misc/armor25.wav", "");
- target_item_change(1, items, target_item_func_andnot, "misc/powerup.wav", "");
+ target_item_change(1, items, target_item_func_andnot, "misc/powerup.wav", "misc/poweroff.wav");
target_item_change(1, weapons, target_item_func_andnot, "weapons/weaponpickup.wav", "");
if((self.items & activator.items) & IT_STRENGTH)
@@ -1288,6 +1288,7 @@
precache_sound("misc/megahealth.wav");
precache_sound("misc/armor25.wav");
precache_sound("misc/powerup.wav");
+ precache_sound("misc/poweroff.wav");
precache_sound("weapons/weaponpickup.wav");
n = tokenize_sane(self.netname);
Modified: branches/nexuiz-2.0/data/sound/announcer/male/03kills.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/announcer/male/05kills.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/announcer/male/10kills.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/announcer/male/15kills.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/announcer/male/20kills.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/announcer/male/25kills.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/announcer/male/30kills.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/announcer/male/airshot.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/announcer/male/botlike.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/announcer/male/electrobitch.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/announcer/male/headshot.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/announcer/male/impressive.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/announcer/male/welcome.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/announcer/male/yoda.ogg
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/sound/cdtracks/creation.ogg (from rev 6452, trunk/data/sound/cdtracks/creation.ogg)
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/cdtracks/thunder.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/misc/armor25.wav
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/sound/misc/poweroff.wav (from rev 6452, trunk/data/sound/misc/poweroff.wav)
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/brass1.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/brass2.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/brass3.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/campingrifle_fire.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/crylink_impact.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/electro_fly.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/hagexp2.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/hookbomb_impact.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/lasergun_fire.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/minstanexfire.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/ric1.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/ric2.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/ric3.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/rocket_fire.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/rocket_fly.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/rocket_impact.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/shotgun_fire.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/tag_rocket_fly.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/tink1.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/weapons/uzi_fire.ogg
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/server/server.cfg
===================================================================
--- branches/nexuiz-2.0/server/server.cfg 2009-04-07 07:08:19 UTC (rev 6452)
+++ branches/nexuiz-2.0/server/server.cfg 2009-04-07 07:40:30 UTC (rev 6453)
@@ -11,7 +11,7 @@
//sv_public 1 // 0 if the server should not be on the public servers list
//sv_status_privacy 1 // 1 hides IP addresses from "status" replies shown to clients, 0 shows them. Enables players to identify wellknown punks on your server OR is a thread to anonymity.. depending on your point of view :)
-//hostname "Nexuiz Server" // this name will appear on the server list
+//hostname "Nexuiz $g_nexuizversion Server" // this name will appear on the server list (the $g_nexuizversion gets replaced with the current version)
//sv_motd "" // this message (unless "") is displayed to players on connect
//maxplayers 8 // number of players allowed on the server
//port 26000 // the port used by the server
More information about the nexuiz-commits
mailing list