r5942 - in branches/nexuiz-2.0: . data data/gfx data/models/domination data/models/items data/models/weapons data/qcsrc/server data/scripts data/textures misc/mediasource/models
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Feb 24 02:13:50 EST 2009
Author: div0
Date: 2009-02-24 02:13:50 -0500 (Tue, 24 Feb 2009)
New Revision: 5942
Added:
branches/nexuiz-2.0/data/gfx/inv_weapon15.tga
branches/nexuiz-2.0/data/models/weapons/g_flamethrower.md3
branches/nexuiz-2.0/data/models/weapons/v_flamethrower.md3
branches/nexuiz-2.0/data/models/weapons/w_flamethrower.zym
branches/nexuiz-2.0/data/scripts/electro.shader
branches/nexuiz-2.0/data/scripts/flamethrower.shader
branches/nexuiz-2.0/data/scripts/shotgun.shader
branches/nexuiz-2.0/data/textures/campingrifle_screen.tga
branches/nexuiz-2.0/data/textures/domination/
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/electro_plasma.tga
branches/nexuiz-2.0/data/textures/electro_plasma_glow.tga
branches/nexuiz-2.0/data/textures/electro_plasma_hull.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/flamethrowerfx.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/glscope.tga
branches/nexuiz-2.0/data/textures/glscope_glow.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_metal_glow.tga
branches/nexuiz-2.0/data/textures/shellsammo.tga
branches/nexuiz-2.0/data/textures/shellsammo_gloss.tga
branches/nexuiz-2.0/data/textures/shellsammo_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
branches/nexuiz-2.0/data/textures/shotgun_sight.tga
branches/nexuiz-2.0/misc/mediasource/models/dom_points.zip
Removed:
branches/nexuiz-2.0/data/models/domination/dom_axe.tga
branches/nexuiz-2.0/data/models/domination/dom_axe_luma.tga
branches/nexuiz-2.0/data/models/domination/dom_bolt.tga
branches/nexuiz-2.0/data/models/domination/dom_bomb.tga
branches/nexuiz-2.0/data/models/domination/dom_neutral.tga
branches/nexuiz-2.0/data/models/domination/dom_symbol.tga
branches/nexuiz-2.0/data/models/domination/dom_symbol2.tga
branches/nexuiz-2.0/data/models/domination/dom_target.tga
branches/nexuiz-2.0/data/textures/crifleflashider.tga
branches/nexuiz-2.0/data/textures/crifleflashider_bump.tga
branches/nexuiz-2.0/data/textures/crifleflashider_gloss.tga
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/defaultNexuiz.cfg
branches/nexuiz-2.0/data/gfx/inv_weapon1.tga
branches/nexuiz-2.0/data/gfx/inv_weapon14.tga
branches/nexuiz-2.0/data/gfx/inv_weapon3.tga
branches/nexuiz-2.0/data/gfx/inv_weapon4.tga
branches/nexuiz-2.0/data/gfx/inv_weapon7.tga
branches/nexuiz-2.0/data/models/domination/dom_blue.md3
branches/nexuiz-2.0/data/models/domination/dom_pink.md3
branches/nexuiz-2.0/data/models/domination/dom_red.md3
branches/nexuiz-2.0/data/models/domination/dom_unclaimed.md3
branches/nexuiz-2.0/data/models/domination/dom_yellow.md3
branches/nexuiz-2.0/data/models/items/a_shells.md3
branches/nexuiz-2.0/data/models/weapons/g_campingrifle.md3
branches/nexuiz-2.0/data/models/weapons/g_electro.md3
branches/nexuiz-2.0/data/models/weapons/g_gl.md3
branches/nexuiz-2.0/data/models/weapons/g_hagar.md3
branches/nexuiz-2.0/data/models/weapons/g_hlac.md3
branches/nexuiz-2.0/data/models/weapons/g_shotgun.md3
branches/nexuiz-2.0/data/models/weapons/v_campingrifle.md3
branches/nexuiz-2.0/data/models/weapons/v_electro.md3
branches/nexuiz-2.0/data/models/weapons/v_gl.md3
branches/nexuiz-2.0/data/models/weapons/v_hagar.md3
branches/nexuiz-2.0/data/models/weapons/v_hlac.md3
branches/nexuiz-2.0/data/models/weapons/v_shotgun.md3
branches/nexuiz-2.0/data/models/weapons/w_campingrifle.zym
branches/nexuiz-2.0/data/models/weapons/w_crylink.zym
branches/nexuiz-2.0/data/models/weapons/w_electro.zym
branches/nexuiz-2.0/data/models/weapons/w_gl.zym
branches/nexuiz-2.0/data/models/weapons/w_hagar.zym
branches/nexuiz-2.0/data/models/weapons/w_hlac.zym
branches/nexuiz-2.0/data/models/weapons/w_hookgun.zym
branches/nexuiz-2.0/data/models/weapons/w_laser.zym
branches/nexuiz-2.0/data/models/weapons/w_nex.zym
branches/nexuiz-2.0/data/models/weapons/w_porto.zym
branches/nexuiz-2.0/data/models/weapons/w_rl.zym
branches/nexuiz-2.0/data/models/weapons/w_shotgun.zym
branches/nexuiz-2.0/data/models/weapons/w_uzi.zym
branches/nexuiz-2.0/data/qcsrc/server/constants.qh
branches/nexuiz-2.0/data/qcsrc/server/domination.qc
branches/nexuiz-2.0/data/qcsrc/server/vote.qc
branches/nexuiz-2.0/data/qcsrc/server/w_campingrifle.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_hlac.qc
branches/nexuiz-2.0/data/qcsrc/server/w_hook.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_porto.qc
branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc
branches/nexuiz-2.0/data/qcsrc/server/w_seeker.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/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/campingrifle_glow.tga
branches/nexuiz-2.0/data/textures/campingrifle_pants.tga
branches/nexuiz-2.0/data/textures/campingrifle_shirt.tga
branches/nexuiz-2.0/data/textures/f_shotgun.jpg
branches/nexuiz-2.0/data/textures/hlac_accessory.tga
branches/nexuiz-2.0/data/textures/hlac_accessory_gloss.tga
branches/nexuiz-2.0/data/textures/hlac_accessory_norm.tga
branches/nexuiz-2.0/data/textures/hlac_accessory_pants.tga
branches/nexuiz-2.0/data/textures/hlac_accessory_shirt.tga
branches/nexuiz-2.0/data/textures/hlac_metal.tga
branches/nexuiz-2.0/data/textures/rl_gloss.jpg
branches/nexuiz-2.0/data/weapons.cfg
Log:
r5929 | morphed | 2009-02-23 13:44:32 +0100 (Mon, 23 Feb 2009) | 1 line
lots of weapon content changes, new models, new animations etc.. (textures only)
r5930 | morphed | 2009-02-23 13:54:42 +0100 (Mon, 23 Feb 2009) | 1 line
lots of weapon content changes, new models, new animations etc.. (models and shaders)
r5931 | morphed | 2009-02-23 14:45:17 +0100 (Mon, 23 Feb 2009) | 1 line
lots of weapon content changes, new models, new animations etc.. (missing textures)
r5932 | esteel | 2009-02-23 15:15:27 +0100 (Mon, 23 Feb 2009) | 1 line
added sv_vote_stop, the amount of time till one can vote again after stopping ones own vote. There was some abuse of the current unlimited vcall/vstop..\
r5933 | div0 | 2009-02-23 16:27:32 +0100 (Mon, 23 Feb 2009) | 2 lines
larger animtimes for nex and minstanex to match the guns
r5934 | morphed | 2009-02-23 16:28:00 +0100 (Mon, 23 Feb 2009) | 1 line
lots of weapon content changes, new models, new animations etc.. (shot origins)
r5935 | div0 | 2009-02-23 16:38:30 +0100 (Mon, 23 Feb 2009) | 2 lines
WFRAME_FIRE2
r5936 | morphed | 2009-02-23 17:00:40 +0100 (Mon, 23 Feb 2009) | 1 line
fix for shotgun and uzi for WFRAME_FIRE2
r5937 | m0rfar | 2009-02-23 23:05:22 +0100 (Mon, 23 Feb 2009) | 2 lines
New dom points by ai
new cvar g_domination_point_fullbright default 0
r5938 | m0rfar | 2009-02-24 01:03:10 +0100 (Tue, 24 Feb 2009) | 1 line
dom point sources
r5939 | div0 | 2009-02-24 07:29:07 +0100 (Tue, 24 Feb 2009) | 2 lines
prevent a "modify free entity" warning in the porto
r5940 | morphed | 2009-02-24 07:36:59 +0100 (Tue, 24 Feb 2009) | 1 line
camping rifle textures (it lacks original torus textures and scope screen shader)
r5941 | div0 | 2009-02-24 08:02:29 +0100 (Tue, 24 Feb 2009) | 2 lines
per-weaon crosshair changes
Last merge!
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-02-24 07:02:29 UTC (rev 5941)
+++ branches/nexuiz-2.0/.patchsets 2009-02-24 07:13:50 UTC (rev 5942)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-5927
+revisions_applied = 1-5941
Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-02-24 07:02:29 UTC (rev 5941)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-02-24 07:13:50 UTC (rev 5942)
@@ -27,7 +27,7 @@
seta g_configversion 0
// default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar)
-set cvar_check_default b0a00a4f304f7d8fad16a6146442f62d
+set cvar_check_default b47ac645ad97cf25d5d95b2b8be26e15
// Nexuiz version (formatted for machines)
// used to determine if a client version is compatible
@@ -105,59 +105,59 @@
seta crosshair_laser_color_alpha 0.75
seta crosshair_laser_size 0.55
seta crosshair_shotgun "" "crosshair to display when wielding the shotgun"
-seta crosshair_shotgun_color_red 0.75
-seta crosshair_shotgun_color_green 0.75
-seta crosshair_shotgun_color_blue 0.75
-seta crosshair_shotgun_color_alpha 1
-seta crosshair_shotgun_size 1.2
+seta crosshair_shotgun_color_red 0.7
+seta crosshair_shotgun_color_green 0.7
+seta crosshair_shotgun_color_blue 0.7
+seta crosshair_shotgun_color_alpha 1.1
+seta crosshair_shotgun_size 1.25
seta crosshair_uzi "" "crosshair to display when wielding the machinegun"
-seta crosshair_uzi_color_red 1
-seta crosshair_uzi_color_green 1
-seta crosshair_uzi_color_blue 0.75
-seta crosshair_uzi_color_alpha 1
-seta crosshair_uzi_size 1.15
+seta crosshair_uzi_color_red 0.4
+seta crosshair_uzi_color_green 0.9
+seta crosshair_uzi_color_blue 0.35
+seta crosshair_uzi_color_alpha 0.9
+seta crosshair_uzi_size 1.125
seta crosshair_grenadelauncher "" "crosshair to display when wielding the mortar"
seta crosshair_grenadelauncher_color_red 1
-seta crosshair_grenadelauncher_color_green 0.5
-seta crosshair_grenadelauncher_color_blue 0.5
-seta crosshair_grenadelauncher_color_alpha 1
+seta crosshair_grenadelauncher_color_green 0.15
+seta crosshair_grenadelauncher_color_blue 0
+seta crosshair_grenadelauncher_color_alpha 1.15
seta crosshair_grenadelauncher_size 1.35
seta crosshair_electro "" "crosshair to display when wielding the electro"
seta crosshair_electro_color_red 0.35
seta crosshair_electro_color_green 0.5
seta crosshair_electro_color_blue 1
-seta crosshair_electro_color_alpha 0.90
-seta crosshair_electro_size 1
+seta crosshair_electro_color_alpha 1
+seta crosshair_electro_size 0.95
seta crosshair_crylink "" "crosshair to display when wielding the crylink"
seta crosshair_crylink_color_red 0.85
seta crosshair_crylink_color_green 0.25
seta crosshair_crylink_color_blue 1
seta crosshair_crylink_color_alpha 0.85
-seta crosshair_crylink_size 0.75
+seta crosshair_crylink_size 0.725
seta crosshair_nex "" "crosshair to display when wielding the nex gun"
seta crosshair_nex_color_red 0
-seta crosshair_nex_color_green 1
+seta crosshair_nex_color_green 0.9
seta crosshair_nex_color_blue 1
seta crosshair_nex_color_alpha 0.85
seta crosshair_nex_size 0.65
seta crosshair_hagar "" "crosshair to display when wielding the hagar"
-seta crosshair_hagar_color_red 1
-seta crosshair_hagar_color_green 0.75
-seta crosshair_hagar_color_blue 0.5
+seta crosshair_hagar_color_red 0.85
+seta crosshair_hagar_color_green 0.5
+seta crosshair_hagar_color_blue 0.35
seta crosshair_hagar_color_alpha 1
-seta crosshair_hagar_size 1.35
+seta crosshair_hagar_size 1.4
seta crosshair_rocketlauncher "" "crosshair to display when wielding the rocketlauncher"
seta crosshair_rocketlauncher_color_red 1
-seta crosshair_rocketlauncher_color_green 0.85
+seta crosshair_rocketlauncher_color_green 0.75
seta crosshair_rocketlauncher_color_blue 0.2
seta crosshair_rocketlauncher_color_alpha 1
-seta crosshair_rocketlauncher_size 1.15
+seta crosshair_rocketlauncher_size 1.175
seta crosshair_porto "" "crosshair to display when wielding the porto"
seta crosshair_porto_color_red 0.5
seta crosshair_porto_color_green 1
seta crosshair_porto_color_blue 0.5
seta crosshair_porto_color_alpha 0.85
-seta crosshair_porto_size 1.25
+seta crosshair_porto_size 1.35
seta crosshair_minstanex "" "crosshair to display when wielding the minstanex gun"
seta crosshair_minstanex_color_red 0.65
seta crosshair_minstanex_color_green 0.65
@@ -169,7 +169,7 @@
seta crosshair_hook_color_green 1
seta crosshair_hook_color_blue 0.85
seta crosshair_hook_color_alpha 0.85
-seta crosshair_hook_size 1
+seta crosshair_hook_size 1.1
seta crosshair_hlac "" "crosshair to display when wielding the H.L.A.C"
seta crosshair_hlac_color_red 1
seta crosshair_hlac_color_green 0.65
@@ -183,11 +183,11 @@
seta crosshair_seeker_color_alpha 0.9
seta crosshair_seeker_size 1.15
seta crosshair_campingrifle "" "crosshair to display when wielding the campingrifle"
-seta crosshair_campingrifle_color_red 1
-seta crosshair_campingrifle_color_green 1
-seta crosshair_campingrifle_color_blue 0.2
+seta crosshair_campingrifle_color_red 0.85
+seta crosshair_campingrifle_color_green 0.5
+seta crosshair_campingrifle_color_blue 0.25
seta crosshair_campingrifle_color_alpha 1
-seta crosshair_campingrifle_size 1
+seta crosshair_campingrifle_size 0.85
fov 90
seta cl_zoomfactor 5 "how much +zoom will zoom (1-16)"
seta cl_zoomspeed 3.5 "how fast it will zoom (0.5-16), negative values mean instant zoom"
@@ -598,6 +598,7 @@
set g_domination_default_teams 2 "default number of teams for maps that aren't domination-specific"
set g_domination_disable_frags 0 "players can't get frags normally, only get points from kills"
set g_domination_point_amt 0 "override: how many points to get per ping"
+set g_domination_point_fullbright 0 "domination point fullbright"
set g_domination_point_rate 0 "override: how often to give those points"
set g_domination_point_capturetime 0.1 "how long it takes to capture a point (given no interference)"
set g_domination_point_glow 0 "domination point glow (warning, slow)"
@@ -879,11 +880,12 @@
set rcon_restricted_commands "restart fraglimit chmap gotomap endmatch reducematchtime extendmatchtime allready kick kickban \"sv_cmd bans\" \"sv_cmd unban\" status \"sv_cmd teamstatus\""
set sv_vote_call 1 "users can call a vote for the above commands"
set sv_vote_master 1 "users can call a vote to become master"
-set sv_vote_master_password "" "when set, users can use \"vdo login (password)\" to log in as master"
+set sv_vote_master_password "" "when set, users can use \"vlogin PASSWORD\" to log in as master"
set sv_vote_change 0 "set to 1 to allow to change you vote/mind"
set sv_vote_singlecount 0 "set to 1 to count votes once after timeout or to 0 to count with every vote"
set sv_vote_timeout 60 "a vote will timeout after this many seconds"
-set sv_vote_wait 120 "a player can not call a vote again for this many seconds"
+set sv_vote_wait 120 "a player can not call a vote again for this many seconds when his vote was not accepted"
+set sv_vote_stop 15 "a player can not call a vote again for this many seconds when he stopped this vote (e.g. to correct it)"
set sv_vote_majority_factor 0.5 "which quotient of the PLAYERS constitute a majority? (try: 0.667, 0.75 when using the above)"
set sv_vote_simple_majority_factor 0 "which quotient of the VOTERS constitute a majority too? (0 = off, otherwise it must be higher than or equal to sv_vote_majority_factor)"
// when disabled, don't allow game type changes "note: set these two equal to JUST support simple majorities"
Modified: branches/nexuiz-2.0/data/gfx/inv_weapon1.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/inv_weapon14.tga
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/gfx/inv_weapon15.tga (from rev 5941, trunk/data/gfx/inv_weapon15.tga)
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/inv_weapon3.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/inv_weapon4.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/inv_weapon7.tga
===================================================================
(Binary files differ)
Deleted: branches/nexuiz-2.0/data/models/domination/dom_axe.tga
===================================================================
(Binary files differ)
Deleted: branches/nexuiz-2.0/data/models/domination/dom_axe_luma.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/domination/dom_blue.md3
===================================================================
(Binary files differ)
Deleted: branches/nexuiz-2.0/data/models/domination/dom_bolt.tga
===================================================================
(Binary files differ)
Deleted: branches/nexuiz-2.0/data/models/domination/dom_bomb.tga
===================================================================
(Binary files differ)
Deleted: branches/nexuiz-2.0/data/models/domination/dom_neutral.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/domination/dom_pink.md3
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/domination/dom_red.md3
===================================================================
(Binary files differ)
Deleted: branches/nexuiz-2.0/data/models/domination/dom_symbol.tga
===================================================================
(Binary files differ)
Deleted: branches/nexuiz-2.0/data/models/domination/dom_symbol2.tga
===================================================================
(Binary files differ)
Deleted: branches/nexuiz-2.0/data/models/domination/dom_target.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/domination/dom_unclaimed.md3
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/domination/dom_yellow.md3
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/items/a_shells.md3
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/g_campingrifle.md3
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/g_electro.md3
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/models/weapons/g_flamethrower.md3 (from rev 5941, trunk/data/models/weapons/g_flamethrower.md3)
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/g_gl.md3
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/g_hagar.md3
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/g_hlac.md3
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/g_shotgun.md3
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/v_campingrifle.md3
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/v_electro.md3
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/models/weapons/v_flamethrower.md3 (from rev 5941, trunk/data/models/weapons/v_flamethrower.md3)
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/v_gl.md3
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/v_hagar.md3
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/v_hlac.md3
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/v_shotgun.md3
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/w_campingrifle.zym
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/w_crylink.zym
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/w_electro.zym
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/models/weapons/w_flamethrower.zym (from rev 5941, trunk/data/models/weapons/w_flamethrower.zym)
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/w_gl.zym
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/w_hagar.zym
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/w_hlac.zym
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/w_hookgun.zym
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/w_laser.zym
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/w_nex.zym
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/w_porto.zym
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/w_rl.zym
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/w_shotgun.zym
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/w_uzi.zym
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/qcsrc/server/constants.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/constants.qh 2009-02-24 07:02:29 UTC (rev 5941)
+++ branches/nexuiz-2.0/data/qcsrc/server/constants.qh 2009-02-24 07:13:50 UTC (rev 5942)
@@ -1,4 +1,4 @@
-string CVAR_CHECK_DEFAULT = "b0a00a4f304f7d8fad16a6146442f62d";
+string CVAR_CHECK_DEFAULT = "b47ac645ad97cf25d5d95b2b8be26e15";
string CVAR_CHECK_WEAPONS = "32e7dc7d745187473f0040d14892e2bb";
float FALSE = 0;
Modified: branches/nexuiz-2.0/data/qcsrc/server/domination.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/domination.qc 2009-02-24 07:02:29 UTC (rev 5941)
+++ branches/nexuiz-2.0/data/qcsrc/server/domination.qc 2009-02-24 07:13:50 UTC (rev 5942)
@@ -270,9 +270,9 @@
self.wait = 5;
if(!self.t_width)
- self.t_width = 0.1; // frame animation rate
+ self.t_width = 0.02; // frame animation rate
if(!self.t_length)
- self.t_length = 119; // maximum frame
+ self.t_length = 239; // maximum frame
self.think = dompointthink;
self.nextthink = time;
@@ -497,7 +497,9 @@
//if(!self.glow_size)
// self.glow_size = cvar("g_domination_point_glow");
- self.effects = self.effects | EF_FULLBRIGHT | EF_LOWPRECISION;
+ self.effects = self.effects | EF_LOWPRECISION;
+ if (cvar("g_domination_point_fullbright"))
+ self.effects |= EF_FULLBRIGHT;
};
// code from here on is just to support maps that don't have control point and team entities
Modified: branches/nexuiz-2.0/data/qcsrc/server/vote.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/vote.qc 2009-02-24 07:02:29 UTC (rev 5941)
+++ branches/nexuiz-2.0/data/qcsrc/server/vote.qc 2009-02-24 07:13:50 UTC (rev 5942)
@@ -497,7 +497,7 @@
if(stopper == votecaller) {
// no wait for next vote so you can correct your vote
if(votecaller) {
- votecaller.vote_next = 0;
+ votecaller.vote_next = time + cvar("sv_vote_stop");;
}
}
VoteReset();
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_campingrifle.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_campingrifle.qc 2009-02-24 07:02:29 UTC (rev 5941)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_campingrifle.qc 2009-02-24 07:13:50 UTC (rev 5942)
@@ -51,7 +51,7 @@
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
self.ammo_nails -= pAmmo;
- W_SetupShot (self, '32 8 -8', FALSE, 2, "weapons/campingrifle_fire.wav");
+ W_SetupShot (self, '41 7 -10.5', FALSE, 2, "weapons/campingrifle_fire.wav");
pointparticles(particleeffectnum("shotgun_muzzleflash"), w_shotorg, w_shotdir * 2000, 1);
if(self.BUTTON_ZOOM) // if zoomed, shoot from the eye
@@ -129,7 +129,7 @@
if (weapon_prepareattack(1, cvar("g_balance_campingrifle_secondary_refire")))
{
W_Campingrifle_Attack2();
- weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_campingrifle_secondary_animtime"), W_Campingrifle_CheckReloadAndReady);
+ weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_campingrifle_secondary_animtime"), W_Campingrifle_CheckReloadAndReady);
}
}
}
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_crylink.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_crylink.qc 2009-02-24 07:02:29 UTC (rev 5941)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_crylink.qc 2009-02-24 07:13:50 UTC (rev 5942)
@@ -66,7 +66,7 @@
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
self.ammo_cells = self.ammo_cells - cvar("g_balance_crylink_primary_ammo");
- W_SetupShot (self, '25 8 -8', FALSE, 2, "weapons/crylink_fire.wav");
+ W_SetupShot (self, '23 8 -10', FALSE, 2, "weapons/crylink_fire.wav");
forward = v_forward;
right = v_right;
up = v_up;
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc 2009-02-24 07:02:29 UTC (rev 5941)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_electro.qc 2009-02-24 07:13:50 UTC (rev 5942)
@@ -72,7 +72,7 @@
{
local entity proj;
- W_SetupShot (self, '25 8 -8', FALSE, 2, "weapons/electro_fire.wav");
+ W_SetupShot (self, '24 8 -9.5', FALSE, 2, "weapons/electro_fire.wav");
pointparticles(particleeffectnum("electro_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
@@ -192,7 +192,7 @@
if (weapon_prepareattack(1, cvar("g_balance_electro_secondary_refire")))
{
W_Electro_Attack2();
- weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_electro_secondary_animtime"), w_ready);
+ weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_electro_secondary_animtime"), w_ready);
}
}
else if (req == WR_PRECACHE)
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_grenadelauncher.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_grenadelauncher.qc 2009-02-24 07:02:29 UTC (rev 5941)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_grenadelauncher.qc 2009-02-24 07:13:50 UTC (rev 5942)
@@ -77,8 +77,7 @@
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
self.ammo_rockets = self.ammo_rockets - cvar("g_balance_grenadelauncher_primary_ammo");
- W_SetupShot (self, '25 6 -8', FALSE, 4, "weapons/grenade_fire.wav");
- //W_SetupShot (self, '25 8 -8', FALSE, 4, "weapons/grenade_fire.wav"); // TODO: move model to the right a little
+ W_SetupShot (self, '24 8 -10', FALSE, 4, "weapons/grenade_fire.wav");
pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_hagar.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_hagar.qc 2009-02-24 07:02:29 UTC (rev 5941)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_hagar.qc 2009-02-24 07:13:50 UTC (rev 5942)
@@ -51,8 +51,7 @@
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
self.ammo_rockets = self.ammo_rockets - cvar("g_balance_hagar_primary_ammo");
- W_SetupShot (self, '25 5 -8', FALSE, 2, "weapons/hagar_fire.wav");
- //W_SetupShot (self, '25 8 -8', FALSE, 2, "weapons/hagar_fire.wav"); // TODO: move model a little to the right
+ W_SetupShot (self, '22 8 -10', FALSE, 2, "weapons/hagar_fire.wav");
pointparticles(particleeffectnum("hagar_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
@@ -150,7 +149,7 @@
if (weapon_prepareattack(1, cvar("g_balance_hagar_secondary_refire")))
{
W_Hagar_Attack2();
- weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_hagar_secondary_refire"), w_ready);
+ weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_hagar_secondary_refire"), w_ready);
}
}
else if (req == WR_PRECACHE)
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_hlac.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_hlac.qc 2009-02-24 07:02:29 UTC (rev 5941)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_hlac.qc 2009-02-24 07:13:50 UTC (rev 5942)
@@ -36,7 +36,7 @@
if(self.crouch)
spread = spread * cvar("g_balance_hlac_primary_spread_crouchmod");
- W_SetupShot (self, '25 8 -8', FALSE, 3, "weapons/lasergun_fire.wav");
+ W_SetupShot (self, '24 8 -11', FALSE, 3, "weapons/lasergun_fire.wav");
pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
if (!g_norecoil)
{
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_hook.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_hook.qc 2009-02-24 07:02:29 UTC (rev 5941)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_hook.qc 2009-02-24 07:13:50 UTC (rev 5942)
@@ -60,7 +60,7 @@
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
self.ammo_cells = self.ammo_cells - cvar("g_balance_hook_secondary_ammo");
- W_SetupShot (self, '25 6 -8', FALSE, 4, "weapons/hookbomb_fire.wav");
+ W_SetupShot (self, '21 8 -9.5', FALSE, 4, "weapons/hookbomb_fire.wav");
gren = spawn ();
gren.owner = self;
@@ -130,7 +130,7 @@
if (weapon_prepareattack(1, cvar("g_balance_hook_secondary_refire")))
{
W_Hook_Attack2();
- weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_hook_secondary_animtime"), w_ready);
+ weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_hook_secondary_animtime"), w_ready);
}
}
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_laser.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_laser.qc 2009-02-24 07:02:29 UTC (rev 5941)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_laser.qc 2009-02-24 07:13:50 UTC (rev 5942)
@@ -17,7 +17,7 @@
{
local entity missile;
- W_SetupShot (self, '25 8 -8', FALSE, 3, "weapons/lasergun_fire.wav");
+ W_SetupShot (self, '21 8 -9', FALSE, 3, "weapons/lasergun_fire.wav");
pointparticles(particleeffectnum("laser_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
missile = spawn ();
@@ -96,7 +96,7 @@
if (weapon_prepareattack(0, cvar("g_balance_laser_secondary_refire")))
{
W_Laser_Attack(TRUE);
- weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_laser_secondary_animtime"), w_ready);
+ weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_laser_secondary_animtime"), w_ready);
}
}
else
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_nex.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_nex.qc 2009-02-24 07:02:29 UTC (rev 5941)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_nex.qc 2009-02-24 07:13:50 UTC (rev 5942)
@@ -15,7 +15,7 @@
float flying;
flying = IsFlying(self); // do this BEFORE to make the trace values from FireRailgunBullet last
- W_SetupShot (self, '25 4 -4', TRUE, 5, "weapons/nexfire.wav");
+ W_SetupShot (self, '30 8 -10', TRUE, 5, "weapons/nexfire.wav");
yoda = 0;
FireRailgunBullet (w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, cvar("g_balance_nex_damage"), cvar("g_balance_nex_force"), WEP_NEX);
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_porto.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_porto.qc 2009-02-24 07:02:29 UTC (rev 5941)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_porto.qc 2009-02-24 07:13:50 UTC (rev 5942)
@@ -116,6 +116,7 @@
centerprint(self.owner, "^1In^7-portal created.");
self.right_vector = self.right_vector - 2 * trace_plane_normal * (self.right_vector * norm);
self.angles = vectoangles(self.velocity - 2 * trace_plane_normal * (self.velocity * norm));
+ CSQCProjectile(self, TRUE, PROJECTILE_PORTO_BLUE, TRUE); // change type
}
else
{
@@ -123,7 +124,6 @@
trace_plane_normal = norm;
W_Porto_Fail(0);
}
- CSQCProjectile(self, TRUE, PROJECTILE_PORTO_BLUE, TRUE); // change type
}
else
{
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc 2009-02-24 07:02:29 UTC (rev 5941)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_rocketlauncher.qc 2009-02-24 07:13:50 UTC (rev 5942)
@@ -198,8 +198,7 @@
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
self.ammo_rockets = self.ammo_rockets - cvar("g_balance_rocketlauncher_ammo");
- W_SetupShot (self, '34.0 8.5 -11.0', FALSE, 5, "weapons/rocket_fire.wav");
- //W_SetupShot (self, '25 8 -8', FALSE, 5, "weapons/rocket_fire.wav"); // TODO: move model to the right a little
+ W_SetupShot (self, '27.0 8 -10.0', FALSE, 5, "weapons/rocket_fire.wav");
pointparticles(particleeffectnum("rocketlauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
missile = spawn ();
@@ -241,15 +240,14 @@
// muzzle flash for 1st person view
flash = spawn ();
- flash.scale = 1.2;
- flash.angles_z = 180;
+ flash.angles_z = flash.v_angle_z + random() * 180;
flash.owner = self;
flash.viewmodelforclient = self;
flash.customizeentityforclient = CL_Weaponentity_CustomizeEntityForClient;
- setorigin (flash, '35 8 0');
+ setorigin (flash, '5 0 0');
setmodel (flash, "models/flash.md3"); // precision set below
- setattachment(flash, self.weaponentity, "bone01");
- SUB_SetFade (flash, time, 0.4);
+ setattachment(flash, self.weaponentity, "bone02");
+ SUB_SetFade (flash, time, 0.1);
// muzzle flash for 3rd person view
flash2 = spawn ();
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_seeker.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_seeker.qc 2009-02-24 07:02:29 UTC (rev 5941)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_seeker.qc 2009-02-24 07:13:50 UTC (rev 5942)
@@ -438,7 +438,7 @@
if (weapon_prepareattack(1, cvar("g_balance_seeker_flac_refire")))
{
Seeker_Fire_Flac();
- weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_seeker_flac_animtime"), w_ready);
+ weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_seeker_flac_animtime"), w_ready);
}
}
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_shotgun.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_shotgun.qc 2009-02-24 07:02:29 UTC (rev 5941)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_shotgun.qc 2009-02-24 07:13:50 UTC (rev 5942)
@@ -17,7 +17,7 @@
bulletspeed = cvar("g_balance_shotgun_primary_speed");
bulletconstant = cvar("g_balance_shotgun_primary_bulletconstant");
- W_SetupShot (self, '25 8 -8', TRUE, 5, "weapons/shotgun_fire.wav");
+ W_SetupShot (self, '28 8 -10', TRUE, 5, "weapons/shotgun_fire.wav");
for (sc = 0;sc < bullets;sc = sc + 1)
fireBallisticBullet(w_shotorg, w_shotdir, spread, bulletspeed, 5, d, 0, f, WEP_SHOTGUN, 0, 1, bulletconstant);
if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
@@ -31,13 +31,12 @@
// muzzle flash for 1st person view
flash = spawn();
- setorigin(flash, '53 5 0');
+ setorigin(flash, '5 0 0');
setmodel(flash, "models/uziflash.md3"); // precision set below
- setattachment(flash, self.weaponentity, "bone01");
+ setattachment(flash, self.weaponentity, "bone02");
flash.owner = self;
flash.viewmodelforclient = self;
flash.customizeentityforclient = CL_Weaponentity_CustomizeEntityForClient;
- flash.scale = 1.2;
flash.think = SUB_Remove;
flash.nextthink = time + 0.06;
flash.angles_z = flash.v_angle_z + random() * 180;
@@ -95,12 +94,12 @@
void shotgun_fire2_03()
{
W_Shotgun_Attack2();
- weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_shotgun_secondary_animtime"), w_ready);
+ weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_shotgun_secondary_animtime"), w_ready);
}
void shotgun_fire2_02()
{
W_Shotgun_Attack2();
- weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_shotgun_secondary_animtime"), shotgun_fire2_03);
+ weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_shotgun_secondary_animtime"), shotgun_fire2_03);
}
void spawnfunc_weapon_shotgun(); // defined in t_items.qc
@@ -124,7 +123,7 @@
if (weapon_prepareattack(1, cvar("g_balance_shotgun_secondary_refire")))
{
W_Shotgun_Attack2();
- weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_shotgun_secondary_animtime"), shotgun_fire2_02);
+ weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_shotgun_secondary_animtime"), shotgun_fire2_02);
}
}
else if (req == WR_PRECACHE)
Modified: branches/nexuiz-2.0/data/qcsrc/server/w_uzi.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/w_uzi.qc 2009-02-24 07:02:29 UTC (rev 5941)
+++ branches/nexuiz-2.0/data/qcsrc/server/w_uzi.qc 2009-02-24 07:13:50 UTC (rev 5942)
@@ -22,8 +22,7 @@
else
self.ammo_nails = self.ammo_nails - cvar("g_balance_uzi_sustained_ammo");
}
- W_SetupShot (self, '25 5.5 -8', TRUE, 0, "weapons/uzi_fire.wav");
- //W_SetupShot (self, '25 8 -8', TRUE, 0, "weapons/uzi_fire.wav"); // TODO: move model to the right a little
+ W_SetupShot (self, '23 8 -9.5', TRUE, 0, "weapons/uzi_fire.wav");
if (!g_norecoil)
{
self.punchangle_x = random () - 0.5;
@@ -42,13 +41,12 @@
// muzzle flash for 1st person view
flash = spawn();
- setorigin(flash, '53 5 0');
+ setorigin(flash, '5 0 0');
setmodel(flash, "models/uziflash.md3"); // precision set below
- setattachment(flash, self.weaponentity, "bone01");
+ setattachment(flash, self.weaponentity, "bone02");
flash.owner = self;
flash.viewmodelforclient = self;
flash.customizeentityforclient = CL_Weaponentity_CustomizeEntityForClient;
- flash.scale = 1.2;
//SUB_SetFade(flash, time + 0.06, 0);
flash.think = W_Uzi_Flash_Go;
flash.nextthink = time + 0.02;
@@ -111,18 +109,18 @@
else if (req == WR_THINK)
{
if (self.BUTTON_ATCK)
- if (weapon_prepareattack(0, cvar("g_balance_uzi_refire")))
+ if (weapon_prepareattack(0, 0))
{
self.uzi_bulletcounter = 1;
- W_Uzi_Attack(WEP_UZI);
+ W_Uzi_Attack(WEP_UZI); // sets attack_finished
weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_uzi_sustained_refire"), uzi_fire1_02);
}
if (self.BUTTON_ATCK2)
- if (weapon_prepareattack(1, cvar("g_balance_uzi_refire")))
+ if (weapon_prepareattack(1, 0))
{
self.uzi_bulletcounter = 1;
- W_Uzi_Attack(WEP_UZI | HITTYPE_SECONDARY);
- weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_uzi_sustained_refire"), w_ready);
+ W_Uzi_Attack(WEP_UZI | HITTYPE_SECONDARY); // sets attack_finished
+ weapon_thinkf(WFRAME_FIRE2, cvar("g_balance_uzi_first_refire"), w_ready);
}
}
else if (req == WR_PRECACHE)
Copied: branches/nexuiz-2.0/data/scripts/electro.shader (from rev 5941, trunk/data/scripts/electro.shader)
===================================================================
--- branches/nexuiz-2.0/data/scripts/electro.shader (rev 0)
+++ branches/nexuiz-2.0/data/scripts/electro.shader 2009-02-24 07:13:50 UTC (rev 5942)
@@ -0,0 +1,16 @@
+electro_plasma
+{
+ {
+ map textures/electro_plasma.tga
+ tcMod scroll 0.03 0.001
+ }
+}
+
+electro_plasma_hull
+{
+ {
+ map textures/electro_plasma_hull.tga
+ alphaFunc GT0
+ rgbGen Vertex
+ }
+}
\ No newline at end of file
Copied: branches/nexuiz-2.0/data/scripts/flamethrower.shader (from rev 5941, trunk/data/scripts/flamethrower.shader)
===================================================================
--- branches/nexuiz-2.0/data/scripts/flamethrower.shader (rev 0)
+++ branches/nexuiz-2.0/data/scripts/flamethrower.shader 2009-02-24 07:13:50 UTC (rev 5942)
@@ -0,0 +1,9 @@
+flamethrowerfx
+{
+ deformVertexes bulge 0.1 0.03 30
+ {
+ map textures/flamethrowerfx.tga
+ tcMod rotate 200
+ tcmod scale 1 1
+ }
+}
\ No newline at end of file
Copied: branches/nexuiz-2.0/data/scripts/shotgun.shader (from rev 5941, trunk/data/scripts/shotgun.shader)
===================================================================
--- branches/nexuiz-2.0/data/scripts/shotgun.shader (rev 0)
+++ branches/nexuiz-2.0/data/scripts/shotgun.shader 2009-02-24 07:13:50 UTC (rev 5942)
@@ -0,0 +1,10 @@
+shotgun_sight
+{
+ surfaceparm trans
+
+ {
+ map textures/shotgun_sight.tga
+ blendfunc add
+ //rgbGen vertex
+ }
+}
\ No newline at end of file
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/campingrifle_glow.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/campingrifle_pants.tga
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/campingrifle_screen.tga (from rev 5941, trunk/data/textures/campingrifle_screen.tga)
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/campingrifle_shirt.tga
===================================================================
(Binary files differ)
Deleted: branches/nexuiz-2.0/data/textures/crifleflashider.tga
===================================================================
(Binary files differ)
Deleted: branches/nexuiz-2.0/data/textures/crifleflashider_bump.tga
===================================================================
(Binary files differ)
Deleted: branches/nexuiz-2.0/data/textures/crifleflashider_gloss.tga
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/domination (from rev 5941, trunk/data/textures/domination)
Copied: branches/nexuiz-2.0/data/textures/electro.tga (from rev 5941, trunk/data/textures/electro.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/electro_gloss.tga (from rev 5941, trunk/data/textures/electro_gloss.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/electro_glow.tga (from rev 5941, trunk/data/textures/electro_glow.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/electro_norm.tga (from rev 5941, trunk/data/textures/electro_norm.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/electro_pants.tga (from rev 5941, trunk/data/textures/electro_pants.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/electro_plasma.tga (from rev 5941, trunk/data/textures/electro_plasma.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/electro_plasma_glow.tga (from rev 5941, trunk/data/textures/electro_plasma_glow.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/electro_plasma_hull.tga (from rev 5941, trunk/data/textures/electro_plasma_hull.tga)
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/f_shotgun.jpg
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/flamethrower.tga (from rev 5941, trunk/data/textures/flamethrower.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/flamethrower_gloss.tga (from rev 5941, trunk/data/textures/flamethrower_gloss.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/flamethrower_norm.tga (from rev 5941, trunk/data/textures/flamethrower_norm.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/flamethrower_pants.tga (from rev 5941, trunk/data/textures/flamethrower_pants.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/flamethrower_shirt.tga (from rev 5941, trunk/data/textures/flamethrower_shirt.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/flamethrowerfx.tga (from rev 5941, trunk/data/textures/flamethrowerfx.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/glauncher.tga (from rev 5941, trunk/data/textures/glauncher.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/glauncher_gloss.tga (from rev 5941, trunk/data/textures/glauncher_gloss.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/glauncher_norm.tga (from rev 5941, trunk/data/textures/glauncher_norm.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/glauncher_pants.tga (from rev 5941, trunk/data/textures/glauncher_pants.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/glauncher_shirt.tga (from rev 5941, trunk/data/textures/glauncher_shirt.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/glscope.tga (from rev 5941, trunk/data/textures/glscope.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/glscope_glow.tga (from rev 5941, trunk/data/textures/glscope_glow.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/hagar2.tga (from rev 5941, trunk/data/textures/hagar2.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/hagar2_gloss.tga (from rev 5941, trunk/data/textures/hagar2_gloss.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/hagar2_glow.tga (from rev 5941, trunk/data/textures/hagar2_glow.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/hagar2_norm.tga (from rev 5941, trunk/data/textures/hagar2_norm.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/hagar2_pants.tga (from rev 5941, trunk/data/textures/hagar2_pants.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/hagar2_shirt.tga (from rev 5941, trunk/data/textures/hagar2_shirt.tga)
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hlac_accessory.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hlac_accessory_gloss.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hlac_accessory_norm.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hlac_accessory_pants.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hlac_accessory_shirt.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/hlac_metal.tga
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/hlac_metal_glow.tga (from rev 5941, trunk/data/textures/hlac_metal_glow.tga)
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/rl_gloss.jpg
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/shellsammo.tga (from rev 5941, trunk/data/textures/shellsammo.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/shellsammo_gloss.tga (from rev 5941, trunk/data/textures/shellsammo_gloss.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/shellsammo_norm.tga (from rev 5941, trunk/data/textures/shellsammo_norm.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/shotgun2.tga (from rev 5941, trunk/data/textures/shotgun2.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/shotgun2_gloss.tga (from rev 5941, trunk/data/textures/shotgun2_gloss.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/shotgun2_glow.tga (from rev 5941, trunk/data/textures/shotgun2_glow.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/shotgun2_norm.tga (from rev 5941, trunk/data/textures/shotgun2_norm.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/shotgun2_shirt.tga (from rev 5941, trunk/data/textures/shotgun2_shirt.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/shotgun_sight.tga (from rev 5941, trunk/data/textures/shotgun_sight.tga)
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/weapons.cfg
===================================================================
--- branches/nexuiz-2.0/data/weapons.cfg 2009-02-24 07:02:29 UTC (rev 5941)
+++ branches/nexuiz-2.0/data/weapons.cfg 2009-02-24 07:13:50 UTC (rev 5942)
@@ -195,11 +195,11 @@
set g_balance_nex_damage 130
set g_balance_nex_force 600
set g_balance_nex_refire 1.5
-set g_balance_nex_animtime 0.3
+set g_balance_nex_animtime 1.0 // almost no combos!
set g_balance_nex_ammo 5
set g_balance_minstanex_refire 1
-set g_balance_minstanex_animtime 0.3
+set g_balance_minstanex_animtime 0.8 // almost no combos
set g_balance_minstanex_ammo 10
set g_balance_hagar_primary_damage 37
Copied: branches/nexuiz-2.0/misc/mediasource/models/dom_points.zip (from rev 5941, trunk/misc/mediasource/models/dom_points.zip)
===================================================================
(Binary files differ)
More information about the nexuiz-commits
mailing list