[nexuiz-commits] r6262 - in branches/nexuiz-2.0: . data data/qcsrc/client data/qcsrc/server data/qcsrc/server/tturrets/system data/qcsrc/server/tturrets/units data/textures
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Mar 24 04:32:05 EDT 2009
Author: div0
Date: 2009-03-24 04:31:50 -0400 (Tue, 24 Mar 2009)
New Revision: 6262
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/config_update.cfg
branches/nexuiz-2.0/data/qcsrc/client/gibs.qc
branches/nexuiz-2.0/data/qcsrc/client/movetypes.qc
branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc
branches/nexuiz-2.0/data/qcsrc/server/tturrets/system/system_aimprocs.qc
branches/nexuiz-2.0/data/qcsrc/server/tturrets/system/system_main.qc
branches/nexuiz-2.0/data/qcsrc/server/tturrets/system/system_misc.qc
branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_plasma.qc
branches/nexuiz-2.0/data/quake.rc
branches/nexuiz-2.0/data/textures/campingrifle.tga
branches/nexuiz-2.0/data/textures/campingrifle_bump.tga
branches/nexuiz-2.0/data/textures/campingrifle_gloss.tga
branches/nexuiz-2.0/data/textures/electro.tga
branches/nexuiz-2.0/data/textures/electro_gloss.tga
branches/nexuiz-2.0/data/textures/electro_glow.tga
branches/nexuiz-2.0/data/textures/electro_norm.tga
branches/nexuiz-2.0/data/textures/electro_pants.tga
branches/nexuiz-2.0/data/textures/flamethrower.tga
branches/nexuiz-2.0/data/textures/flamethrower_gloss.tga
branches/nexuiz-2.0/data/textures/flamethrower_norm.tga
branches/nexuiz-2.0/data/textures/flamethrower_pants.tga
branches/nexuiz-2.0/data/textures/flamethrower_shirt.tga
branches/nexuiz-2.0/data/textures/glauncher.tga
branches/nexuiz-2.0/data/textures/glauncher_gloss.tga
branches/nexuiz-2.0/data/textures/glauncher_norm.tga
branches/nexuiz-2.0/data/textures/glauncher_pants.tga
branches/nexuiz-2.0/data/textures/glauncher_shirt.tga
branches/nexuiz-2.0/data/textures/hagar2.tga
branches/nexuiz-2.0/data/textures/hagar2_gloss.tga
branches/nexuiz-2.0/data/textures/hagar2_glow.tga
branches/nexuiz-2.0/data/textures/hagar2_norm.tga
branches/nexuiz-2.0/data/textures/hagar2_pants.tga
branches/nexuiz-2.0/data/textures/hagar2_shirt.tga
branches/nexuiz-2.0/data/textures/hlac.tga
branches/nexuiz-2.0/data/textures/hlac_body.tga
branches/nexuiz-2.0/data/textures/hlac_body_gloss.tga
branches/nexuiz-2.0/data/textures/hlac_body_norm.tga
branches/nexuiz-2.0/data/textures/hlac_body_pants.tga
branches/nexuiz-2.0/data/textures/hlac_body_shirt.tga
branches/nexuiz-2.0/data/textures/hookgun.tga
branches/nexuiz-2.0/data/textures/hookgun_gloss.tga
branches/nexuiz-2.0/data/textures/hookgun_norm.tga
branches/nexuiz-2.0/data/textures/hookgun_pants.tga
branches/nexuiz-2.0/data/textures/rl_norm.tga
branches/nexuiz-2.0/data/textures/seeker_norm.tga
branches/nexuiz-2.0/data/textures/shotgun2.tga
branches/nexuiz-2.0/data/textures/shotgun2_gloss.tga
branches/nexuiz-2.0/data/textures/shotgun2_glow.tga
branches/nexuiz-2.0/data/textures/shotgun2_norm.tga
branches/nexuiz-2.0/data/textures/shotgun2_shirt.tga
Log:
r6254 | div0 | 2009-03-23 19:11:42 +0100 (Mon, 23 Mar 2009) | 2 lines
add some cleartemps calls
r6255 | div0 | 2009-03-23 19:34:38 +0100 (Mon, 23 Mar 2009) | 2 lines
gibs: handle wasfreed
r6257 | m0rfar | 2009-03-23 20:08:58 +0100 (Mon, 23 Mar 2009) | 3 lines
Downsized weaponskins to 512x512. Does look about the same to me.
Maybe we can disable TC now?
This commit can be reverted if there are any good arguments for having huge skins :)
r6258 | tzork | 2009-03-23 21:52:12 +0100 (Mon, 23 Mar 2009) | 1 line
fix turret NaN crash due to runaway angles.
r6259 | tzork | 2009-03-23 22:51:26 +0100 (Mon, 23 Mar 2009) | 3 lines
Fix dual plasma (now uses both barrels)
Sane aim and target select flags.
Put spread back.
r6256 | m0rfar | 2009-03-23 19:51:23 +0100 (Mon, 23 Mar 2009) | 1 line
r_shadow_realtime_dlight depends on r_dynamic
r6260 | div0 | 2009-03-24 09:13:07 +0100 (Tue, 24 Mar 2009) | 2 lines
force r_dynamic 1
r6261 | div0 | 2009-03-24 09:13:36 +0100 (Tue, 24 Mar 2009) | 2 lines
undo the r_dynamic check there, as it's now forced to 1 anyway
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-03-24 08:13:36 UTC (rev 6261)
+++ branches/nexuiz-2.0/.patchsets 2009-03-24 08:31:50 UTC (rev 6262)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6039,6044-6252
+revisions_applied = 1-6039,6044-6261
Modified: branches/nexuiz-2.0/data/config_update.cfg
===================================================================
--- branches/nexuiz-2.0/data/config_update.cfg 2009-03-24 08:13:36 UTC (rev 6261)
+++ branches/nexuiz-2.0/data/config_update.cfg 2009-03-24 08:31:50 UTC (rev 6262)
@@ -1,16 +1,18 @@
-// Updates for pre-2.4.1:
-alias _update_0_r_glsl_cb_check_0 "_update_0_have_r_glsl_cb 0"
-alias _update_0_r_glsl_cb_check_1 "_update_0_have_r_glsl_cb 0"
-alias _update_0_r_glsl_cb_0 ""
-alias _update_0_r_glsl_cb_1 "echo Ignore the error message above, the check works fine otherwise; v_contrastboost $r_glsl_contrastboost; r_glsl_contrastboost 1"
-alias _update_0_r_glsl_cb "_update_0_r_glsl_cb_$_update_0_have_r_glsl_cb"
-alias _update_0_v_hwgamma_0 "v_glslgamma 1; v_hwgamma 1"
-alias _update_0_v_hwgamma_1 ""
-alias _update_configversion_0 "_update_0_v_hwgamma_$v_hwgamma; set _update_0_have_r_glsl_cb 1; _update_0_r_glsl_cb_check_$r_glsl_contrastboost; _update_0_r_glsl_cb"
+// fix cvar settings of the engine that Nexuiz is not compatible with
+alias _update_generic_r_dynamic_0 "r_dynamic 1; r_shadow_realtime_dlight 1"
+alias _update_generic_r_dynamic_1 ""
+alias _update_generic "_update_generic_r_dynamic_$r_dynamic"
-// Updates for 2.4.1 to ...
+// updates for ... to 2.4 (also run on first startup, so be careful with what you put in here)
+alias _update_configversion_0 ""
+
+// Updates for 2.4.1 to 2.4.2
alias _update_configversion_1 ""
+// Updates for 2.5 to ...
+alias _update_configversion_2 ""
+
_update_configversion_$g_configversion
+_update_generic
-set g_configversion 1
+set g_configversion 2
Modified: branches/nexuiz-2.0/data/qcsrc/client/gibs.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/gibs.qc 2009-03-24 08:13:36 UTC (rev 6261)
+++ branches/nexuiz-2.0/data/qcsrc/client/gibs.qc 2009-03-24 08:31:50 UTC (rev 6262)
@@ -26,6 +26,8 @@
oldorg = self.origin;
Movetype_Physics(FALSE);
+ if(wasfreed(self))
+ return;
if(self.touch == Gib_Touch) // don't do this for the "chunk" thingie...
trailparticles(self, particleeffectnum("TR_SLIGHTBLOOD"), oldorg, self.origin);
Modified: branches/nexuiz-2.0/data/qcsrc/client/movetypes.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/movetypes.qc 2009-03-24 08:13:36 UTC (rev 6261)
+++ branches/nexuiz-2.0/data/qcsrc/client/movetypes.qc 2009-03-24 08:31:50 UTC (rev 6262)
@@ -373,6 +373,9 @@
}
}
+ if(wasfreed(self))
+ return;
+
self.avelocity = self.move_avelocity;
if(dt > 0 && self.move_movetype != MOVETYPE_NONE)
@@ -404,7 +407,4 @@
self.angles = self.move_angles;
self.origin = self.move_origin;
}
-
- if(!wasfreed(self))
- setorigin(self, self.origin);
}
Modified: branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_world.qc 2009-03-24 08:13:36 UTC (rev 6261)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_world.qc 2009-03-24 08:31:50 UTC (rev 6262)
@@ -619,6 +619,7 @@
}
}
maplist_reply = strzone(strcat(maplist_reply, "\n"));
+ MapInfo_ClearTemps();
records_reply = strzone(getrecords());
Modified: branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc 2009-03-24 08:13:36 UTC (rev 6261)
+++ branches/nexuiz-2.0/data/qcsrc/server/miscfunctions.qc 2009-03-24 08:31:50 UTC (rev 6262)
@@ -1877,6 +1877,7 @@
}
}
}
+ MapInfo_ClearTemps();
if(s == "")
return "No records are available on this server.\n";
Modified: branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc 2009-03-24 08:13:36 UTC (rev 6261)
+++ branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc 2009-03-24 08:31:50 UTC (rev 6262)
@@ -189,6 +189,7 @@
else
world.fog = strzone(MapInfo_Map_fog);
clientstuff = strzone(MapInfo_Map_clientstuff);
+
MapInfo_ClearTemps();
// in case mapinfo switched the type
Modified: branches/nexuiz-2.0/data/qcsrc/server/tturrets/system/system_aimprocs.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/tturrets/system/system_aimprocs.qc 2009-03-24 08:13:36 UTC (rev 6261)
+++ branches/nexuiz-2.0/data/qcsrc/server/tturrets/system/system_aimprocs.qc 2009-03-24 08:31:50 UTC (rev 6262)
@@ -34,12 +34,11 @@
mintime = max(self.attack_finished_single - time,0) + sys_ticrate;
// Baseline
- pre_pos = real_origin(self.enemy) + (self.enemy.velocity * mintime);
+ pre_pos = real_origin(self.enemy);// + (self.enemy.velocity * mintime);
if (self.aim_flags & TFL_AIM_INFRONT) // Aim a bit in front of the target
pre_pos = pre_pos + (normalize(self.enemy.velocity) * 64);
-
if (self.aim_flags & TFL_AIM_BEHIND) // Aim a bit behind the target
pre_pos = pre_pos - (normalize(self.enemy.velocity) * 32);
@@ -48,6 +47,8 @@
if (self.aim_flags & TFL_AIM_SHOTTIMECOMPENSATE) // Need to conpensate for shot traveltime
{
// FIXME: this cant be the best way to do this..
+
+
prep = pre_pos;
for(i = 0; i < 4; ++i)
{
@@ -56,18 +57,20 @@
prep = pre_pos + self.enemy.velocity * impact_time;
}
- /*
+
// tnx and all credit to Rudolf "div0" Polzer for this solution.
// hmm tobad it dont work.
+ /*
+ vector q;
q = solve_quadratic(self.enemy.velocity*self.enemy.velocity - self.shot_speed*self.shot_speed, 2*(pre_pos*self.enemy.velocity), pre_pos * pre_pos);
if(q_x > 0)
impact_time = q_x;
else
impact_time = q_y;
-
- prep = self.enemy.origin + (self.enemy.velocity * impact_time);
*/
+ prep = pre_pos + (self.enemy.velocity * (impact_time+mintime));
+
if(self.aim_flags & TFL_AIM_ZPREDICT)
if not(self.enemy.flags & FL_ONGROUND)
if(self.enemy.movetype == MOVETYPE_WALK || self.enemy.movetype == MOVETYPE_TOSS || self.enemy.movetype == MOVETYPE_BOUNCE)
@@ -101,7 +104,7 @@
if(self.aim_flags & TFL_AIM_GROUND2)
{
- tracebox(pre_pos + '0 0 32',self.enemy.mins,self.enemy.maxs,pre_pos -'0 0 48',MOVE_WORLDONLY,self.enemy);
+ tracebox(pre_pos + '0 0 32',self.enemy.mins,self.enemy.maxs,pre_pos -'0 0 64',MOVE_WORLDONLY,self.enemy);
if(trace_fraction != 1.0)
pre_pos = trace_endpos;
}
Modified: branches/nexuiz-2.0/data/qcsrc/server/tturrets/system/system_main.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/tturrets/system/system_main.qc 2009-03-24 08:13:36 UTC (rev 6261)
+++ branches/nexuiz-2.0/data/qcsrc/server/tturrets/system/system_main.qc 2009-03-24 08:31:50 UTC (rev 6262)
@@ -116,12 +116,14 @@
makevectors(self.tur_head.angles);
self.tur_head.angles_x = self.tur_head.angles_x * -1;
}
+
enemy_pos = real_origin(self.enemy);
turret_tag_fire_update();
- self.tur_shotdir_updated = normalize(v_forward);
- self.tur_dist_enemy = vlen(self.tur_shotorg - enemy_pos);
+ self.tur_shotdir_updated = v_forward;
+
+ self.tur_dist_enemy = vlen(self.tur_shotorg - enemy_pos);
self.tur_dist_aimpos = vlen(self.tur_shotorg - self.tur_aimpos);
if(self.firecheck_flags & TFL_FIRECHECK_VERIFIED)
@@ -131,6 +133,8 @@
setorigin(self.enemy,self.tur_aimpos);
}
+ //dprint("NN: ", self.netname," THVN: ",self.tur_head.classname," frame:",ftos(self.tur_head.frame),"\n");
+ //dprint("self.tur_shotorg: ",vtos(self.tur_shotorg),"\n");
tracebox(self.tur_shotorg, '-1 -1 -1','1 1 1',self.tur_shotorg + (self.tur_shotdir_updated * self.tur_dist_aimpos),MOVE_NORMAL,self);
if(self.firecheck_flags & TFL_FIRECHECK_VERIFIED)
@@ -143,7 +147,6 @@
self.tur_impacttime = vlen(self.tur_shotorg - trace_endpos) / self.shot_speed;
self = oldself;
-
}
/*
@@ -224,43 +227,9 @@
vector real_angle; // This is where we can aim
float f_tmp;
- /*
- if(!self.aim_mark)
- {
- self.aim_mark = mark_misc(self.tur_aimpos,0);
- self.aim_mark.colormod = '1 1 0';
- }
- */
-
-
if (self.track_flags == TFL_TRACK_NO)
return;
- /*
- if not(self.tur_active)
- {
- wish_angle = self.idle_aim - ('1 0 0' * self.aim_maxpitch);
- }
- else if (self.enemy == world)
- {
- if (self.turrcaps_flags & TFL_TURRCAPS_HEADATTACHED)
- wish_angle = self.idle_aim + self.angles;
- else
- if(time > self.lip)
- {
- if(self.target_select_flags & TFL_TARGETSELECT_FOV)
- wish_angle = self.idle_aim; //turret_fovsearch_steprot();
- }
- else
- {
- //wish_angle = self.tur_head.angles;
- wish_angle = self.idle_aim;
- //wish_angle = normalize(self.tur_aimpos - self.tur_head.origin);
- //wish_angle = vectoangles(wish_angle); // And make a angle
- }
- }
- else
- */
if(!self.tur_active)
{
@@ -274,7 +243,7 @@
else
wish_angle = self.idle_aim;
else
- wish_angle = vectoangles(self.tur_aimpos - self.tur_head.origin);
+ wish_angle = vectoangles(normalize(self.tur_aimpos - self.tur_head.origin));
}
else
{
@@ -288,6 +257,9 @@
wish_angle = vectoangles(wish_angle); // And make a angle
}
+ self.tur_head.angles_x = anglemods(self.tur_head.angles_x);
+ self.tur_head.angles_y = anglemods(self.tur_head.angles_y);
+
// Find the diffrence between where we currently aim and where we want to aim
if (self.turrcaps_flags & TFL_TURRCAPS_HEADATTACHED)
{
@@ -618,7 +590,7 @@
return -20;
#ifdef TURRET_DEBUG_TARGETSELECT
- bprint("Target:",e_target.netname," is a valid target for ",e_turret.netname,"\n");
+ dprint("Target:",e_target.netname," is a valid target for ",e_turret.netname,"\n");
#endif
return 1;
@@ -650,7 +622,6 @@
f = turret_validate_target(self,e,self.target_select_flags);
if (f > 0)
{
- bprint(e.netname," = ",ftos(f),"\n");
score = self.turret_score_target(self,e);
if ((score > m_score) && (score > 0))
{
Modified: branches/nexuiz-2.0/data/qcsrc/server/tturrets/system/system_misc.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/tturrets/system/system_misc.qc 2009-03-24 08:13:36 UTC (rev 6261)
+++ branches/nexuiz-2.0/data/qcsrc/server/tturrets/system/system_misc.qc 2009-03-24 08:31:50 UTC (rev 6262)
@@ -1,7 +1,9 @@
-//--// Some support routines //--//
+//--// Some supptort routines //--//
+
+#define anglemods(a) (a - floor(a / 360) * 360)
+
float shortangle_f(float ang1,float ang2)
{
-
if(ang1 > ang2)
{
if(ang1 > 180)
@@ -19,6 +21,7 @@
vector shortangle_v(vector ang1,vector ang2)
{
vector vtmp;
+
vtmp_x = shortangle_f(ang1_x,ang2_x);
vtmp_y = shortangle_f(ang1_y,ang2_y);
vtmp_z = shortangle_f(ang1_z,ang2_z);
@@ -234,34 +237,27 @@
float turret_tag_setup(float linked)
{
- vector v;
- float f;
-
// Laters dooz
if (linked)
return 0;
- f = gettagindex(self,"tag_head");
- v = gettaginfo(self,f);
- setorigin(self.tur_head,v);
+ setorigin(self.tur_head,gettaginfo(self,gettagindex(self,"tag_head")));
+ self.tur_shotorg = gettaginfo(self.tur_head,gettagindex(self.tur_head,"tag_fire"));
- f = gettagindex(self.tur_head,"tag_fire");
- v = gettaginfo(self.tur_head,f);
- self.tur_shotorg = v;
-
return 1;
}
float turret_tag_fire_update()
{
- vector v;
- float f;
+ if(!self.tur_head)
+ {
+ self.tur_shotorg = '0 0 0';
+ return 1;
+ }
- f = gettagindex(self.tur_head,"tag_fire");
- v = gettaginfo(self.tur_head,f);
+ self.tur_shotorg = gettaginfo(self.tur_head,gettagindex(self.tur_head,"tag_fire"));
+ //dprint("update: tur_shotorg: ",vtos(self.tur_shotorg)," origin:", vtos(self.tur_head.origin), " angels: ", vtos(self.tur_head.angles),"\n");
- self.tur_shotorg = v;
-
return 1;
}
Modified: branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_plasma.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_plasma.qc 2009-03-24 08:13:36 UTC (rev 6261)
+++ branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_plasma.qc 2009-03-24 08:31:50 UTC (rev 6262)
@@ -37,7 +37,7 @@
void turret_plasma_dual_postthink()
{
- if (self.tur_head.frame != 0)
+ if ((self.tur_head.frame != 0) && (self.tur_head.frame != 3))
self.tur_head.frame = self.tur_head.frame + 1;
if (self.tur_head.frame > 6)
@@ -66,10 +66,9 @@
proj.solid = SOLID_BBOX;
proj.movetype = MOVETYPE_FLYMISSILE;
proj.velocity = normalize(self.tur_shotdir_updated + randomvec() * self.shot_spread) * self.shot_speed;
- proj.angles = vectoangles(proj.velocity);
+ //proj.velocity = self.tur_shotdir_updated * self.shot_speed;
proj.touch = turret_plasma_projectile_explode;
proj.flags = FL_PROJECTILE;
- //proj.effects = EF_LOWPRECISION | EF_BRIGHTFIELD;
proj.enemy = self.enemy;
proj.flags = FL_PROJECTILE | FL_NOTARGET;
@@ -83,18 +82,12 @@
{
entity proj;
- if (self.tur_head.frame != 0)
- self.tur_head.frame = 3;
- else
- self.tur_head.frame = 1;
+ //turret_tag_fire_update();
- turret_tag_fire_update();
-
sound (self, CHAN_WEAPON, "weapons/hagar_fire.wav", VOL_BASE, ATTN_NORM);
proj = spawn ();
setorigin(proj, self.tur_shotorg);
setsize(proj, '0 0 0', '0 0 0');
- //setmodel(proj, "models/elaser.mdl"); // precision set above
proj.classname = "plasmabomb";
proj.owner = self;
proj.bot_dodge = TRUE;
@@ -103,15 +96,15 @@
proj.nextthink = time + 9;
proj.solid = SOLID_BBOX;
proj.movetype = MOVETYPE_FLYMISSILE;
- //proj.velocity = normalize(self.tur_shotdir_updated + randomvec() * self.shot_spread) * self.shot_speed;
- proj.velocity = self.tur_shotdir_updated * self.shot_speed;
- proj.angles = vectoangles(proj.velocity);
+ proj.velocity = normalize(self.tur_shotdir_updated + randomvec() * self.shot_spread) * self.shot_speed;
+ //proj.velocity = self.tur_shotdir_updated * self.shot_speed;
proj.touch = turret_plasma_projectile_explode;
proj.flags = FL_PROJECTILE;
- // proj.effects = EF_LOWPRECISION | EF_BRIGHTFIELD;
proj.enemy = self.enemy;
proj.flags = FL_PROJECTILE | FL_NOTARGET;
+ self.tur_head.frame += 1;
+
CSQCProjectile(proj, TRUE, PROJECTILE_ELECTRO_BEAM, TRUE);
}
@@ -155,8 +148,8 @@
// How to aim
//self.aim_flags = TFL_AIM_LEAD | TFL_AIM_SHOTTIMECOMPENSATE;// | TFL_AIM_ZPREDICT | TFL_AIM_GROUND2;
- self.aim_flags = TFL_AIM_LEAD | TFL_AIM_SHOTTIMECOMPENSATE | TFL_AIM_GROUND2;
- self.turrcaps_flags = TFL_TURRCAPS_MISSILEKILL | TFL_TURRCAPS_RADIUSDMG | TFL_TURRCAPS_MEDPROJ | TFL_TURRCAPS_PLAYERKILL;
+ self.aim_flags = TFL_AIM_LEAD | TFL_AIM_SHOTTIMECOMPENSATE | TFL_AIM_GROUND2;
+ self.turrcaps_flags = TFL_TURRCAPS_RADIUSDMG | TFL_TURRCAPS_MEDPROJ | TFL_TURRCAPS_PLAYERKILL;// | TFL_TURRCAPS_MISSILEKILL;
if (turret_stdproc_init("plasma_std") == 0)
{
@@ -166,7 +159,7 @@
self.damage_flags |= TFL_DMG_HEADSHAKE;
//self.firecheck_flags |= (TFL_FIRECHECK_AFF | TFL_FIRECHECK_VERIFIED);
- self.firecheck_flags |= TFL_FIRECHECK_AFF;
+ // self.firecheck_flags |= TFL_FIRECHECK_AFF;
//self.target_select_flags |= TFL_TARGETSELECT_FOV;
//self.target_select_fov = 45;
@@ -194,7 +187,7 @@
self.ammo_flags = TFL_AMMO_ENERGY | TFL_AMMO_RECHARGE | TFL_AMMO_RECIVE;
// How to aim at targets
- self.aim_flags = TFL_AIM_LEAD | TFL_AIM_SHOTTIMECOMPENSATE | TFL_AIM_ZPREDICT | TFL_AIM_GROUND2 | TFL_AIM_INFRONT;
+ self.aim_flags = TFL_AIM_LEAD | TFL_AIM_SHOTTIMECOMPENSATE | TFL_AIM_GROUND2 ;
self.turrcaps_flags = TFL_TURRCAPS_RADIUSDMG | TFL_TURRCAPS_MEDPROJ | TFL_TURRCAPS_PLAYERKILL;
if (turret_stdproc_init("plasma_dual") == 0)
@@ -204,7 +197,7 @@
}
self.damage_flags |= TFL_DMG_HEADSHAKE;
- self.firecheck_flags |= (TFL_FIRECHECK_AFF | TFL_FIRECHECK_VERIFIED);
+ //self.firecheck_flags |= (TFL_FIRECHECK_AFF | TFL_FIRECHECK_VERIFIED);
//self.firecheck_flags |= TFL_FIRECHECK_AFF;
setmodel(self,"models/turrets/base.md3");
Modified: branches/nexuiz-2.0/data/quake.rc
===================================================================
--- branches/nexuiz-2.0/data/quake.rc 2009-03-24 08:13:36 UTC (rev 6261)
+++ branches/nexuiz-2.0/data/quake.rc 2009-03-24 08:31:50 UTC (rev 6262)
@@ -1,7 +1,7 @@
exec default.cfg
exec config.cfg
+exec data/campaign.cfg
exec config_update.cfg
-exec data/campaign.cfg
exec autoexec.cfg
stuffcmds
//startdemos demos/demo1 demos/demo2 demos/demo3
Modified: branches/nexuiz-2.0/data/textures/campingrifle.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/campingrifle_bump.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/campingrifle_gloss.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/electro.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/electro_gloss.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/electro_glow.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/electro_norm.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/electro_pants.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/flamethrower.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/flamethrower_gloss.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/flamethrower_norm.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/flamethrower_pants.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/flamethrower_shirt.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/glauncher.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/glauncher_gloss.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/glauncher_norm.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/glauncher_pants.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/glauncher_shirt.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hagar2.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hagar2_gloss.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hagar2_glow.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hagar2_norm.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hagar2_pants.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hagar2_shirt.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hlac.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hlac_body.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hlac_body_gloss.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hlac_body_norm.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hlac_body_pants.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hlac_body_shirt.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hookgun.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hookgun_gloss.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hookgun_norm.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hookgun_pants.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/rl_norm.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/seeker_norm.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/shotgun2.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/shotgun2_gloss.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/shotgun2_glow.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/shotgun2_norm.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/shotgun2_shirt.tga
===================================================================
(Binary files differ)
More information about the nexuiz-commits
mailing list