r5705 - in branches/nexuiz-2.0: . data data/qcsrc/menu/nexuiz data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Jan 31 08:54:28 EST 2009
Author: div0
Date: 2009-01-31 08:54:27 -0500 (Sat, 31 Jan 2009)
New Revision: 5705
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/changes-since-last-release
branches/nexuiz-2.0/data/defaultNexuiz.cfg
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
branches/nexuiz-2.0/data/qcsrc/server/cl_physics.qc
branches/nexuiz-2.0/data/qcsrc/server/defs.qh
branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
Log:
r5703 | div0 | 2009-01-31 14:46:11 +0100 (Sat, 31 Jan 2009) | 2 lines
bloodloss
r5704 | div0 | 2009-01-31 14:53:51 +0100 (Sat, 31 Jan 2009) | 2 lines
update change list
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-01-31 13:53:51 UTC (rev 5704)
+++ branches/nexuiz-2.0/.patchsets 2009-01-31 13:54:27 UTC (rev 5705)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-5701
+revisions_applied = 1-5704
Modified: branches/nexuiz-2.0/changes-since-last-release
===================================================================
--- branches/nexuiz-2.0/changes-since-last-release 2009-01-31 13:53:51 UTC (rev 5704)
+++ branches/nexuiz-2.0/changes-since-last-release 2009-01-31 13:54:27 UTC (rev 5705)
@@ -1,10 +1,12 @@
-CHANGES since 2.4.2 to r5313:
+CHANGES since 2.4.2 to r5703:
compat-q3a: switch crylink/hagar, as crylink is closer to BFG and hagar is closer to Plasmagun
game: airshot announcer
+game: all projectiles are clientside now, massive bandwidth reduction
game: alternate HUD is now default
game: antilag improved
game: assault bugfixed
game: bots try to not take items near team mates
+game: cl_gentle, clientside gib replacement for general audiences
game: cmd maplist improved
game: colors improved (TODO credit sev in nexuiz-credits.txt!)
game: command allready
@@ -22,12 +24,14 @@
game: ctf capture records now can only be made on an otherwise empty server, prevents "assisted" records
game: ctf flag touching when dead bug fixed
game: ctf scoring now uses flags, not frags
+game: custom weapon priorities for bots
game: cvar cl_weaponpriority* (custom weapon orders)
game: cvar cl_weaponpriority_useforcycling
game: cvar g_balance_ctf_damageforcescale
game: cvar g_balance_electro_combo_speed
game: cvar g_balance_teams_complain can now be turned off
game: cvar g_ballistics_force, makes MG and SG projectiles
+game: cvar g_bloodloss - a new pointless mutator ;)
game: cvar g_bugrigs*
game: cvar g_ctf_allow_drop
game: cvar g_ctf_fullbrightflags
@@ -39,6 +43,7 @@
game: cvar g_showweaponspawns
game: cvar g_spawn_furthest
game: cvar g_spawnpoints_auto_move_out_of_solid
+game: cvar g_spawnshield_time automatically disables itself when shooting
game: cvar g_start_delay
game: cvar g_touchexplode
game: cvar g_warmup
@@ -50,9 +55,10 @@
game: cvar sv_ready_restart_nag
game: cvar sv_ready_restart_repeatable
game: cvar teamplay_lockonrestart
-game: fix some memory leaks
game: fix flag falling through bunker
game: fix q3skoredm1
+game: fix some memory leaks
+game: free camera for demo playback
game: friendly fire slightly added now
game: handle sv_foginterval on the client now
game: hook attaches to moving objects
@@ -60,8 +66,9 @@
game: hook detaches when teleporting
game: hook is no longer "seta"
game: hook jitter-less
+game: hook sky-attach bug fixed
game: hook takes ammo
-game: hook sky-attach bug fixed
+game: improved bot ai: teamworking, items rating and weapon combos
game: improved weapon system, new weapons Port-O-Launch, MinstaNex, On-hand hook, TAG Seeker, HLAC; now up to 24 weapons supported
game: IP ban syncing support
game: item respawn: 20s for 50health and 25armor
@@ -83,8 +90,8 @@
game: sounds: model specific player sounds
game: strength and shield have better performance now
game: sv_foginterval
+game: teamkill and typekill complaints
game: team radar (sv_cmd bbox, sv_cmd radarmap commands to create/debug it!)
-game: teamkill and typekill complaints
game: texturecompression for lightmaps off (workaround for OS X bug)
game: timeout feature
game: turrets
@@ -93,6 +100,7 @@
game: zoom unlagged, detect zoom scripts (for spectating/demos)
map: aggressor supports keyhunt
map: all maps recompiled, now with external lightmaps
+mapping: added egyptsoc textures
mapping: allow mins/maxs specification for brush entities instead of models (as alternative)
mapping: automatic shader generator script
mapping: entities.def updated
@@ -105,8 +113,8 @@
mapping: entity info_null now removes itself (as it should); this DOES break some maps that need fixing now
mapping: entity info_player_start now triggers other entities when someone spawns
mapping: entity misc_follow
+mapping: entity misc_gamemodel, func_illusionary replacing misc_models
mapping: entity misc_laser changed and improved
-mapping: entity misc_gamemodel, func_illusionary replacing misc_models
mapping: entity target_spawn (BEWARE OF THE)
mapping: entity trigger_flipflop, trigger_monoflip, trigger_multivibrator
mapping: entity trigger_heal
@@ -124,6 +132,7 @@
map: some more TDM map settings
map: starship and silvercity: no CTF
menu: channel mixer
+menu: cvar list editor
menu: demo browser
menu: game type in server browser
menu: input box margin now in chars, not percent
@@ -135,18 +144,15 @@
menu: play button in map info
menu: server favorites
menu: server info
-menu: skin selector
-menu: weapon priority dialog
menuskins: big buttons as extra graphics
menuskins: COLOR_SCROLLBAR_C
+menu: skin selector
menuskins: HEIGHT_DIALOGBORDER
+menu: weapon priority dialog
menu: wicked skins
misc: +exec benchmark.cfg
misc: new color codes ^xRGB
+models: new flag model
models: specop now knows that she is female
-models: new flag model
rcon2irc: disconnect fix
rcon2irc: irc_trigger
-game: custom weapon priorities for bots
-game: improved bot ai: teamworking, items rating and weapon combos
-game: free camera for demo playback
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-01-31 13:53:51 UTC (rev 5704)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-01-31 13:54:27 UTC (rev 5705)
@@ -667,6 +667,8 @@
set g_balance_pause_health_rot_spawn 10
set g_balance_pause_health_regen_spawn 0
+set g_bloodloss 0 "amount of health below which blood loss occurs"
+
set g_footsteps 0 "serverside footstep sounds"
// effects
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c 2009-01-31 13:53:51 UTC (rev 5704)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c 2009-01-31 13:54:27 UTC (rev 5705)
@@ -86,6 +86,8 @@
s = strcat(s, ", Vampire");
if(cvar("g_weapon_stay"))
s = strcat(s, ", Weapons stay");
+ if(cvar("g_bloodloss") > 0)
+ s = strcat(s, ", Bloodloss");
if(s == "")
return "None";
else
@@ -177,6 +179,12 @@
me.TR(me);
me.TDempty(me, 0.2);
me.TD(me, 1, 1.8, s);
+ me.TR(me);
+ s = makeNexuizSlider(10, 50, 1, "g_bloodloss");
+ me.TD(me, 1, 2, e = makeNexuizSliderCheckBox(0, 1, s, "Blood loss"));
+ me.TR(me);
+ me.TDempty(me, 0.2);
+ me.TD(me, 1, 1.8, s);
me.gotoRC(me, 0, 2); me.setFirstColumn(me, me.currentColumn);
me.TD(me, 1, 4, makeNexuizTextLabel(0, "Weapon arenas:"));
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2009-01-31 13:53:51 UTC (rev 5704)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2009-01-31 13:54:27 UTC (rev 5705)
@@ -1,5 +1,6 @@
.float spectatee_status;
.float zoomstate;
+.float bloodloss_timer;
.entity clientdata;
float ClientData_Send(entity to, float sf)
@@ -2222,7 +2223,7 @@
self.oldorigin = self.origin;
- if (self.BUTTON_CROUCH && !self.hook.state)
+ if ((self.BUTTON_CROUCH && !self.hook.state) || self.health <= g_bloodloss)
{
if (!self.crouch)
{
@@ -2245,6 +2246,15 @@
}
}
}
+
+ if(self.health <= g_bloodloss && self.deadflag == DEAD_NO)
+ {
+ if(self.bloodloss_timer < time)
+ {
+ self.event_damage(self, self, 1, DEATH_ROT, self.origin, '0 0 0');
+ self.bloodloss_timer = time + 0.5 + random() * 0.5;
+ }
+ }
FixPlayermodel();
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_physics.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_physics.qc 2009-01-31 13:53:51 UTC (rev 5704)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_physics.qc 2009-01-31 13:54:27 UTC (rev 5705)
@@ -52,6 +52,9 @@
if(!sv_pogostick)
if (!(self.flags & FL_JUMPRELEASED))
return;
+
+ if(self.health <= g_bloodloss)
+ return;
if(g_runematch)
{
Modified: branches/nexuiz-2.0/data/qcsrc/server/defs.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/defs.qh 2009-01-31 13:53:51 UTC (rev 5704)
+++ branches/nexuiz-2.0/data/qcsrc/server/defs.qh 2009-01-31 13:54:27 UTC (rev 5705)
@@ -19,7 +19,7 @@
float ctf_score_value(string parameter);
float g_dm, g_domination, g_ctf, g_tdm, g_keyhunt, g_onslaught, g_assault, g_arena, g_lms, g_runematch, g_race;
-float g_cloaked, g_footsteps, g_jump_grunt, g_grappling_hook, g_laserguided_missile, g_midair, g_minstagib, g_nixnex, g_nixnex_with_laser, g_norecoil, g_vampire, g_minstagib_invis_alpha;
+float g_cloaked, g_footsteps, g_jump_grunt, g_grappling_hook, g_laserguided_missile, g_midair, g_minstagib, g_nixnex, g_nixnex_with_laser, g_norecoil, g_vampire, g_minstagib_invis_alpha, g_bloodloss;
float g_warmup_limit;
float g_warmup_allguns;
float g_warmup_allow_timeout;
Modified: branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc 2009-01-31 13:53:51 UTC (rev 5704)
+++ branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc 2009-01-31 13:54:27 UTC (rev 5705)
@@ -999,6 +999,7 @@
g_nixnex_with_laser = cvar("g_nixnex_with_laser");
g_norecoil = cvar("g_norecoil");
g_vampire = cvar("g_vampire");
+ g_bloodloss = cvar("g_bloodloss");
sv_maxidle = cvar("sv_maxidle");
sv_maxidle_spectatorsareidle = cvar("sv_maxidle_spectatorsareidle");
sv_pogostick = cvar("sv_pogostick");
More information about the nexuiz-commits
mailing list