r2456 - in branches/nexuiz-2.0/data: . qcsrc/server scripts textures/stralenex1
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed May 2 14:31:12 EDT 2007
Author: div0
Date: 2007-05-02 14:31:12 -0400 (Wed, 02 May 2007)
New Revision: 2456
Added:
branches/nexuiz-2.0/data/omg.cfg
Modified:
branches/nexuiz-2.0/data/default.cfg
branches/nexuiz-2.0/data/effectinfo.txt
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/qcsrc/server/cl_weapons.qc
branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc
branches/nexuiz-2.0/data/qcsrc/server/defs.qh
branches/nexuiz-2.0/data/qcsrc/server/g_casings.qc
branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc
branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
branches/nexuiz-2.0/data/qcsrc/server/sv_main.qc
branches/nexuiz-2.0/data/qcsrc/server/t_items.qc
branches/nexuiz-2.0/data/qcsrc/server/t_jumppads.qc
branches/nexuiz-2.0/data/qcsrc/server/t_teleporters.qc
branches/nexuiz-2.0/data/qcsrc/server/w_crylink.qc
branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc
branches/nexuiz-2.0/data/qcsrc/server/w_grenadelauncher.qc
branches/nexuiz-2.0/data/qcsrc/server/w_hagar.qc
branches/nexuiz-2.0/data/qcsrc/server/w_laser.qc
branches/nexuiz-2.0/data/qcsrc/server/w_nex.qc
branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc
branches/nexuiz-2.0/data/qcsrc/server/w_shotgun.qc
branches/nexuiz-2.0/data/qcsrc/server/w_uzi.qc
branches/nexuiz-2.0/data/scripts/stralenex1.shader
branches/nexuiz-2.0/data/textures/stralenex1/e6xrst_supprt.tga
branches/nexuiz-2.0/data/ultimate.cfg
branches/nexuiz-2.0/data/ultra.cfg
Log:
trunk/branch merge:
- all sound references now use the .wav extension
- More detailed error message when trying to switch weapon (Dresk)
- fix angle for missiles when turning
- fix stralenex1 grate alpha (for dieselpower)
- deactive autogenerated bumpmaps because they look ugly
- some tuned particle effects
Modified: branches/nexuiz-2.0/data/default.cfg
===================================================================
--- branches/nexuiz-2.0/data/default.cfg 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/default.cfg 2007-05-02 18:31:12 UTC (rev 2456)
@@ -122,8 +122,8 @@
net_messagetimeout 300
net_connecttimeout 30
sv_jumpstep 1 // step up stairs while jumping, makes it easier to reach ledges
+
cl_movement 1
-cl_movement_minping 0 // currently works better than making it ping dependent
seta cl_autoswitch 1
cl_netinputpacketlosstolerance 0
cl_stairsmoothspeed 200
@@ -209,7 +209,7 @@
set g_casings 0
set g_norecoil 0
set g_throughfloor 1
-set g_maplist_defaultlist 'dm_aggressor''dm_aneurysm''dm_basement''dm_bleach''dm_bluesky''dm_bloodprison''dm_darkzone''dm_downer''dm_evilspace''dm_farewell''dm_runningman''dm_runningman_1on1remix''dm_silvercity''dm_skyway''dm_slimepit''dm_soylent''dm_starship''dm_stormkeep''dm_toxic''dm_warfare''dom_aggressor''dom_aneurysm''dom_basement''dom_bleach''dom_darkzone''dom_downer''dom_evilspace''dom_runningman''dom_runningman_1on1remix''dom_silvercity''dom_skyway''dom_slimepit''dom_soylent''dom_starship''dom_stormkeep''dom_toxic''lms_aggressor''lms_basement''lms_bleach''lms_bluesky''lms_bloodprison''lms_downer''lms_evilspace''lms_farewell''lms_runningman''lms_runningman_1on1remix''lms_skyway''lms_slimepit''lms_soylent''lms_starship''lms_stormkeep''lms_toxic''lms_warfare''rune_aggressor''rune_aneurysm''rune_basement''rune_bleach''rune_darkzone''rune_downer''rune_evilspace''rune_runningman''rune_runningman_1on1remix''rune_silvercity''rune_skyway''rune_slimepit''rune_soylent''rune_starship''rune_stormkeep''rune_toxic''tdm_aggressor''tdm_aneurysm''tdm_basement''tdm_bleach''tdm_darkzone''tdm_downer''tdm_evilspace''tdm_farewell''tdm_runningman''tdm_runningman_1on1remix''tdm_silvercity''tdm_skyway''tdm_slimepit''tdm_soylent''tdm_starship''tdm_stormkeep''tdm_toxic''tdm_warfare'
+set g_maplist_defaultlist 'dm_aggressor''dm_aneurysm''dm_basement''dm_bleach''dm_bluesky''dm_bloodprison''dm_darkzone''dm_downer''dm_evilspace''dm_farewell''dm_runningman''dm_runningman_1on1remix''dm_silvercity''dm_skyway''dm_slimepit''dm_soylent''dm_starship''dm_stormkeep''dm_toxic''dm_warfare'
seta g_maplist $g_maplist_defaultlist
seta g_maplist_index 0 // this is used internally for saving position in maplist cycle
seta g_maplist_selectrandom 0 // if 1, a random map will be chosen as next map - DEPRECATED in favor of g_maplist_shuffle
@@ -425,8 +425,8 @@
// effects
r_picmipsprites 0 // Nexuiz uses sprites that should never be picmipped (team mate, typing, waypoints)
-r_shadow_bumpscale_bumpmap 4
-r_shadow_bumpscale_basetexture 5
+r_mipsprites 1
+r_mipskins 1
r_shadow_realtime_world_lightmaps 1
r_ambient 0
cl_decals_fadetime 1
Modified: branches/nexuiz-2.0/data/effectinfo.txt
===================================================================
--- branches/nexuiz-2.0/data/effectinfo.txt 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/effectinfo.txt 2007-05-02 18:31:12 UTC (rev 2456)
@@ -87,12 +87,26 @@
originjitter 6 6 6
// dust/smoke drifting away from the impact
effect TE_SPIKE
-countabsolute 1
-type static
+count 8
+type smoke
tex 0 8
-color 0xFFFFFF 0xFFFFFF
-size 6 6
-alpha 48 48 48
+color 0x101010 0x101010
+size 3 3
+sizeincrease 3
+alpha 255 255 256
+originjitter 0 0 0
+velocityjitter 8 8 8
+// dust/smoke staying at the impact
+effect TE_SPIKE
+count 1
+type smoke
+tex 0 8
+color 0x505050 0x505050
+size 4 4
+sizeincrease 4
+alpha 255 255 128
+originjitter 0 0 0
+velocityjitter 0 0 0
// bouncing sparks
effect TE_SPIKE
count 20
@@ -161,15 +175,27 @@
alpha 256 256 0
originjitter 6 6 6
// dust/smoke drifting away from the impact
-effect TE_SUPERSPIKE
+effect TE_SPIKE
count 8
type smoke
tex 0 8
-color 0x101010 0x202020
+color 0x101010 0x101010
size 3 3
-alpha 0 256 512
-originjitter 2 2 2
+sizeincrease 3
+alpha 255 255 256
+originjitter 0 0 0
velocityjitter 8 8 8
+// dust/smoke staying at the impact
+effect TE_SUPERSPIKE
+count 1
+type smoke
+tex 0 8
+color 0x505050 0x505050
+size 4 4
+sizeincrease 4
+alpha 255 255 128
+originjitter 0 0 0
+velocityjitter 0 0 0
// sparks that disappear on impact
effect TE_SUPERSPIKE
count 30
@@ -199,11 +225,23 @@
count 8
type smoke
tex 0 8
-color 0x101010 0x202020
+color 0x101010 0x101010
size 3 3
-alpha 0 256 512
-originjitter 2 2 2
+sizeincrease 3
+alpha 255 255 256
+originjitter 0 0 0
velocityjitter 8 8 8
+// dust/smoke staying at the impact
+effect TE_SUPERSPIKEQUAD
+count 1
+type smoke
+tex 0 8
+color 0x505050 0x505050
+size 4 4
+sizeincrease 4
+alpha 255 255 128
+originjitter 0 0 0
+velocityjitter 0 0 0
// sparks that disappear on impact
effect TE_SUPERSPIKEQUAD
count 30
@@ -227,12 +265,26 @@
originjitter 6 6 6
// dust/smoke drifting away from the impact
effect TE_GUNSHOT
-countabsolute 1
-type static
+count 4
+type smoke
tex 0 8
-color 0xFFFFFF 0xFFFFFF
-size 6 6
-alpha 48 48 48
+color 0x101010 0x101010
+size 3 3
+sizeincrease 3
+alpha 128 128 64
+originjitter 0 0 0
+velocityjitter 8 8 8
+// dust/smoke staying at the impact
+effect TE_GUNSHOT
+count 1
+type smoke
+tex 0 8
+color 0x505050 0x505050
+size 4 4
+sizeincrease 4
+alpha 128 128 64
+originjitter 0 0 0
+velocityjitter 0 0 0
// bouncing sparks
effect TE_GUNSHOT
count 10
@@ -263,11 +315,23 @@
count 4
type smoke
tex 0 8
-color 0x101010 0x202020
+color 0x101010 0x101010
size 3 3
-alpha 0 256 512
-originjitter 2 2 2
+sizeincrease 3
+alpha 255 255 256
+originjitter 0 0 0
velocityjitter 8 8 8
+// dust/smoke staying at the impact
+effect TE_GUNSHOTQUAD
+count 1
+type smoke
+tex 0 8
+color 0x202020 0x202020
+size 4 4
+sizeincrease 4
+alpha 255 255 128
+originjitter 0 0 0
+velocityjitter 0 0 0
// sparks that disappear on impact
effect TE_GUNSHOTQUAD
count 15
@@ -332,7 +396,7 @@
tex 35 37
color 0x404040 0x404040
size 48 48
-alpha 128 128 64
+alpha 192 192 64
// fire effect which expands then slows
effect TE_EXPLOSION
notunderwater
@@ -706,7 +770,7 @@
tex 35 37
color 0x404040 0x404040
size 72 72
-alpha 128 128 64
+alpha 192 192 64
// fire effect
effect TE_TEI_BIGEXPLOSION
notunderwater
Modified: branches/nexuiz-2.0/data/high.cfg
===================================================================
--- branches/nexuiz-2.0/data/high.cfg 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/high.cfg 2007-05-02 18:31:12 UTC (rev 2456)
@@ -14,18 +14,21 @@
cl_particles_snow 1
cl_particles_sparks 1
gl_picmip 0
-gl_texture_anisotropy 16
+gl_texture_anisotropy 1
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
r_hdr 0
+r_shadow_usenormalmap 1
r_shadow_gloss 1
r_shadow_realtime_dlight 1
-r_shadow_realtime_dlight_shadows 0
+r_shadow_realtime_dlight_shadows 1
r_shadow_realtime_world 1
-r_shadow_realtime_world_dlightshadows 0
-r_shadow_realtime_world_shadows 0
+r_shadow_realtime_world_dlightshadows 1
+r_shadow_realtime_world_shadows 1
r_sky 1
+r_showsurfaces 0
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/low.cfg
===================================================================
--- branches/nexuiz-2.0/data/low.cfg 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/low.cfg 2007-05-02 18:31:12 UTC (rev 2456)
@@ -1,31 +1,34 @@
-cl_decals 0
-cl_nogibs 1
+cl_decals 1
+cl_nogibs 0
cl_particles 1
-cl_particles_blood 0
-cl_particles_bubbles 0
-cl_particles_bulletimpacts 0
+cl_particles_blood 1
+cl_particles_bubbles 1
+cl_particles_bulletimpacts 1
cl_particles_explosions_shell 0
-cl_particles_explosions_smokes 0
-cl_particles_explosions_sparks 0
-cl_particles_quality 0.25
-cl_particles_rain 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 0
+cl_particles_snow 1
cl_particles_sparks 1
gl_picmip 2
gl_texture_anisotropy 1
r_bloom 0
-r_coronas 0
-r_dynamic 0
+r_coronas 1
+gl_flashblend 1
+r_dynamic 1
r_glsl_deluxemapping 0
r_glsl_offsetmapping 0
r_glsl_offsetmapping_reliefmapping 0
r_hdr 0
+r_shadow_usenormalmap 0
r_shadow_gloss 0
r_shadow_realtime_dlight 0
r_shadow_realtime_dlight_shadows 0
r_shadow_realtime_world 0
r_shadow_realtime_world_dlightshadows 0
r_shadow_realtime_world_shadows 0
-r_sky 0
+r_sky 1
+r_showsurfaces 0
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/med.cfg
===================================================================
--- branches/nexuiz-2.0/data/med.cfg 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/med.cfg 2007-05-02 18:31:12 UTC (rev 2456)
@@ -8,24 +8,27 @@
cl_particles_explosions_smokes 1
cl_particles_explosions_sparks 1
cl_particles_quality 0.5
-cl_particles_rain 0
+cl_particles_rain 1
cl_particles_size 1
cl_particles_smoke 1
-cl_particles_snow 0
+cl_particles_snow 1
cl_particles_sparks 1
gl_picmip 1
gl_texture_anisotropy 1
r_bloom 0
r_coronas 1
+gl_flashblend 1
r_dynamic 1
-r_glsl_deluxemapping 1
+r_glsl_deluxemapping 0
r_glsl_offsetmapping 0
r_glsl_offsetmapping_reliefmapping 0
r_hdr 0
-r_shadow_gloss 1
+r_shadow_usenormalmap 0
+r_shadow_gloss 0
r_shadow_realtime_dlight 0
r_shadow_realtime_dlight_shadows 0
r_shadow_realtime_world 0
r_shadow_realtime_world_dlightshadows 0
r_shadow_realtime_world_shadows 0
r_sky 1
+r_showsurfaces 0
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/normal.cfg
===================================================================
--- branches/nexuiz-2.0/data/normal.cfg 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/normal.cfg 2007-05-02 18:31:12 UTC (rev 2456)
@@ -13,19 +13,22 @@
cl_particles_smoke 1
cl_particles_snow 1
cl_particles_sparks 1
-gl_picmip 1
+gl_picmip 0
gl_texture_anisotropy 1
-r_bloom 0
+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
r_hdr 0
+r_shadow_usenormalmap 0
r_shadow_gloss 1
r_shadow_realtime_dlight 1
r_shadow_realtime_dlight_shadows 0
r_shadow_realtime_world 0
r_shadow_realtime_world_dlightshadows 0
-r_shadow_realtime_world_shadows 1
+r_shadow_realtime_world_shadows 0
r_sky 1
+r_showsurfaces 0
\ No newline at end of file
Added: branches/nexuiz-2.0/data/omg.cfg
===================================================================
--- branches/nexuiz-2.0/data/omg.cfg (rev 0)
+++ branches/nexuiz-2.0/data/omg.cfg 2007-05-02 18:31:12 UTC (rev 2456)
@@ -0,0 +1,34 @@
+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
+gl_picmip 2
+gl_texture_anisotropy 1
+r_bloom 0
+r_coronas 1
+gl_flashblend 1
+r_dynamic 1
+r_glsl_deluxemapping 0
+r_glsl_offsetmapping 0
+r_glsl_offsetmapping_reliefmapping 0
+r_hdr 0
+r_shadow_usenormalmap 0
+r_shadow_gloss 0
+r_shadow_realtime_dlight 0
+r_shadow_realtime_dlight_shadows 0
+r_shadow_realtime_world 0
+r_shadow_realtime_world_dlightshadows 0
+r_shadow_realtime_world_shadows 0
+r_sky 1
+r_showsurfaces 1
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_weapons.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_weapons.qc 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_weapons.qc 2007-05-02 18:31:12 UTC (rev 2456)
@@ -240,7 +240,7 @@
}
else if (self.weaponentity.state == WS_READY)
{
- sound (self, CHAN_WEAPON, "weapons/weapon_switch.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_WEAPON, "weapons/weapon_switch.wav", 1, ATTN_NORM);
self.weaponentity.state = WS_DROP;
// set up weapon switch think in the future, and start drop anim
weapon_thinkf(WFRAME_IDLE, cvar("g_balance_weaponswitchdelay"), w_clear);
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_weaponsystem.qc 2007-05-02 18:31:12 UTC (rev 2456)
@@ -59,7 +59,7 @@
if (self.items & IT_STRENGTH)
if (!cvar("g_minstagib"))
- sound (self, CHAN_AUTO, "weapons/strength_fire.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_AUTO, "weapons/strength_fire.wav", 1, ATTN_NORM);
};
void LaserTarget_Think()
@@ -279,7 +279,14 @@
return TRUE;
}
if (complain)
- sprint(self, "You don't own that weapon\n");
+ {
+ // DRESK - 3/16/07
+ // Report Proper Weapon Status / Modified Weapon Ownership Message
+ if(itemsInMap & itemcode)
+ sprint(self, strcat("You do not have the ^2", W_Name(wpn), "\n") );
+ else
+ sprint(self, strcat("The ^2", W_Name(wpn), "^7 is ^1NOT AVAILABLE^7 in this map\n") );
+ }
return FALSE;
};
Modified: branches/nexuiz-2.0/data/qcsrc/server/defs.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/defs.qh 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/qcsrc/server/defs.qh 2007-05-02 18:31:12 UTC (rev 2456)
@@ -306,6 +306,8 @@
void FixIntermissionClient(entity e);
void FixClientCvars(entity e);
+float itemsInMap;
+
void centerprint_atprio(entity e, float prio, string s);
void centerprint_expire(entity e, float prio);
void centerprint(entity e, string s);
Modified: branches/nexuiz-2.0/data/qcsrc/server/g_casings.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_casings.qc 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_casings.qc 2007-05-02 18:31:12 UTC (rev 2456)
@@ -8,7 +8,7 @@
if (other.solid == SOLID_BSP)
if (vlen(self.velocity) >= 50)
if (time >= self.attack_finished)
- sound (self, CHAN_IMPACT, "weapons/tink1.ogg", 0.5, ATTN_NORM);
+ sound (self, CHAN_IMPACT, "weapons/tink1.wav", 0.5, ATTN_NORM);
self.attack_finished = time + 0.2;
//self.touch = SUB_Null; // one tink is enough
//self.dest = self.origin - self.groundentity.origin;
Modified: branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_damage.qc 2007-05-02 18:31:12 UTC (rev 2456)
@@ -141,7 +141,7 @@
else if (deathtype == DEATH_NOAMMO)
{
bprint ("^7",s, " ^7committed suicide. What's the point of living without ammo?\n");
- //sound (self, CHAN_BODY, "minstagib/mockery.ogg", 1, ATTN_NONE);
+ //sound (self, CHAN_BODY, "minstagib/mockery.wav", 1, ATTN_NONE);
}
else if (deathtype == DEATH_CAMP)
bprint ("^1",s, "^1 thought he found a nice camping ground\n");
@@ -180,7 +180,7 @@
checkrules_firstblood = TRUE;
//sound(world, CHAN_AUTO, "announcer/firstblood.wav", 1, ATTN_NONE);
//if (cvar("g_minstagib"))
- //sound(world, CHAN_AUTO, "announce/male/mapkill1.ogg", 1, ATTN_NONE);
+ //sound(world, CHAN_AUTO, "announce/male/mapkill1.wav", 1, ATTN_NONE);
bprint("^1",a, "^1 drew first blood", "\n");
}
Modified: branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_hook.qc 2007-05-02 18:31:12 UTC (rev 2456)
@@ -173,7 +173,7 @@
return;
}
- sound (self, CHAN_BODY, "weapons/hook_impact.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_BODY, "weapons/hook_impact.wav", 1, ATTN_NORM);
self.state = 1;
self.think = GrapplingHookThink;
@@ -214,7 +214,7 @@
makevectors(self.v_angle);
- sound (self, CHAN_WEAPON, "weapons/hook_fire.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_WEAPON, "weapons/hook_fire.wav", 1, ATTN_NORM);
org = self.origin + self.view_ofs + v_forward * 15 - v_right * 5 + v_up * -12;
te_customflash(org, 160, 0.2, '1 0 0');
Modified: branches/nexuiz-2.0/data/qcsrc/server/g_world.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/g_world.qc 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/qcsrc/server/g_world.qc 2007-05-02 18:31:12 UTC (rev 2456)
@@ -204,108 +204,108 @@
precache_sound ("misc/footstep04.wav");
precache_sound ("misc/footstep05.wav");
precache_sound ("misc/footstep06.wav");
- precache_sound ("misc/hitground1.ogg");
- precache_sound ("misc/hitground2.ogg");
- precache_sound ("misc/hitground3.ogg");
- precache_sound ("misc/hitground4.ogg");
- precache_sound ("misc/itempickup.ogg");
- precache_sound ("misc/itemrespawn.ogg");
- precache_sound ("misc/jumppad.ogg");
- precache_sound ("misc/mediumhealth.ogg");
- precache_sound ("misc/megahealth.ogg");
- precache_sound ("misc/minihealth.ogg");
- precache_sound ("misc/powerup.ogg");
- precache_sound ("misc/powerup_shield.ogg");
+ precache_sound ("misc/hitground1.wav");
+ precache_sound ("misc/hitground2.wav");
+ precache_sound ("misc/hitground3.wav");
+ precache_sound ("misc/hitground4.wav");
+ precache_sound ("misc/itempickup.wav");
+ precache_sound ("misc/itemrespawn.wav");
+ precache_sound ("misc/jumppad.wav");
+ precache_sound ("misc/mediumhealth.wav");
+ precache_sound ("misc/megahealth.wav");
+ precache_sound ("misc/minihealth.wav");
+ precache_sound ("misc/powerup.wav");
+ precache_sound ("misc/powerup_shield.wav");
precache_sound ("misc/talk.wav");
- precache_sound ("misc/teleport.ogg");
+ precache_sound ("misc/teleport.wav");
precache_sound ("plats/medplat1.wav");
precache_sound ("plats/medplat2.wav");
precache_sound ("player/lava.wav");
precache_sound ("player/slime.wav");
- precache_sound ("weapons/crylink_fire.ogg");
- precache_sound ("weapons/electro_bounce.ogg");
- precache_sound ("weapons/electro_fire.ogg");
- precache_sound ("weapons/electro_fire2.ogg");
+ precache_sound ("weapons/crylink_fire.wav");
+ precache_sound ("weapons/electro_bounce.wav");
+ precache_sound ("weapons/electro_fire.wav");
+ precache_sound ("weapons/electro_fire2.wav");
precache_sound ("weapons/electro_fly.wav");
- precache_sound ("weapons/electro_impact.ogg");
- precache_sound ("weapons/electro_impact_combo.ogg");
- //precache_sound ("weapons/grenade_bounce.ogg");
- precache_sound ("weapons/grenade_bounce1.ogg");
- precache_sound ("weapons/grenade_bounce2.ogg");
- precache_sound ("weapons/grenade_bounce3.ogg");
- precache_sound ("weapons/grenade_bounce4.ogg");
- precache_sound ("weapons/grenade_bounce5.ogg");
- precache_sound ("weapons/grenade_bounce6.ogg");
- precache_sound ("weapons/grenade_fire.ogg");
- precache_sound ("weapons/grenade_impact.ogg");
- precache_sound ("weapons/hagar_fire.ogg");
- precache_sound ("weapons/hagexp1.ogg");
- precache_sound ("weapons/hagexp2.ogg");
- precache_sound ("weapons/hagexp3.ogg");
- precache_sound ("weapons/hook_fire.ogg");
- precache_sound ("weapons/hook_impact.ogg");
- precache_sound ("weapons/lasergun_fire.ogg");
- precache_sound ("weapons/laserimpact.ogg");
- precache_sound ("weapons/nexfire.ogg");
- precache_sound ("weapons/neximpact.ogg");
- precache_sound ("weapons/ric1.ogg");
- precache_sound ("weapons/ric2.ogg");
- precache_sound ("weapons/ric3.ogg");
- precache_sound ("weapons/rocket_fire.ogg");
+ precache_sound ("weapons/electro_impact.wav");
+ precache_sound ("weapons/electro_impact_combo.wav");
+ //precache_sound ("weapons/grenade_bounce.wav");
+ precache_sound ("weapons/grenade_bounce1.wav");
+ precache_sound ("weapons/grenade_bounce2.wav");
+ precache_sound ("weapons/grenade_bounce3.wav");
+ precache_sound ("weapons/grenade_bounce4.wav");
+ precache_sound ("weapons/grenade_bounce5.wav");
+ precache_sound ("weapons/grenade_bounce6.wav");
+ precache_sound ("weapons/grenade_fire.wav");
+ precache_sound ("weapons/grenade_impact.wav");
+ precache_sound ("weapons/hagar_fire.wav");
+ precache_sound ("weapons/hagexp1.wav");
+ precache_sound ("weapons/hagexp2.wav");
+ precache_sound ("weapons/hagexp3.wav");
+ precache_sound ("weapons/hook_fire.wav");
+ precache_sound ("weapons/hook_impact.wav");
+ precache_sound ("weapons/lasergun_fire.wav");
+ precache_sound ("weapons/laserimpact.wav");
+ precache_sound ("weapons/nexfire.wav");
+ precache_sound ("weapons/neximpact.wav");
+ precache_sound ("weapons/ric1.wav");
+ precache_sound ("weapons/ric2.wav");
+ precache_sound ("weapons/ric3.wav");
+ precache_sound ("weapons/rocket_fire.wav");
precache_sound ("weapons/rocket_fly.wav");
- precache_sound ("weapons/rocket_impact.ogg");
- precache_sound ("weapons/rocket_det.ogg");
- precache_sound ("weapons/shotgun_fire.ogg");
- precache_sound ("weapons/tink1.ogg");
- precache_sound ("weapons/uzi_fire.ogg");
- precache_sound ("weapons/weapon_switch.ogg");
- precache_sound ("weapons/weaponpickup.ogg");
- precache_sound ("weapons/strength_fire.ogg");
+ precache_sound ("weapons/rocket_impact.wav");
+ precache_sound ("weapons/rocket_det.wav");
+ precache_sound ("weapons/shotgun_fire.wav");
+ precache_sound ("weapons/tink1.wav");
+ precache_sound ("weapons/uzi_fire.wav");
+ precache_sound ("weapons/weapon_switch.wav");
+ precache_sound ("weapons/weaponpickup.wav");
+ precache_sound ("weapons/strength_fire.wav");
- //precache_sound ("announce/male/kill10.ogg");
- //precache_sound ("announce/male/kill15.ogg");
- //precache_sound ("announce/male/kill20.ogg");
- //precache_sound ("announce/male/kill25.ogg");
- //precache_sound ("announce/male/kill3.ogg");
- //precache_sound ("announce/male/kill30.ogg");
- //precache_sound ("announce/male/kill4.ogg");
- //precache_sound ("announce/male/kill5.ogg");
- //precache_sound ("announce/male/kill6.ogg");
- //precache_sound ("announce/male/mapkill1.ogg");
- //precache_sound ("announce/robotic/last_second_save.ogg");
- //precache_sound ("announce/robotic/narrowly_averted.ogg");
- //precache_sound ("minstagib/mockery.ogg");
+ //precache_sound ("announce/male/kill10.wav");
+ //precache_sound ("announce/male/kill15.wav");
+ //precache_sound ("announce/male/kill20.wav");
+ //precache_sound ("announce/male/kill25.wav");
+ //precache_sound ("announce/male/kill3.wav");
+ //precache_sound ("announce/male/kill30.wav");
+ //precache_sound ("announce/male/kill4.wav");
+ //precache_sound ("announce/male/kill5.wav");
+ //precache_sound ("announce/male/kill6.wav");
+ //precache_sound ("announce/male/mapkill1.wav");
+ //precache_sound ("announce/robotic/last_second_save.wav");
+ //precache_sound ("announce/robotic/narrowly_averted.wav");
+ //precache_sound ("minstagib/mockery.wav");
// announcer sounds - male
- precache_sound ("announcer/male/03kills.ogg");
- precache_sound ("announcer/male/05kills.ogg");
- precache_sound ("announcer/male/10kills.ogg");
- precache_sound ("announcer/male/15kills.ogg");
- precache_sound ("announcer/male/20kills.ogg");
- precache_sound ("announcer/male/25kills.ogg");
- precache_sound ("announcer/male/30kills.ogg");
- precache_sound ("announcer/male/botlike.ogg");
- precache_sound ("announcer/male/electrobitch.ogg");
- precache_sound ("announcer/male/welcome.ogg");
- precache_sound ("announcer/male/yoda.ogg");
+ precache_sound ("announcer/male/03kills.wav");
+ precache_sound ("announcer/male/05kills.wav");
+ precache_sound ("announcer/male/10kills.wav");
+ precache_sound ("announcer/male/15kills.wav");
+ precache_sound ("announcer/male/20kills.wav");
+ precache_sound ("announcer/male/25kills.wav");
+ precache_sound ("announcer/male/30kills.wav");
+ precache_sound ("announcer/male/botlike.wav");
+ precache_sound ("announcer/male/electrobitch.wav");
+ precache_sound ("announcer/male/welcome.wav");
+ precache_sound ("announcer/male/yoda.wav");
// announcer sounds - robotic
- precache_sound ("announcer/robotic/1fragleft.ogg");
- precache_sound ("announcer/robotic/1minuteremains.ogg");
- precache_sound ("announcer/robotic/2fragsleft.ogg");
- precache_sound ("announcer/robotic/3fragsleft.ogg");
- precache_sound ("announcer/robotic/lastsecond.ogg");
- precache_sound ("announcer/robotic/narrowly.ogg");
- precache_sound ("announcer/robotic/1.ogg");
- precache_sound ("announcer/robotic/2.ogg");
- precache_sound ("announcer/robotic/3.ogg");
- precache_sound ("announcer/robotic/4.ogg");
- precache_sound ("announcer/robotic/5.ogg");
- precache_sound ("announcer/robotic/6.ogg");
- precache_sound ("announcer/robotic/7.ogg");
- precache_sound ("announcer/robotic/8.ogg");
- precache_sound ("announcer/robotic/9.ogg");
- precache_sound ("announcer/robotic/10.ogg");
+ precache_sound ("announcer/robotic/1fragleft.wav");
+ precache_sound ("announcer/robotic/1minuteremains.wav");
+ precache_sound ("announcer/robotic/2fragsleft.wav");
+ precache_sound ("announcer/robotic/3fragsleft.wav");
+ precache_sound ("announcer/robotic/lastsecond.wav");
+ precache_sound ("announcer/robotic/narrowly.wav");
+ precache_sound ("announcer/robotic/1.wav");
+ precache_sound ("announcer/robotic/2.wav");
+ precache_sound ("announcer/robotic/3.wav");
+ precache_sound ("announcer/robotic/4.wav");
+ precache_sound ("announcer/robotic/5.wav");
+ precache_sound ("announcer/robotic/6.wav");
+ precache_sound ("announcer/robotic/7.wav");
+ precache_sound ("announcer/robotic/8.wav");
+ precache_sound ("announcer/robotic/9.wav");
+ precache_sound ("announcer/robotic/10.wav");
// plays music for the level if there is any
if (self.noise)
@@ -1279,11 +1279,11 @@
if (checkrules_leaderfrags != checkrules_oldleaderfrags)
{
if (checkrules_leaderfrags == fraglimit - 1)
- sound(world, CHAN_AUTO, "announcer/robotic/1fragleft.ogg", 1, ATTN_NONE);
+ sound(world, CHAN_AUTO, "announcer/robotic/1fragleft.wav", 1, ATTN_NONE);
else if (checkrules_leaderfrags == fraglimit - 2)
- sound(world, CHAN_AUTO, "announcer/robotic/2fragsleft.ogg", 1, ATTN_NONE);
+ sound(world, CHAN_AUTO, "announcer/robotic/2fragsleft.wav", 1, ATTN_NONE);
else if (checkrules_leaderfrags == fraglimit - 3)
- sound(world, CHAN_AUTO, "announcer/robotic/3fragsleft.ogg", 1, ATTN_NONE);
+ sound(world, CHAN_AUTO, "announcer/robotic/3fragsleft.wav", 1, ATTN_NONE);
}
return GetWinningCode(fraglimit && checkrules_leaderfrags >= fraglimit, checkrules_equality);
@@ -1322,11 +1322,11 @@
if(tdm_max_score != tdm_old_score)
{
if(tdm_max_score == fraglimit - 1)
- sound(world, CHAN_AUTO, "announcer/robotic/1fragleft.ogg", 1, ATTN_NONE);
+ sound(world, CHAN_AUTO, "announcer/robotic/1fragleft.wav", 1, ATTN_NONE);
else if(tdm_max_score == fraglimit - 2)
- sound(world, CHAN_AUTO, "announcer/robotic/2fragsleft.ogg", 1, ATTN_NONE);
+ sound(world, CHAN_AUTO, "announcer/robotic/2fragsleft.wav", 1, ATTN_NONE);
else if(tdm_max_score == fraglimit - 3)
- sound(world, CHAN_AUTO, "announcer/robotic/3fragsleft.ogg", 1, ATTN_NONE);
+ sound(world, CHAN_AUTO, "announcer/robotic/3fragsleft.wav", 1, ATTN_NONE);
}
return GetWinningCode(fraglimit && tdm_max_score >= fraglimit, checkrules_equality);
@@ -1530,7 +1530,7 @@
if(!checkrules_overtimewarning)
{
checkrules_overtimewarning = TRUE;
- //sound(world, CHAN_AUTO, "announcer/robotic/1minuteremains.ogg", 1, ATTN_NONE);
+ //sound(world, CHAN_AUTO, "announcer/robotic/1minuteremains.wav", 1, ATTN_NONE);
bcenterprint("^3Now playing ^1OVERTIME^3!\n\n^3Keep fragging until we have a ^1winner^3!");
}
}
@@ -1549,7 +1549,7 @@
if (!checkrules_oneminutewarning && timelimit > 0 && time > timelimit - 60)
{
checkrules_oneminutewarning = TRUE;
- sound(world, CHAN_AUTO, "announcer/robotic/1minuteremains.ogg", 1, ATTN_NONE);
+ sound(world, CHAN_AUTO, "announcer/robotic/1minuteremains.wav", 1, ATTN_NONE);
}
status = WINNING_NO;
@@ -1990,7 +1990,7 @@
{
ServerConsoleEcho(strcat("Redirecting: sending connect command to ", self.netname), FALSE);
if(redirection_target == "self")
- stuffcmd(self, "\ndisconnect; net_connecttimeout 120; reconnect\n");
+ stuffcmd(self, "\ndisconnect; reconnect\n");
else
stuffcmd(self, strcat("\ndisconnect; connect ", redirection_target, "\n"));
++clients_found;
Modified: branches/nexuiz-2.0/data/qcsrc/server/sv_main.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/sv_main.qc 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/qcsrc/server/sv_main.qc 2007-05-02 18:31:12 UTC (rev 2456)
@@ -83,13 +83,13 @@
local float soundrandom;
soundrandom = random() * 4;
if (soundrandom < 1)
- sound (self, CHAN_BODY, "misc/hitground1.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_BODY, "misc/hitground1.wav", 1, ATTN_NORM);
else if (soundrandom < 2)
- sound (self, CHAN_BODY, "misc/hitground2.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_BODY, "misc/hitground2.wav", 1, ATTN_NORM);
else if (soundrandom < 3)
- sound (self, CHAN_BODY, "misc/hitground3.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_BODY, "misc/hitground3.wav", 1, ATTN_NORM);
else if (soundrandom < 4)
- sound (self, CHAN_BODY, "misc/hitground4.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_BODY, "misc/hitground4.wav", 1, ATTN_NORM);
self.nextstep = time + 0.3 + random() * 0.1;
}
dm = min((dm - cvar("g_balance_falldamage_minspeed")) * cvar("g_balance_falldamage_factor"), cvar("g_balance_falldamage_maxdamage"));
Modified: branches/nexuiz-2.0/data/qcsrc/server/t_items.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/t_items.qc 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/qcsrc/server/t_items.qc 2007-05-02 18:31:12 UTC (rev 2456)
@@ -8,7 +8,7 @@
{
self.model = self.mdl; // restore original model
self.solid = SOLID_TRIGGER; // allow it to be touched again
- sound (self, CHAN_VOICE, "misc/itemrespawn.ogg", 1, ATTN_NORM); // play respawn sound
+ sound (self, CHAN_VOICE, "misc/itemrespawn.wav", 1, ATTN_NORM); // play respawn sound
setorigin (self, self.origin);
// LordHavoc: replaced respawn stardust effect with a custom te_wizspike
@@ -300,6 +300,8 @@
}
waypoint_spawnforitem(self);
+
+ itemsInMap |= itemid;
}
if (!(cvar("g_pickup_items") && !cvar("g_nixnex")) && !cvar("g_minstagib") &&
@@ -416,7 +418,7 @@
{
self.ammo_cells = 25;
StartItem ("models/weapons/g_nex.md3",
- "weapons/weaponpickup.ogg", 15,
+ "weapons/weaponpickup.wav", 15,
"Nex Gun", IT_NEX, FL_WEAPON, generic_pickupevalfunc, 1000);
return;
}
@@ -429,7 +431,7 @@
{
self.ammo_cells = 1;
StartItem ("models/items/a_cells.md3",
- "misc/itempickup.ogg", 45,
+ "misc/itempickup.wav", 45,
"Nex Ammo", IT_CELLS, 0, generic_pickupevalfunc, 100);
return;
}
@@ -449,7 +451,7 @@
self.effects = EF_ADDITIVE;
self.strength_finished = 30;
StartItem ("models/items/g_strength.md3",
- "misc/powerup.ogg", 120,
+ "misc/powerup.wav", 120,
"Invisibility", IT_STRENGTH, FL_POWERUP, generic_pickupevalfunc, 1000);
}
// replace with extra lives
@@ -457,7 +459,7 @@
{
self.max_health = 1;
StartItem ("models/items/g_h100.md3",
- "misc/megahealth.ogg", 120,
+ "misc/megahealth.wav", 120,
"Extralife", IT_NAILS, FL_POWERUP, generic_pickupevalfunc, 1000);
}
@@ -467,7 +469,7 @@
self.effects = EF_ADDITIVE;
self.invincible_finished = 30;
StartItem ("models/items/g_invincible.md3",
- "misc/powerup_shield.ogg", 120,
+ "misc/powerup_shield.wav", 120,
"Speed", IT_INVINCIBLE, FL_POWERUP, generic_pickupevalfunc, 1000);
}
@@ -476,31 +478,31 @@
void weapon_uzi (void) {
if(!self.ammo_nails)
self.ammo_nails = cvar("g_pickup_nails");
- StartItem ("models/weapons/g_uzi.md3", "weapons/weaponpickup.ogg", 15, W_Name(WEP_UZI), IT_UZI, FL_WEAPON, weapon_pickupevalfunc, 1000);
+ StartItem ("models/weapons/g_uzi.md3", "weapons/weaponpickup.wav", 15, W_Name(WEP_UZI), IT_UZI, FL_WEAPON, weapon_pickupevalfunc, 1000);
}
void weapon_shotgun (void) {
if(!self.ammo_shells)
self.ammo_shells = cvar("g_pickup_shells");
- StartItem ("models/weapons/g_shotgun.md3", "weapons/weaponpickup.ogg", 15, W_Name(WEP_SHOTGUN), IT_SHOTGUN, FL_WEAPON, weapon_pickupevalfunc, 1000);
+ StartItem ("models/weapons/g_shotgun.md3", "weapons/weaponpickup.wav", 15, W_Name(WEP_SHOTGUN), IT_SHOTGUN, FL_WEAPON, weapon_pickupevalfunc, 1000);
}
void weapon_grenadelauncher (void) {
if(!self.ammo_rockets)
self.ammo_rockets = cvar("g_pickup_rockets");
- StartItem ("models/weapons/g_gl.md3", "weapons/weaponpickup.ogg", 15, W_Name(WEP_GRENADE_LAUNCHER), IT_GRENADE_LAUNCHER, FL_WEAPON, weapon_pickupevalfunc, 1000);
+ StartItem ("models/weapons/g_gl.md3", "weapons/weaponpickup.wav", 15, W_Name(WEP_GRENADE_LAUNCHER), IT_GRENADE_LAUNCHER, FL_WEAPON, weapon_pickupevalfunc, 1000);
}
void weapon_electro (void) {
if(!self.ammo_cells)
self.ammo_cells = cvar("g_pickup_cells");
- StartItem ("models/weapons/g_electro.md3", "weapons/weaponpickup.ogg", 15, W_Name(WEP_ELECTRO), IT_ELECTRO, FL_WEAPON, weapon_pickupevalfunc, 1000);
+ StartItem ("models/weapons/g_electro.md3", "weapons/weaponpickup.wav", 15, W_Name(WEP_ELECTRO), IT_ELECTRO, FL_WEAPON, weapon_pickupevalfunc, 1000);
}
void weapon_crylink (void) {
if(!self.ammo_cells)
self.ammo_cells = cvar("g_pickup_cells");
- StartItem ("models/weapons/g_crylink.md3", "weapons/weaponpickup.ogg", 15, W_Name(WEP_CRYLINK), IT_CRYLINK, FL_WEAPON, weapon_pickupevalfunc, 1000);
+ StartItem ("models/weapons/g_crylink.md3", "weapons/weaponpickup.wav", 15, W_Name(WEP_CRYLINK), IT_CRYLINK, FL_WEAPON, weapon_pickupevalfunc, 1000);
}
void weapon_nex (void) {
@@ -515,14 +517,14 @@
nextime = 15 * nextime;
else
nextime = 15;
- StartItem ("models/weapons/g_nex.md3", "weapons/weaponpickup.ogg", nextime, W_Name(WEP_NEX), IT_NEX, FL_WEAPON, weapon_pickupevalfunc, 1000);
+ StartItem ("models/weapons/g_nex.md3", "weapons/weaponpickup.wav", nextime, W_Name(WEP_NEX), IT_NEX, FL_WEAPON, weapon_pickupevalfunc, 1000);
}
}
void weapon_hagar (void) {
if(!self.ammo_rockets)
self.ammo_rockets = cvar("g_pickup_rockets");
- StartItem ("models/weapons/g_hagar.md3", "weapons/weaponpickup.ogg", 15, W_Name(WEP_HAGAR), IT_HAGAR, FL_WEAPON, weapon_pickupevalfunc, 1000);
+ StartItem ("models/weapons/g_hagar.md3", "weapons/weaponpickup.wav", 15, W_Name(WEP_HAGAR), IT_HAGAR, FL_WEAPON, weapon_pickupevalfunc, 1000);
}
void weapon_rocketlauncher (void) {
@@ -531,32 +533,32 @@
} else {
if(!self.ammo_rockets)
self.ammo_rockets = g_pickup_rockets;
- StartItem ("models/weapons/g_rl.md3", "weapons/weaponpickup.ogg", 15, W_Name(WEP_ROCKET_LAUNCHER), IT_ROCKET_LAUNCHER, FL_WEAPON, weapon_pickupevalfunc, 1000);
+ StartItem ("models/weapons/g_rl.md3", "weapons/weaponpickup.wav", 15, W_Name(WEP_ROCKET_LAUNCHER), IT_ROCKET_LAUNCHER, FL_WEAPON, weapon_pickupevalfunc, 1000);
}
}
void item_rockets (void) {
if(!self.ammo_rockets)
self.ammo_rockets = g_pickup_rockets;
- StartItem ("models/items/a_rockets.md3", "misc/itempickup.ogg", 15, "rockets", IT_ROCKETS, 0, commodity_pickupevalfunc, 100);
+ StartItem ("models/items/a_rockets.md3", "misc/itempickup.wav", 15, "rockets", IT_ROCKETS, 0, commodity_pickupevalfunc, 100);
}
void item_bullets (void) {
if(!self.ammo_nails)
self.ammo_nails = g_pickup_nails;
- StartItem ("models/items/a_bullets.mdl", "misc/itempickup.ogg", 15, "bullets", IT_NAILS, 0, commodity_pickupevalfunc, 100);
+ StartItem ("models/items/a_bullets.mdl", "misc/itempickup.wav", 15, "bullets", IT_NAILS, 0, commodity_pickupevalfunc, 100);
}
void item_cells (void) {
if(!self.ammo_cells)
self.ammo_cells = g_pickup_cells;
- StartItem ("models/items/a_cells.md3", "misc/itempickup.ogg", 15, "cells", IT_CELLS, 0, commodity_pickupevalfunc, 100);
+ StartItem ("models/items/a_cells.md3", "misc/itempickup.wav", 15, "cells", IT_CELLS, 0, commodity_pickupevalfunc, 100);
}
void item_shells (void) {
if(!self.ammo_shells)
self.ammo_shells = g_pickup_shells;
- StartItem ("models/items/a_shells.md3", "misc/itempickup.ogg", 15, "shells", IT_SHELLS, 0, commodity_pickupevalfunc, 100);
+ StartItem ("models/items/a_shells.md3", "misc/itempickup.wav", 15, "shells", IT_SHELLS, 0, commodity_pickupevalfunc, 100);
}
void item_armor1 (void) {
@@ -580,7 +582,7 @@
self.max_health = g_pickup_healthshard_max;
if(!self.health)
self.health = g_pickup_healthshard;
- StartItem ("models/items/g_h1.md3", "misc/minihealth.ogg", 15, "5 Health", IT_5HP, 0, commodity_pickupevalfunc, 100);
+ StartItem ("models/items/g_h1.md3", "misc/minihealth.wav", 15, "5 Health", IT_5HP, 0, commodity_pickupevalfunc, 100);
}
void item_health25 (void) {
@@ -588,7 +590,7 @@
self.max_health = g_pickup_health_max;
if(!self.health)
self.health = g_pickup_health;
- StartItem ("models/items/g_h25.md3", "misc/mediumhealth.ogg", 15, "25 Health", IT_25HP, 0, commodity_pickupevalfunc, 500);
+ StartItem ("models/items/g_h25.md3", "misc/mediumhealth.wav", 15, "25 Health", IT_25HP, 0, commodity_pickupevalfunc, 500);
}
void item_health100 (void) {
@@ -605,7 +607,7 @@
self.max_health = g_pickup_healthmega_max;
if(!self.health)
self.health = g_pickup_healthmega;
- StartItem ("models/items/g_h100.md3", "misc/megahealth.ogg", 30, "100 Health", IT_HEALTH, 0, commodity_pickupevalfunc, 2000);
+ StartItem ("models/items/g_h100.md3", "misc/megahealth.wav", 30, "100 Health", IT_HEALTH, 0, commodity_pickupevalfunc, 2000);
}
}
@@ -620,7 +622,7 @@
minstagib_items(IT_STRENGTH);
} else {
self.strength_finished = 30;
- self.effects = EF_ADDITIVE;StartItem ("models/items/g_strength.md3", "misc/powerup.ogg", 120, "Strength Powerup", IT_STRENGTH, FL_POWERUP, generic_pickupevalfunc, 10000);
+ self.effects = EF_ADDITIVE;StartItem ("models/items/g_strength.md3", "misc/powerup.wav", 120, "Strength Powerup", IT_STRENGTH, FL_POWERUP, generic_pickupevalfunc, 10000);
}
}
@@ -636,7 +638,7 @@
} else {
self.invincible_finished = 30;
self.effects = EF_ADDITIVE;
- StartItem ("models/items/g_invincible.md3", "misc/powerup_shield.ogg", 120, "Invulnerability", IT_INVINCIBLE, FL_POWERUP, generic_pickupevalfunc, 10000);
+ StartItem ("models/items/g_invincible.md3", "misc/powerup_shield.wav", 120, "Invulnerability", IT_INVINCIBLE, FL_POWERUP, generic_pickupevalfunc, 10000);
}
}
//void item_speed (void) {self.speed_finished = 30;StartItem ("models/items/g_speed.md3", "misc/powerup.wav", 120, "Speed Powerup", IT_SPEED, FL_POWERUP, generic_pickupevalfunc, 10000);}
Modified: branches/nexuiz-2.0/data/qcsrc/server/t_jumppads.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/t_jumppads.qc 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/qcsrc/server/t_jumppads.qc 2007-05-02 18:31:12 UTC (rev 2456)
@@ -14,7 +14,7 @@
tgt - target entity (can be either a point or a model entity; if it is
the latter, its midpoint is used)
ht - jump height, measured from the higher one of org and tgt's midpoint
-
+
Returns: velocity for the jump
the global trigger_push_calculatevelocity_flighttime is set to the total
jump time
@@ -50,7 +50,7 @@
z(t) = t * vz - 1/2 grav t^2
and solved for:
-
+
s(ti) = sdist
z(ti) = zdist
max(z, ti) = jumpheight
@@ -78,7 +78,7 @@
trajsign = +1;
else
trajsign = -1;
-
+
// >0: the lower speed that achieves "it"
// (parabola's maximum inside the jump)
// <0: the higher speed that achieves "it"
@@ -129,7 +129,7 @@
{
if(self.pushltime < time) // prevent "snorring" sound when a player hits the jumppad more than once
{
- sound (other, CHAN_ITEM, "misc/jumppad.ogg", 1, ATTN_NORM);
+ sound (other, CHAN_ITEM, "misc/jumppad.wav", 1, ATTN_NORM);
self.pushltime = time + 0.5;
}
if(clienttype(other) == CLIENTTYPE_REAL)
Modified: branches/nexuiz-2.0/data/qcsrc/server/t_teleporters.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/t_teleporters.qc 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/qcsrc/server/t_teleporters.qc 2007-05-02 18:31:12 UTC (rev 2456)
@@ -66,11 +66,11 @@
return;
// Make teleport effect where the player left
- sound (other, CHAN_ITEM, "misc/teleport.ogg", 1, ATTN_NORM);
+ sound (other, CHAN_ITEM, "misc/teleport.wav", 1, ATTN_NORM);
te_teleport (other.origin);
// Make teleport effect where the player arrived
- sound (other, CHAN_ITEM, "misc/teleport.ogg", 1, ATTN_NORM);
+ sound (other, CHAN_ITEM, "misc/teleport.wav", 1, ATTN_NORM);
makevectors (self.enemy.mangle);
te_teleport (self.enemy.origin + v_forward * 32);
@@ -102,7 +102,7 @@
Damage (other, self, other, 10000, DEATH_TELEFRAG, other.origin, '0 0 0');
}
}
-
+
// hide myself for 0.2 seconds
other.effects = other.effects | EF_NODRAW;
if (other.weaponentity) // misuse FL_FLY to avoid EF_NODRAW on viewmodel
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_crylink.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_crylink.qc 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_crylink.qc 2007-05-02 18:31:12 UTC (rev 2456)
@@ -75,7 +75,7 @@
if (cvar("g_use_ammunition"))
self.ammo_cells = self.ammo_cells - cvar("g_balance_crylink_primary_ammo");
- W_SetupShot (self, '15 8 -8', FALSE, 2, "weapons/crylink_fire.ogg");
+ W_SetupShot (self, '15 8 -8', FALSE, 2, "weapons/crylink_fire.wav");
te_smallflash(w_shotorg);
shots = cvar("g_balance_crylink_primary_shots");
@@ -120,7 +120,7 @@
if (cvar("g_use_ammunition"))
self.ammo_cells = self.ammo_cells - cvar("g_balance_crylink_secondary_ammo");
- W_SetupShot (self, '15 8 -8', FALSE, 2, "weapons/crylink_fire.ogg");
+ W_SetupShot (self, '15 8 -8', FALSE, 2, "weapons/crylink_fire.wav");
te_smallflash(w_shotorg);
shots = cvar("g_balance_crylink_secondary_shots");
@@ -164,8 +164,8 @@
{
if (cvar("g_use_ammunition"))
self.ammo_cells = self.ammo_cells - cvar("g_balance_crylink_primary_ammo");
- //W_SetupShot(self, '10 5 -14', TRUE, 0, "weapons/crylink_fire.ogg");
- W_SetupShot (self, '15 7 -8', TRUE, 0, "weapons/crylink_fire.ogg");
+ //W_SetupShot(self, '10 5 -14', TRUE, 0, "weapons/crylink_fire.wav");
+ W_SetupShot (self, '15 7 -8', TRUE, 0, "weapons/crylink_fire.wav");
// use traceline_hitcorpse to make sure it can hit gibs and corpses too
traceline_hitcorpse(self, w_shotorg, w_shotorg + w_shotdir * 1000, FALSE, self);
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc 2007-05-02 18:31:12 UTC (rev 2456)
@@ -18,7 +18,7 @@
RadiusDamage (self, self.owner, cvar("g_balance_electro_secondary_damage"), cvar("g_balance_electro_secondary_edgedamage"), cvar("g_balance_electro_secondary_radius"), world, cvar("g_balance_electro_secondary_force"), IT_ELECTRO);
else
RadiusDamage (self, self.owner, cvar("g_balance_electro_primary_damage"), cvar("g_balance_electro_primary_edgedamage"), cvar("g_balance_electro_primary_radius"), world, cvar("g_balance_electro_primary_force"), IT_ELECTRO);
- sound (self, CHAN_BODY, "weapons/electro_impact.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_BODY, "weapons/electro_impact.wav", 1, ATTN_NORM);
remove (self);
}
@@ -29,7 +29,7 @@
org2 = findbetterlocation (self.origin, 8);
te_spikequad(self.origin);
- sound (self, CHAN_BODY, "weapons/electro_impact_combo.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_BODY, "weapons/electro_impact_combo.wav", 1, ATTN_NORM);
self.event_damage = SUB_Null;
RadiusDamage (self, self.owner, cvar("g_balance_electro_combo_damage"), cvar("g_balance_electro_combo_edgedamage"), cvar("g_balance_electro_combo_radius"), world, cvar("g_balance_electro_combo_force"), IT_ELECTRO);
@@ -48,7 +48,7 @@
if (other.takedamage == DAMAGE_AIM) {
W_Plasma_Explode ();
} else {
- sound (self, CHAN_IMPACT, "weapons/electro_bounce.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_IMPACT, "weapons/electro_bounce.wav", 1, ATTN_NORM);
}
}
@@ -86,7 +86,7 @@
{
local entity proj;
- W_SetupShot (self, '15 8 -8', FALSE, 2, "weapons/electro_fire.ogg");
+ W_SetupShot (self, '15 8 -8', FALSE, 2, "weapons/electro_fire.wav");
proj = spawn ();
proj.classname = "plasma_prim";
@@ -118,7 +118,7 @@
{
local entity proj;
- W_SetupShot (self, '15 8 -8', FALSE, 2, "weapons/electro_fire2.ogg");
+ W_SetupShot (self, '15 8 -8', FALSE, 2, "weapons/electro_fire2.wav");
proj = spawn ();
proj.classname = "plasma";
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_grenadelauncher.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_grenadelauncher.qc 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_grenadelauncher.qc 2007-05-02 18:31:12 UTC (rev 2456)
@@ -5,7 +5,7 @@
org2 = findbetterlocation (self.origin, 12);
te_explosion (org2);
//effect (org2, "models/sprites/grenexpl.spr", 0, 12, 35);
- sound (self, CHAN_BODY, "weapons/grenade_impact.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_BODY, "weapons/grenade_impact.wav", 1, ATTN_NORM);
self.event_damage = SUB_Null;
RadiusDamage (self, self.owner, cvar("g_balance_grenadelauncher_primary_damage"), cvar("g_balance_grenadelauncher_primary_edgedamage"), cvar("g_balance_grenadelauncher_primary_radius"), world, cvar("g_balance_grenadelauncher_primary_force"), IT_GRENADE_LAUNCHER);
@@ -19,7 +19,7 @@
org2 = findbetterlocation (self.origin, 12);
te_explosion (org2);
//effect (org2, "models/sprites/grenexpl.spr", 0, 12, 35);
- sound (self, CHAN_BODY, "weapons/grenade_impact.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_BODY, "weapons/grenade_impact.wav", 1, ATTN_NORM);
self.event_damage = SUB_Null;
RadiusDamage (self, self.owner, cvar("g_balance_grenadelauncher_secondary_damage"), cvar("g_balance_grenadelauncher_secondary_edgedamage"), cvar("g_balance_grenadelauncher_secondary_radius"), world, cvar("g_balance_grenadelauncher_secondary_force"), IT_GRENADE_LAUNCHER);
@@ -51,17 +51,17 @@
float r;
r = random() * 6;
if(r < 1)
- sound (self, CHAN_IMPACT, "weapons/grenade_bounce1.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_IMPACT, "weapons/grenade_bounce1.wav", 1, ATTN_NORM);
else if(r < 2)
- sound (self, CHAN_IMPACT, "weapons/grenade_bounce2.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_IMPACT, "weapons/grenade_bounce2.wav", 1, ATTN_NORM);
else if(r < 3)
- sound (self, CHAN_IMPACT, "weapons/grenade_bounce3.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_IMPACT, "weapons/grenade_bounce3.wav", 1, ATTN_NORM);
else if(r < 4)
- sound (self, CHAN_IMPACT, "weapons/grenade_bounce4.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_IMPACT, "weapons/grenade_bounce4.wav", 1, ATTN_NORM);
else if(r < 5)
- sound (self, CHAN_IMPACT, "weapons/grenade_bounce5.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_IMPACT, "weapons/grenade_bounce5.wav", 1, ATTN_NORM);
else
- sound (self, CHAN_IMPACT, "weapons/grenade_bounce6.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_IMPACT, "weapons/grenade_bounce6.wav", 1, ATTN_NORM);
}
}
@@ -81,7 +81,7 @@
if (cvar("g_use_ammunition"))
self.ammo_rockets = self.ammo_rockets - cvar("g_balance_grenadelauncher_primary_ammo");
- W_SetupShot (self, '15 8 -8', FALSE, 4, "weapons/grenade_fire.ogg");
+ W_SetupShot (self, '15 8 -8', FALSE, 4, "weapons/grenade_fire.wav");
gren = spawn ();
gren.owner = self;
@@ -112,7 +112,7 @@
if (cvar("g_use_ammunition"))
self.ammo_rockets = self.ammo_rockets - cvar("g_balance_grenadelauncher_secondary_ammo");
- W_SetupShot (self, '15 8 -8', FALSE, 4, "weapons/grenade_fire.ogg");
+ W_SetupShot (self, '15 8 -8', FALSE, 4, "weapons/grenade_fire.wav");
gren = spawn ();
gren.owner = self;
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_hagar.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_hagar.qc 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_hagar.qc 2007-05-02 18:31:12 UTC (rev 2456)
@@ -7,11 +7,11 @@
//effect (org2, "models/sprites/hagar.spr", 0, 12, 35);
b = crandom();
if (b<-0.7)
- sound (self, CHAN_BODY, "weapons/hagexp1.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_BODY, "weapons/hagexp1.wav", 1, ATTN_NORM);
else if (b<0.4)
- sound (self, CHAN_BODY, "weapons/hagexp2.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_BODY, "weapons/hagexp2.wav", 1, ATTN_NORM);
else if (b<1)
- sound (self, CHAN_BODY, "weapons/hagexp3.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_BODY, "weapons/hagexp3.wav", 1, ATTN_NORM);
self.event_damage = SUB_Null;
RadiusDamage (self, self.owner, cvar("g_balance_hagar_primary_damage"), cvar("g_balance_hagar_primary_edgedamage"), cvar("g_balance_hagar_primary_radius"), world, cvar("g_balance_hagar_primary_force"), IT_HAGAR);
@@ -28,11 +28,11 @@
//effect (org2, "models/sprites/hagar.spr", 0, 12, 35);
b = crandom();
if (b<-0.7)
- sound (self, CHAN_BODY, "weapons/hagexp1.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_BODY, "weapons/hagexp1.wav", 1, ATTN_NORM);
else if (b<0.4)
- sound (self, CHAN_BODY, "weapons/hagexp2.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_BODY, "weapons/hagexp2.wav", 1, ATTN_NORM);
else if (b<1)
- sound (self, CHAN_BODY, "weapons/hagexp3.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_BODY, "weapons/hagexp3.wav", 1, ATTN_NORM);
self.event_damage = SUB_Null;
RadiusDamage (self, self.owner, cvar("g_balance_hagar_secondary_damage"), cvar("g_balance_hagar_secondary_edgedamage"), cvar("g_balance_hagar_secondary_radius"), world, cvar("g_balance_hagar_secondary_force"), IT_HAGAR);
@@ -81,7 +81,7 @@
if (cvar("g_use_ammunition"))
self.ammo_rockets = self.ammo_rockets - cvar("g_balance_hagar_primary_ammo");
- W_SetupShot (self, '15 5 -8', FALSE, 2, "weapons/hagar_fire.ogg");
+ W_SetupShot (self, '15 5 -8', FALSE, 2, "weapons/hagar_fire.wav");
missile = spawn ();
missile.owner = self;
@@ -116,7 +116,7 @@
if (cvar("g_use_ammunition"))
self.ammo_rockets = self.ammo_rockets - cvar("g_balance_hagar_secondary_ammo");
- W_SetupShot (self, '15 5 -8', FALSE, 2, "weapons/hagar_fire.ogg");
+ W_SetupShot (self, '15 5 -8', FALSE, 2, "weapons/hagar_fire.wav");
missile = spawn ();
missile.owner = self;
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_laser.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_laser.qc 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_laser.qc 2007-05-02 18:31:12 UTC (rev 2456)
@@ -25,7 +25,7 @@
RadiusDamage (self, self.owner, cvar("g_balance_laser_secondary_damage"), cvar("g_balance_laser_secondary_edgedamage"), cvar("g_balance_laser_secondary_radius"), world, cvar("g_balance_laser_secondary_force"), IT_LASER);
else
RadiusDamage (self, self.owner, cvar("g_balance_laser_primary_damage"), cvar("g_balance_laser_primary_edgedamage"), cvar("g_balance_laser_primary_radius"), world, cvar("g_balance_laser_primary_force"), IT_LASER);
- sound (self, CHAN_BODY, "weapons/laserimpact.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_BODY, "weapons/laserimpact.wav", 1, ATTN_NORM);
remove (self);
}
@@ -34,7 +34,7 @@
{
local entity missile;
- W_SetupShot (self, '15 8 -8', FALSE, 3, "weapons/lasergun_fire.ogg");
+ W_SetupShot (self, '15 8 -8', FALSE, 3, "weapons/lasergun_fire.wav");
//te_customflash(w_shotorg, 160, 0.2, '1 0 0');
missile = spawn ();
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_nex.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_nex.qc 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_nex.qc 2007-05-02 18:31:12 UTC (rev 2456)
@@ -2,7 +2,7 @@
void W_Nex_Attack (void)
{
//w_shotorg = self.origin + self.view_ofs + v_forward * 5 + v_right * 14 + v_up * -7;
- W_SetupShot(self, '5 14 -8', TRUE, 5, "weapons/nexfire.ogg");
+ W_SetupShot(self, '5 14 -8', TRUE, 5, "weapons/nexfire.wav");
// assure that nexdamage is high enough in minstagib
if (cvar("g_minstagib"))
@@ -29,7 +29,7 @@
if (trace_ent.solid == SOLID_BSP && !(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT))
te_plasmaburn (trace_endpos - w_shotdir * 6);
// play a sound
- PointSound (trace_endpos, "weapons/neximpact.ogg", 1, ATTN_NORM);
+ PointSound (trace_endpos, "weapons/neximpact.wav", 1, ATTN_NORM);
if (cvar("g_use_ammunition") && !cvar("g_instagib"))
{
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc 2007-05-02 18:31:12 UTC (rev 2456)
@@ -4,7 +4,7 @@
void W_Rocket_Explode (void)
{
vector org2;
- sound (self, CHAN_BODY, "weapons/rocket_impact.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_BODY, "weapons/rocket_impact.wav", 1, ATTN_NORM);
org2 = findbetterlocation (self.origin, 16);
//te_explosion (org2);
@@ -158,6 +158,7 @@
olddir = normalize(self.velocity); // get my current direction
newdir = normalize((olddir + desireddir * turnrate) * 0.5); // take the average of the 2 directions; not the best method but simple & easy
self.velocity = newdir * velspeed; // make me fly in the new direction at my flight speed
+ self.angles = vectoangles(self.velocity); // turn model in the new flight direction
self.owner.attack_finished = time + 0.2;
}
@@ -203,7 +204,7 @@
if (cvar("g_use_ammunition") && !cvar("g_rocketarena"))
self.ammo_rockets = self.ammo_rockets - cvar("g_balance_rocketlauncher_ammo");
- W_SetupShot (self, '15 3 -8', FALSE, 5, "weapons/rocket_fire.ogg");
+ W_SetupShot (self, '15 3 -8', FALSE, 5, "weapons/rocket_fire.wav");
te_smallflash(w_shotorg);
missile = spawn ();
@@ -248,7 +249,7 @@
flash.customizeentityforclient = CL_Weaponentity_CustomizeEntityForClient;
setorigin (flash, '35 5 -12');
setmodel (flash, "models/flash.md3"); // precision set below
- setattachment(flash, self.weaponentity, "bone01");
+ setattachment(flash, self.weaponentity, "bone01");
SUB_SetFade (flash, time, 0.4);
// muzzle flash for 3rd person view
@@ -258,7 +259,7 @@
flash2.angles_z = 90;
setorigin (flash2, '42 0 5');
setmodel (flash2, "models/flash.md3"); // precision set below
- setattachment(flash2, self.exteriorweaponentity, "");
+ setattachment(flash2, self.exteriorweaponentity, "");
SUB_SetFade (flash2, time, 0.4);
// common properties
@@ -374,7 +375,7 @@
if(time > self.rl_sound)
{
self.rl_sound = time + 1;
- sound (self, CHAN_BODY, "weapons/rocket_det.ogg", 0.5, ATTN_NORM);
+ sound (self, CHAN_BODY, "weapons/rocket_det.wav", 0.5, ATTN_NORM);
}
if (self.button3)
if(cvar("g_laserguided_missile"))
@@ -382,7 +383,7 @@
{
self.exteriorweaponentity.attack_finished = time + 0.4;
self.laser_on = !self.laser_on;
- sound (self, CHAN_AUTO, "weapons/tink1.ogg", 1, ATTN_NORM);
+ sound (self, CHAN_AUTO, "weapons/tink1.wav", 1, ATTN_NORM);
}
}
else if (req == WR_SETUP)
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_shotgun.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_shotgun.qc 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_shotgun.qc 2007-05-02 18:31:12 UTC (rev 2456)
@@ -12,7 +12,7 @@
f = cvar("g_balance_shotgun_primary_force");
spread = cvar("g_balance_shotgun_primary_spread");
- W_SetupShot (self, '15 8 -8', TRUE, 5, "weapons/shotgun_fire.ogg");
+ W_SetupShot (self, '15 8 -8', TRUE, 5, "weapons/shotgun_fire.wav");
for (sc = 0;sc < bullets;sc = sc + 1)
fireBullet (w_shotorg, w_shotdir, spread, d, f, IT_SHOTGUN, sc < 3);
if (cvar("g_use_ammunition"))
@@ -39,7 +39,7 @@
f = cvar("g_balance_shotgun_secondary_force");
spread = cvar("g_balance_shotgun_secondary_spread");
- W_SetupShot (self, '15 8 -8', TRUE, 5, "weapons/shotgun_fire.ogg");
+ W_SetupShot (self, '15 8 -8', TRUE, 5, "weapons/shotgun_fire.wav");
for (sc = 0;sc < bullets;sc = sc + 1)
fireBullet (w_shotorg, w_shotdir, spread, d, f, IT_SHOTGUN, sc < 3);
if (cvar("g_use_ammunition"))
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_uzi.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_uzi.qc 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_uzi.qc 2007-05-02 18:31:12 UTC (rev 2456)
@@ -10,7 +10,7 @@
else
self.ammo_nails = self.ammo_nails - cvar("g_balance_uzi_sustained_ammo");
}
- W_SetupShot (self, '15 5.5 -8', TRUE, 0, "weapons/uzi_fire.ogg");
+ W_SetupShot (self, '15 5.5 -8', TRUE, 0, "weapons/uzi_fire.wav");
if (!cvar("g_norecoil"))
{
self.punchangle_x = random () - 0.5;
Modified: branches/nexuiz-2.0/data/scripts/stralenex1.shader
===================================================================
--- branches/nexuiz-2.0/data/scripts/stralenex1.shader 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/scripts/stralenex1.shader 2007-05-02 18:31:12 UTC (rev 2456)
@@ -1,328 +1,329 @@
-textures/evil8_lights/e8minitrimlight
-{
- qer_editorimage textures/evil8_lights/e8minitrimlight.tga
- q3map_lightimage textures/evil8_lights/e8minitrimlight.blend.tga
- surfaceparm nomarks
- q3map_surfacelight 1200
- {
- map textures/evil8_lights/e8minitrimlight.tga
- }
- {
- map $lightmap
- blendfunc filter
- tcGen lightmap
- }
- {
- map textures/evil8_lights/e8minitrimlight.blend.tga
- blendfunc add
- }
-}
-textures/evil8_lights/e8tinylight2k
-{
- qer_editorimage textures/evil8_lights/e8tinylight.tga
- q3map_lightimage textures/evil8_lights/e8tinylightcolor.tga
- surfaceparm nomarks
- q3map_surfacelight 2000
- {
- map textures/evil8_lights/e8tinylight.tga
- }
- {
- map $lightmap
- blendfunc filter
- tcGen lightmap
- }
- {
- map textures/evil8_lights/e8tinylight.blend.tga
- blendfunc add
- }
-}
-
-textures/evil8_lights/e8tinylightblue2k
-{
- qer_editorimage textures/evil8_lights/e8tinylightblue.tga
- q3map_lightimage textures/evil8_lights/e8tinylightbluecolor.tga
- surfaceparm nomarks
- q3map_surfacelight 2000
- {
- map textures/evil8_lights/e8tinylightblue.tga
- }
- {
- map $lightmap
- blendfunc filter
- tcGen lightmap
- }
- {
- map textures/evil8_lights/e8tinylightblue.blend.tga
- blendfunc add
- }
-}
-
-textures/stralenex1/light_tube_green
-{
- qer_editorimage textures/stralenex1/light_tube_green.tga
- q3map_lightimage textures/stralenex1/light_tube_green_glow.tga
- q3map_surfacelight 1000
- {
- map textures/stralenex1/light_tube_green.tga
- //blendfunc add
- tcmod scale 12 1
- //rgbGen identity
-
-
+textures/evil8_lights/e8minitrimlight
+{
+ qer_editorimage textures/evil8_lights/e8minitrimlight.tga
+ q3map_lightimage textures/evil8_lights/e8minitrimlight.blend.tga
+ surfaceparm nomarks
+ q3map_surfacelight 1200
+ {
+ map textures/evil8_lights/e8minitrimlight.tga
}
- {
- map $lightmap
- rgbGen identity
- }
-}
-
-
-textures/stralenex1/e8_bluestrip
-{
- surfaceparm nolightmap
- surfaceparm nomarks
- surfaceparm trans
- {
- map textures/stralenex1/e8_bluestrip.tga
- blendfunc add
- rgbGen identity
- }
-}
-
-textures/stralenex1/e8_redstrip
-{
- surfaceparm nolightmap
- surfaceparm nomarks
- surfaceparm trans
- {
- map textures/stralenex1/e8_redstrip.tga
- blendfunc add
- rgbGen identity
- }
-}
-
-textures/stralenex1/stralenex5_water
-{
- qer_editorimage textures/stralenex1/stralenex5_water.tga
- qer_trans 0.5
-
- surfaceparm trans
- surfaceparm nonsolid
- surfaceparm water
-
- deformVertexes wave 150.0 sin 2 5 0.25 0.1
- Q3map_TessSize 128
- cull none
-
- {
- map textures/stralenex1/stralenex5_water.tga
- blendFunc add
- rgbGen identity
- }
-}
-
-textures/stralenex1/e6xrst_supprt
-{
- qer_editorimage textures/stralenex1/e6xrst_supprt.tga
- surfaceparm nomarks
- surfaceparm trans
- cull none
- nopicmip
- {
- map textures/stralenex1/e6xrst_supprt.tga
- rgbGen identity
- depthWrite
- alphaFunc GE128
- }
- {
- map $lightmap
- blendfunc filter
- rgbGen identity
- tcGen lightmap
- depthFunc equal
- }
-}
-
-
-textures/stralenex1/strale_grey_box
-{
- qer_editorimage env/strale_grey/ygrey_up.tga
-
- surfaceparm nolightmap
- surfaceparm noimpact
- surfaceparm nomarks
- surfaceparm sky
-
- skyparms env/strale_grey/ygrey - -
- q3map_surfacelight 60
- q3map_lightimage textures/strale_grey/ygrey_up.tga
- q3map_sun .9 .9 1 70 65 78
-
-}
-
-textures/stralenex1/strale_brown_box
-{
- qer_editorimage env/strale_grey/ygrey_up.tga
-
- surfaceparm nolightmap
- surfaceparm noimpact
- surfaceparm nomarks
- surfaceparm sky
-
- skyparms env/strale_grey/ygrey - -
- q3map_surfacelight 100
- q3map_lightimage textures/strale_grey/ygrey_up.tga
- q3map_sun .75 .65 .6 130 255 80
-
-}
-
-textures/stralenex1/greennebula
-{
- qer_editorimage env/stralenex5/greennebula_bk.tga
-
- surfaceparm nolightmap
- surfaceparm noimpact
- surfaceparm nomarks
- surfaceparm sky
-
- skyparms env/stralenex5/greennebula - -
- q3map_surfacelight 80
- q3map_lightimage textures/stralenex5/stralenex5_up.tga
- q3map_sun 0.3 0.33 0.3 60 80 20
- /*q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>*/
-
-}
-
-textures/stralenex1/stralenex5
-{
- qer_editorimage env/stralenex5/stralenex5_up.tga
-
- surfaceparm nolightmap
- surfaceparm noimpact
- surfaceparm nomarks
- surfaceparm sky
-
- skyparms env/stralenex5/stralenex5 - -
- q3map_surfacelight 60
- q3map_lightimage textures/stralenex5/stralenex5_up.tga
- q3map_sun .627 .525 0.392 60 300 40
- /*q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>*/
-
+ {
+ map $lightmap
+ blendfunc filter
+ tcGen lightmap
+ }
+ {
+ map textures/evil8_lights/e8minitrimlight.blend.tga
+ blendfunc add
+ }
}
+textures/evil8_lights/e8tinylight2k
+{
+ qer_editorimage textures/evil8_lights/e8tinylight.tga
+ q3map_lightimage textures/evil8_lights/e8tinylightcolor.tga
+ surfaceparm nomarks
+ q3map_surfacelight 2000
+ {
+ map textures/evil8_lights/e8tinylight.tga
+ }
+ {
+ map $lightmap
+ blendfunc filter
+ tcGen lightmap
+ }
+ {
+ map textures/evil8_lights/e8tinylight.blend.tga
+ blendfunc add
+ }
+}
-textures/stralenex1/stralenex5_1
-{
- qer_editorimage env/stralenex5/stralenex5_up.tga
-
- surfaceparm nolightmap
- surfaceparm noimpact
- surfaceparm nomarks
- surfaceparm sky
-
- skyparms env/stralenex5/stralenex5 - -
- q3map_surfacelight 60
- q3map_lightimage textures/stralenex5/stralenex5_up.tga
- q3map_sun .627 .525 0.392 450 60 13
- /*q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>*/
-
+textures/evil8_lights/e8tinylightblue2k
+{
+ qer_editorimage textures/evil8_lights/e8tinylightblue.tga
+ q3map_lightimage textures/evil8_lights/e8tinylightbluecolor.tga
+ surfaceparm nomarks
+ q3map_surfacelight 2000
+ {
+ map textures/evil8_lights/e8tinylightblue.tga
+ }
+ {
+ map $lightmap
+ blendfunc filter
+ tcGen lightmap
+ }
+ {
+ map textures/evil8_lights/e8tinylightblue.blend.tga
+ blendfunc add
+ }
}
-textures/stralenex1/stralenex5_2
-{
- qer_editorimage env/stralenex5/stralenex5_up.tga
-
- surfaceparm nolightmap
- surfaceparm noimpact
- surfaceparm nomarks
- surfaceparm sky
-
- skyparms env/stralenex5/stralenex5 - -
- q3map_surfacelight 180
- q3map_lightimage textures/stralenex5/stralenex5_up.tga
- q3map_sun .627 .525 0.392 450 60 13
- /*q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>*/
-
-}
-
-//copied from harlequin-sky.shader
-textures/harlequin_sky/strale_jf-nebula_sky
-{
- qer_editorimage textures/harlequin_sky/nebula_qer1.tga
- surfaceparm sky
- surfaceparm noimpact
- surfaceparm nolightmap
- surfaceparm nomarks
-
- skyparms textures/harlequin_sky/env/nebular - -
- q3map_surfacelight 45
-// note: Change the surfacelight value if you want more ambient light from the sky.
- q3map_sun 0.88 .71 .71 80 0 90
-// note: Change the fourth value (80) if you want a brighter or dimmer sun
-
-}
-
-textures/stralenex1/stralenex_trimlight
-{
- qer_editorimage textures/stralenex1/stralenex_trimlight.tga
- q3map_lightimage textures/stralenex1/stralenex_trimlight_glow.tga
- q3map_surfacelight 1800
- surfaceparm nomarks
- {
- map $lightmap
- rgbGen identity
- }
- {
- map textures/stralenex1/stralenex_trimlight.tga
- blendFunc GL_DST_COLOR GL_ZERO
- rgbGen identity
- }
- {
- map textures/stralenex1/stralenex_trimlight_glow.tga
- blendfunc GL_ONE GL_ONE
- rgbGen identityLighting
- }
-}
-
-textures/stralenex1/stralenex_roundlight
-{
- qer_editorimage textures/stralenex1/stralenex_roundlight.tga
- q3map_lightimage textures/stralenex1/stralenex_roundlight_glow.tga
- q3map_surfacelight 4000
- surfaceparm nomarks
- {
- map $lightmap
- rgbGen identity
- }
- {
- map textures/stralenex1/stralenex_roundlight.tga
- blendFunc GL_DST_COLOR GL_ZERO
- rgbGen identity
- }
- {
- map textures/stralenex1/stralenex_roundlight_glow.tga
- blendfunc GL_ONE GL_ONE
- rgbGen wave sin .3 .1 0 0.5
- }
-}
-
-textures/evil8_lights/e8trimlight
-{
- qer_editorimage textures/evil8_lights/e8trimlight.tga
- q3map_lightimage textures/evil8_lights/e8trimlight_glow.tga
- q3map_surfacelight 2000
- surfaceparm nomarks
- {
- map $lightmap
- rgbGen identity
- }
- {
- map textures/evil8_lights/e8trimlight.tga
- blendFunc GL_DST_COLOR GL_ZERO
- rgbGen identity
- }
- {
- map textures/evil8_lights/e8trimlight_glow.tga
- blendfunc GL_ONE GL_ONE
- rgbGen identityLighting
- }
-}
+textures/stralenex1/light_tube_green
+{
+ qer_editorimage textures/stralenex1/light_tube_green.tga
+ q3map_lightimage textures/stralenex1/light_tube_green_glow.tga
+ q3map_surfacelight 1000
+ {
+ map textures/stralenex1/light_tube_green.tga
+ //blendfunc add
+ tcmod scale 12 1
+ //rgbGen identity
+
+
+ }
+ {
+ map $lightmap
+ rgbGen identity
+ }
+}
+
+
+textures/stralenex1/e8_bluestrip
+{
+ surfaceparm nolightmap
+ surfaceparm nomarks
+ surfaceparm trans
+ {
+ map textures/stralenex1/e8_bluestrip.tga
+ blendfunc add
+ rgbGen identity
+ }
+}
+
+textures/stralenex1/e8_redstrip
+{
+ surfaceparm nolightmap
+ surfaceparm nomarks
+ surfaceparm trans
+ {
+ map textures/stralenex1/e8_redstrip.tga
+ blendfunc add
+ rgbGen identity
+ }
+}
+
+textures/stralenex1/stralenex5_water
+{
+ qer_editorimage textures/stralenex1/stralenex5_water.tga
+ qer_trans 0.5
+
+ surfaceparm trans
+ surfaceparm nonsolid
+ surfaceparm water
+
+ deformVertexes wave 150.0 sin 2 5 0.25 0.1
+ Q3map_TessSize 128
+ cull none
+
+ {
+ map textures/stralenex1/stralenex5_water.tga
+ blendFunc add
+ rgbGen identity
+ }
+}
+
+textures/stralenex1/e6xrst_supprt
+{
+ qer_editorimage textures/stralenex1/e6xrst_supprt.tga
+ surfaceparm nomarks
+ surfaceparm trans
+ cull none
+ nopicmip
+ {
+ map textures/stralenex1/e6xrst_supprt.tga
+ rgbGen identity
+ depthWrite
+ //alphaFunc GE128
+ blendfunc blend
+ }
+ {
+ map $lightmap
+ blendfunc filter
+ rgbGen identity
+ tcGen lightmap
+ depthFunc equal
+ }
+}
+
+
+textures/stralenex1/strale_grey_box
+{
+ qer_editorimage env/strale_grey/ygrey_up.tga
+
+ surfaceparm nolightmap
+ surfaceparm noimpact
+ surfaceparm nomarks
+ surfaceparm sky
+
+ skyparms env/strale_grey/ygrey - -
+ q3map_surfacelight 60
+ q3map_lightimage textures/strale_grey/ygrey_up.tga
+ q3map_sun .9 .9 1 70 65 78
+
+}
+
+textures/stralenex1/strale_brown_box
+{
+ qer_editorimage env/strale_grey/ygrey_up.tga
+
+ surfaceparm nolightmap
+ surfaceparm noimpact
+ surfaceparm nomarks
+ surfaceparm sky
+
+ skyparms env/strale_grey/ygrey - -
+ q3map_surfacelight 100
+ q3map_lightimage textures/strale_grey/ygrey_up.tga
+ q3map_sun .75 .65 .6 130 255 80
+
+}
+
+textures/stralenex1/greennebula
+{
+ qer_editorimage env/stralenex5/greennebula_bk.tga
+
+ surfaceparm nolightmap
+ surfaceparm noimpact
+ surfaceparm nomarks
+ surfaceparm sky
+
+ skyparms env/stralenex5/greennebula - -
+ q3map_surfacelight 80
+ q3map_lightimage textures/stralenex5/stralenex5_up.tga
+ q3map_sun 0.3 0.33 0.3 60 80 20
+ /*q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>*/
+
+}
+
+textures/stralenex1/stralenex5
+{
+ qer_editorimage env/stralenex5/stralenex5_up.tga
+
+ surfaceparm nolightmap
+ surfaceparm noimpact
+ surfaceparm nomarks
+ surfaceparm sky
+
+ skyparms env/stralenex5/stralenex5 - -
+ q3map_surfacelight 60
+ q3map_lightimage textures/stralenex5/stralenex5_up.tga
+ q3map_sun .627 .525 0.392 60 300 40
+ /*q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>*/
+
+}
+
+textures/stralenex1/stralenex5_1
+{
+ qer_editorimage env/stralenex5/stralenex5_up.tga
+
+ surfaceparm nolightmap
+ surfaceparm noimpact
+ surfaceparm nomarks
+ surfaceparm sky
+
+ skyparms env/stralenex5/stralenex5 - -
+ q3map_surfacelight 60
+ q3map_lightimage textures/stralenex5/stralenex5_up.tga
+ q3map_sun .627 .525 0.392 450 60 13
+ /*q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>*/
+
+}
+
+textures/stralenex1/stralenex5_2
+{
+ qer_editorimage env/stralenex5/stralenex5_up.tga
+
+ surfaceparm nolightmap
+ surfaceparm noimpact
+ surfaceparm nomarks
+ surfaceparm sky
+
+ skyparms env/stralenex5/stralenex5 - -
+ q3map_surfacelight 180
+ q3map_lightimage textures/stralenex5/stralenex5_up.tga
+ q3map_sun .627 .525 0.392 450 60 13
+ /*q3map_sun <red> <green> <blue> <intensity> <degrees> <elevation>*/
+
+}
+
+//copied from harlequin-sky.shader
+textures/harlequin_sky/strale_jf-nebula_sky
+{
+ qer_editorimage textures/harlequin_sky/nebula_qer1.tga
+ surfaceparm sky
+ surfaceparm noimpact
+ surfaceparm nolightmap
+ surfaceparm nomarks
+
+ skyparms textures/harlequin_sky/env/nebular - -
+ q3map_surfacelight 45
+// note: Change the surfacelight value if you want more ambient light from the sky.
+ q3map_sun 0.88 .71 .71 80 0 90
+// note: Change the fourth value (80) if you want a brighter or dimmer sun
+
+}
+
+textures/stralenex1/stralenex_trimlight
+{
+ qer_editorimage textures/stralenex1/stralenex_trimlight.tga
+ q3map_lightimage textures/stralenex1/stralenex_trimlight_glow.tga
+ q3map_surfacelight 1800
+ surfaceparm nomarks
+ {
+ map $lightmap
+ rgbGen identity
+ }
+ {
+ map textures/stralenex1/stralenex_trimlight.tga
+ blendFunc GL_DST_COLOR GL_ZERO
+ rgbGen identity
+ }
+ {
+ map textures/stralenex1/stralenex_trimlight_glow.tga
+ blendfunc GL_ONE GL_ONE
+ rgbGen identityLighting
+ }
+}
+
+textures/stralenex1/stralenex_roundlight
+{
+ qer_editorimage textures/stralenex1/stralenex_roundlight.tga
+ q3map_lightimage textures/stralenex1/stralenex_roundlight_glow.tga
+ q3map_surfacelight 4000
+ surfaceparm nomarks
+ {
+ map $lightmap
+ rgbGen identity
+ }
+ {
+ map textures/stralenex1/stralenex_roundlight.tga
+ blendFunc GL_DST_COLOR GL_ZERO
+ rgbGen identity
+ }
+ {
+ map textures/stralenex1/stralenex_roundlight_glow.tga
+ blendfunc GL_ONE GL_ONE
+ rgbGen wave sin .3 .1 0 0.5
+ }
+}
+
+textures/evil8_lights/e8trimlight
+{
+ qer_editorimage textures/evil8_lights/e8trimlight.tga
+ q3map_lightimage textures/evil8_lights/e8trimlight_glow.tga
+ q3map_surfacelight 2000
+ surfaceparm nomarks
+ {
+ map $lightmap
+ rgbGen identity
+ }
+ {
+ map textures/evil8_lights/e8trimlight.tga
+ blendFunc GL_DST_COLOR GL_ZERO
+ rgbGen identity
+ }
+ {
+ map textures/evil8_lights/e8trimlight_glow.tga
+ blendfunc GL_ONE GL_ONE
+ rgbGen identityLighting
+ }
+}
Modified: branches/nexuiz-2.0/data/textures/stralenex1/e6xrst_supprt.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/ultimate.cfg
===================================================================
--- branches/nexuiz-2.0/data/ultimate.cfg 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/ultimate.cfg 2007-05-02 18:31:12 UTC (rev 2456)
@@ -17,11 +17,13 @@
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_shadow_usenormalmap 1
r_shadow_gloss 1
r_shadow_realtime_dlight 1
r_shadow_realtime_dlight_shadows 1
@@ -29,3 +31,4 @@
r_shadow_realtime_world_dlightshadows 1
r_shadow_realtime_world_shadows 1
r_sky 1
+r_showsurfaces 0
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/ultra.cfg
===================================================================
--- branches/nexuiz-2.0/data/ultra.cfg 2007-05-02 18:11:32 UTC (rev 2455)
+++ branches/nexuiz-2.0/data/ultra.cfg 2007-05-02 18:31:12 UTC (rev 2456)
@@ -17,11 +17,13 @@
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
r_hdr 0
+r_shadow_usenormalmap 1
r_shadow_gloss 1
r_shadow_realtime_dlight 1
r_shadow_realtime_dlight_shadows 1
@@ -29,3 +31,4 @@
r_shadow_realtime_world_dlightshadows 1
r_shadow_realtime_world_shadows 1
r_sky 1
+r_showsurfaces 0
\ No newline at end of file
More information about the nexuiz-commits
mailing list