r2576 - in branches/nexuiz-2.0/data: . qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu May 17 06:19:36 EDT 2007
Author: div0
Date: 2007-05-17 06:19:36 -0400 (Thu, 17 May 2007)
New Revision: 2576
Modified:
branches/nexuiz-2.0/data/default.cfg
branches/nexuiz-2.0/data/high.cfg
branches/nexuiz-2.0/data/low.cfg
branches/nexuiz-2.0/data/med.cfg
branches/nexuiz-2.0/data/normal.cfg
branches/nexuiz-2.0/data/omg.cfg
branches/nexuiz-2.0/data/qcsrc/server/bots.qc
branches/nexuiz-2.0/data/qcsrc/server/g_violence.qc
branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc
branches/nexuiz-2.0/data/ultimate.cfg
branches/nexuiz-2.0/data/ultra.cfg
Log:
cfg fixup; removed dprints; slime/lava sound only for players/dead corpses; keyhunt sound fix
Modified: branches/nexuiz-2.0/data/default.cfg
===================================================================
--- branches/nexuiz-2.0/data/default.cfg 2007-05-17 10:18:36 UTC (rev 2575)
+++ branches/nexuiz-2.0/data/default.cfg 2007-05-17 10:19:36 UTC (rev 2576)
@@ -440,11 +440,12 @@
cl_decals_time 2
seta cl_nogibs 0
cl_stainmaps 0
-seta r_glsl 1
-seta r_glsl_deluxemapping 1
-seta r_glsl_offsetmapping 0
-seta r_glsl_offsetmapping_reliefmapping 0
-seta r_glsl_offsetmapping_scale 0.02
+cl_particles_explosions_smokes 1
+r_glsl 1
+r_glsl_deluxemapping 1
+r_glsl_offsetmapping 0
+r_glsl_offsetmapping_reliefmapping 0
+r_glsl_offsetmapping_scale 0.02
// execute normal.cfg to make sure that all effect settings are reset
alias menu_sync "" // will be re-aliased later
exec normal.cfg
Modified: branches/nexuiz-2.0/data/high.cfg
===================================================================
--- branches/nexuiz-2.0/data/high.cfg 2007-05-17 10:18:36 UTC (rev 2575)
+++ branches/nexuiz-2.0/data/high.cfg 2007-05-17 10:19:36 UTC (rev 2576)
@@ -1,25 +1,13 @@
cl_decals 1
cl_nogibs 0
-cl_particles 1
-cl_particles_blood 1
-cl_particles_bubbles 1
-cl_particles_bulletimpacts 1
-cl_particles_explosions_shell 0
-cl_particles_explosions_smokes 1
-cl_particles_explosions_sparks 1
cl_particles_quality 1
-cl_particles_rain 1
-cl_particles_size 1
-cl_particles_smoke 1
cl_particles_snow 1
-cl_particles_sparks 1
gl_picmip 0
r_picmipworld 0
gl_texture_anisotropy 16
r_bloom 1
r_coronas 1
gl_flashblend 0
-r_dynamic 1
r_glsl_deluxemapping 1
r_glsl_offsetmapping 0
r_glsl_offsetmapping_reliefmapping 0
@@ -31,7 +19,6 @@
r_shadow_realtime_world 1
r_shadow_realtime_world_dlightshadows 1
r_shadow_realtime_world_shadows 1
-r_sky 1
r_depthfirst 1
r_showsurfaces 0
Modified: branches/nexuiz-2.0/data/low.cfg
===================================================================
--- branches/nexuiz-2.0/data/low.cfg 2007-05-17 10:18:36 UTC (rev 2575)
+++ branches/nexuiz-2.0/data/low.cfg 2007-05-17 10:19:36 UTC (rev 2576)
@@ -1,25 +1,13 @@
cl_decals 1
cl_nogibs 0
-cl_particles 1
-cl_particles_blood 1
-cl_particles_bubbles 1
-cl_particles_bulletimpacts 1
-cl_particles_explosions_shell 0
-cl_particles_explosions_smokes 1
-cl_particles_explosions_sparks 1
cl_particles_quality 0.20
-cl_particles_rain 1
-cl_particles_size 1
-cl_particles_smoke 1
-cl_particles_snow 1
-cl_particles_sparks 1
+cl_particles_snow 0
gl_picmip 2
r_picmipworld 1
gl_texture_anisotropy 1
r_bloom 0
r_coronas 1
gl_flashblend 0
-r_dynamic 1
r_glsl_deluxemapping 0
r_glsl_offsetmapping 0
r_glsl_offsetmapping_reliefmapping 0
@@ -31,7 +19,6 @@
r_shadow_realtime_world 0
r_shadow_realtime_world_dlightshadows 0
r_shadow_realtime_world_shadows 0
-r_sky 1
r_depthfirst 0
r_showsurfaces 0
Modified: branches/nexuiz-2.0/data/med.cfg
===================================================================
--- branches/nexuiz-2.0/data/med.cfg 2007-05-17 10:18:36 UTC (rev 2575)
+++ branches/nexuiz-2.0/data/med.cfg 2007-05-17 10:19:36 UTC (rev 2576)
@@ -1,25 +1,13 @@
cl_decals 1
cl_nogibs 0
-cl_particles 1
-cl_particles_blood 1
-cl_particles_bubbles 1
-cl_particles_bulletimpacts 1
-cl_particles_explosions_shell 0
-cl_particles_explosions_smokes 1
-cl_particles_explosions_sparks 1
cl_particles_quality 0.5
-cl_particles_rain 1
-cl_particles_size 1
-cl_particles_smoke 1
cl_particles_snow 1
-cl_particles_sparks 1
gl_picmip 2
r_picmipworld 0
gl_texture_anisotropy 1
r_bloom 0
r_coronas 1
gl_flashblend 0
-r_dynamic 1
r_glsl_deluxemapping 0
r_glsl_offsetmapping 0
r_glsl_offsetmapping_reliefmapping 0
@@ -31,7 +19,6 @@
r_shadow_realtime_world 0
r_shadow_realtime_world_dlightshadows 0
r_shadow_realtime_world_shadows 0
-r_sky 1
r_depthfirst 0
r_showsurfaces 0
Modified: branches/nexuiz-2.0/data/normal.cfg
===================================================================
--- branches/nexuiz-2.0/data/normal.cfg 2007-05-17 10:18:36 UTC (rev 2575)
+++ branches/nexuiz-2.0/data/normal.cfg 2007-05-17 10:19:36 UTC (rev 2576)
@@ -1,25 +1,13 @@
cl_decals 1
cl_nogibs 0
-cl_particles 1
-cl_particles_blood 1
-cl_particles_bubbles 1
-cl_particles_bulletimpacts 1
-cl_particles_explosions_shell 0
-cl_particles_explosions_smokes 1
-cl_particles_explosions_sparks 1
cl_particles_quality 0.5
-cl_particles_rain 1
-cl_particles_size 1
-cl_particles_smoke 1
cl_particles_snow 1
-cl_particles_sparks 1
gl_picmip 1
r_picmipworld 0
gl_texture_anisotropy 1
-r_bloom 1
+r_bloom 0
r_coronas 1
gl_flashblend 0
-r_dynamic 1
r_glsl_deluxemapping 1
r_glsl_offsetmapping 0
r_glsl_offsetmapping_reliefmapping 0
@@ -31,7 +19,6 @@
r_shadow_realtime_world 0
r_shadow_realtime_world_dlightshadows 0
r_shadow_realtime_world_shadows 0
-r_sky 1
r_depthfirst 1
r_showsurfaces 0
Modified: branches/nexuiz-2.0/data/omg.cfg
===================================================================
--- branches/nexuiz-2.0/data/omg.cfg 2007-05-17 10:18:36 UTC (rev 2575)
+++ branches/nexuiz-2.0/data/omg.cfg 2007-05-17 10:19:36 UTC (rev 2576)
@@ -1,25 +1,13 @@
cl_decals 1
cl_nogibs 0
-cl_particles 1
-cl_particles_blood 1
-cl_particles_bubbles 1
-cl_particles_bulletimpacts 1
-cl_particles_explosions_shell 0
-cl_particles_explosions_smokes 1
-cl_particles_explosions_sparks 1
cl_particles_quality 0.20
-cl_particles_rain 1
-cl_particles_size 1
-cl_particles_smoke 1
-cl_particles_snow 1
-cl_particles_sparks 1
+cl_particles_snow 0
gl_picmip 10
r_picmipworld 1
gl_texture_anisotropy 1
r_bloom 0
r_coronas 1
gl_flashblend 0
-r_dynamic 1
r_glsl_deluxemapping 0
r_glsl_offsetmapping 0
r_glsl_offsetmapping_reliefmapping 0
@@ -31,7 +19,6 @@
r_shadow_realtime_world 0
r_shadow_realtime_world_dlightshadows 0
r_shadow_realtime_world_shadows 0
-r_sky 1
r_depthfirst 0
r_showsurfaces 1
Modified: branches/nexuiz-2.0/data/qcsrc/server/bots.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/bots.qc 2007-05-17 10:18:36 UTC (rev 2575)
+++ branches/nexuiz-2.0/data/qcsrc/server/bots.qc 2007-05-17 10:19:36 UTC (rev 2576)
@@ -1906,10 +1906,6 @@
local entity best, head;
CheckAllowedTeams();
GetTeamCounts(world);
- dprint("c1 = ", ftos(c1), "\n");
- dprint("c2 = ", ftos(c2), "\n");
- dprint("c3 = ", ftos(c3), "\n");
- dprint("c4 = ", ftos(c4), "\n");
head = findchainfloat(isbot, TRUE);
if (!head)
return;
@@ -1942,7 +1938,6 @@
head = head.chain;
}
currentbots = currentbots - 1;
- dprint("Removing from a ", ftos(bestcount), " players team!\n");
dropclient(best);
};
Modified: branches/nexuiz-2.0/data/qcsrc/server/g_violence.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_violence.qc 2007-05-17 10:18:36 UTC (rev 2575)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_violence.qc 2007-05-17 10:19:36 UTC (rev 2576)
@@ -62,7 +62,7 @@
// don't set his classname to something else or it'll screw up a lot of stuff
if(gib.classname != "player")
gib.classname = "gib";
- gib.iscreature = TRUE;
+ gib.iscreature = FALSE; // not a creature, because lava sounds on gibs are annoying
gib.movetype = MOVETYPE_BOUNCE;
gib.solid = SOLID_CORPSE;
gib.skin = 0;
Modified: branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_world.qc 2007-05-17 10:18:36 UTC (rev 2575)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_world.qc 2007-05-17 10:19:36 UTC (rev 2576)
@@ -945,27 +945,29 @@
GameLogClose();
- maxTotalFrags = 0;
FOR_EACH_CLIENT(other)
{
+ FixIntermissionClient(other);
+
+ if(other.winning)
+ bprint(other.netname, " ^7wins.\n");
+ }
+
+ minTotalFrags = 0;
+ maxTotalFrags = 0;
+ FOR_EACH_PLAYER(other)
+ {
if(maxTotalFrags < other.totalfrags)
maxTotalFrags = other.totalfrags;
if(minTotalFrags > other.totalfrags)
minTotalFrags = other.totalfrags;
}
- FOR_EACH_CLIENT(other)
+ if(!currentbots)
{
- FixIntermissionClient(other);
-
- self = other;
-
- if(other.winning)
- bprint(other.netname, " ^7wins.\n");
-
- if(!currentbots)
+ FOR_EACH_PLAYER(other)
{
- score = (other.frags - minTotalFrags) / max(maxTotalFrags - minTotalFrags, 1);
+ score = (other.totalfrags - minTotalFrags) / max(maxTotalFrags - minTotalFrags, 1);
f = bound(0, other.play_time / max(time, 1), 1);
// store some statistics?
}
Modified: branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc 2007-05-17 10:18:36 UTC (rev 2575)
+++ branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc 2007-05-17 10:19:36 UTC (rev 2576)
@@ -363,7 +363,7 @@
void kh_Key_Collect(entity key, entity player)
{
- sound(key, CHAN_AUTO, kh_sound_collect, 1, ATTN_NORM);
+ sound(player, CHAN_AUTO, kh_sound_collect, 1, ATTN_NORM);
kh_Scores_Event(player, key, "collect", cvar("g_balance_keyhunt_score_collect"), 0);
bprint(player.netname, "^7 collected the ", key.netname, "\n");
@@ -488,7 +488,7 @@
else
centerprint(head, "All keys are in your team's hands!\n\nHelp the key carriers to meet!\n");
else
- centerprint(head, "All keys are in the enemy's hands!\n\nInterfere ^1NOW^7!\n");
+ centerprint(head, strcat("All keys are in the ", ColoredTeamName(kh_interferemsg_team), "^7's hands!\n\nInterfere ^1NOW^7!\n"));
}
}
Modified: branches/nexuiz-2.0/data/ultimate.cfg
===================================================================
--- branches/nexuiz-2.0/data/ultimate.cfg 2007-05-17 10:18:36 UTC (rev 2575)
+++ branches/nexuiz-2.0/data/ultimate.cfg 2007-05-17 10:19:36 UTC (rev 2576)
@@ -1,29 +1,17 @@
cl_decals 1
cl_nogibs 0
-cl_particles 1
-cl_particles_blood 1
-cl_particles_bubbles 1
-cl_particles_bulletimpacts 1
-cl_particles_explosions_shell 0
-cl_particles_explosions_smokes 1
-cl_particles_explosions_sparks 1
cl_particles_quality 1
-cl_particles_rain 1
-cl_particles_size 1
-cl_particles_smoke 1
cl_particles_snow 1
-cl_particles_sparks 1
gl_picmip 0
r_picmipworld 0
gl_texture_anisotropy 16
r_bloom 1
r_coronas 1
gl_flashblend 0
-r_dynamic 1
r_glsl_deluxemapping 1
r_glsl_offsetmapping 1
r_glsl_offsetmapping_reliefmapping 1
-r_hdr 0
+r_hdr 1
r_shadow_usenormalmap 1
r_shadow_gloss 1
r_shadow_realtime_dlight 1
@@ -31,7 +19,6 @@
r_shadow_realtime_world 1
r_shadow_realtime_world_dlightshadows 1
r_shadow_realtime_world_shadows 1
-r_sky 1
r_depthfirst 2
r_showsurfaces 0
Modified: branches/nexuiz-2.0/data/ultra.cfg
===================================================================
--- branches/nexuiz-2.0/data/ultra.cfg 2007-05-17 10:18:36 UTC (rev 2575)
+++ branches/nexuiz-2.0/data/ultra.cfg 2007-05-17 10:19:36 UTC (rev 2576)
@@ -1,25 +1,13 @@
cl_decals 1
cl_nogibs 0
-cl_particles 1
-cl_particles_blood 1
-cl_particles_bubbles 1
-cl_particles_bulletimpacts 1
-cl_particles_explosions_shell 0
-cl_particles_explosions_smokes 1
-cl_particles_explosions_sparks 1
cl_particles_quality 1
-cl_particles_rain 1
-cl_particles_size 1
-cl_particles_smoke 1
cl_particles_snow 1
-cl_particles_sparks 1
gl_picmip 0
r_picmipworld 0
gl_texture_anisotropy 16
r_bloom 1
r_coronas 1
gl_flashblend 0
-r_dynamic 1
r_glsl_deluxemapping 1
r_glsl_offsetmapping 1
r_glsl_offsetmapping_reliefmapping 0
@@ -31,7 +19,6 @@
r_shadow_realtime_world 1
r_shadow_realtime_world_dlightshadows 1
r_shadow_realtime_world_shadows 1
-r_sky 1
r_depthfirst 2
r_showsurfaces 0
More information about the nexuiz-commits
mailing list