r5268 - in trunk/data: . models/ctf qcsrc/server scripts textures textures/flags
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu Dec 18 09:20:19 EST 2008
Author: m0rfar
Date: 2008-12-18 09:20:19 -0500 (Thu, 18 Dec 2008)
New Revision: 5268
Added:
trunk/data/models/ctf/flags.md3
trunk/data/models/ctf/flags.md3_0.skin
trunk/data/models/ctf/flags.md3_1.skin
trunk/data/scripts/flags.shader
trunk/data/textures/flags/
trunk/data/textures/flags/flag_blue.tga
trunk/data/textures/flags/flag_blue_cloth.tga
trunk/data/textures/flags/flag_blue_gloss.tga
trunk/data/textures/flags/flag_blue_glow.tga
trunk/data/textures/flags/flag_blue_laser.tga
trunk/data/textures/flags/flag_blue_norm.tga
trunk/data/textures/flags/flag_red.tga
trunk/data/textures/flags/flag_red_cloth.tga
trunk/data/textures/flags/flag_red_gloss.tga
trunk/data/textures/flags/flag_red_glow.tga
trunk/data/textures/flags/flag_red_laser.tga
trunk/data/textures/flags/flag_red_norm.tga
Modified:
trunk/data/defaultNexuiz.cfg
trunk/data/qcsrc/server/ctf.qc
trunk/data/scripts/shaderlist.txt
Log:
A preliminary commit until tzork flag modification is done.
* New flag model by ai (with laser beams always visible).
* New cvar g_ctf_dynamiclights (default: 1) which adds a red/blue dynamic light on flag origin.
* Changed g_ctf_fullbrights to 0, or else normal maps wont work. Cloths are fullbright anyway.
* Old flag models still exists for compability reasons (if some maps are still referring to them).
Modified: trunk/data/defaultNexuiz.cfg
===================================================================
--- trunk/data/defaultNexuiz.cfg 2008-12-18 14:09:41 UTC (rev 5267)
+++ trunk/data/defaultNexuiz.cfg 2008-12-18 14:20:19 UTC (rev 5268)
@@ -16,7 +16,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 3e222928f6156061e54639483d8961f0
+set cvar_check_default effdd9b8c1297b9b3f5c8216b7ee3d80
// Nexuiz version (formatted for machines)
// used to determine if a client version is compatible
@@ -400,7 +400,8 @@
set g_ctf_flag_returntime 30
set g_ctf_flagcarrier_selfdamage 1
set g_ctf_flagcarrier_selfforce 1
-set g_ctf_fullbrightflags 1
+set g_ctf_fullbrightflags 0
+set g_ctf_dynamiclights 1
set g_ctf_allow_drop 0 // dropping allows circumventing carrierkill score, so enable this with care!
set g_ctf_reverse 0 // when 1, bases/flags are switched :P you have to capture your OWN flag by bringing it to the ENEMY's
set g_balance_ctf_delay_collect 1.0
Added: trunk/data/models/ctf/flags.md3
===================================================================
(Binary files differ)
Property changes on: trunk/data/models/ctf/flags.md3
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/models/ctf/flags.md3_0.skin
===================================================================
--- trunk/data/models/ctf/flags.md3_0.skin (rev 0)
+++ trunk/data/models/ctf/flags.md3_0.skin 2008-12-18 14:20:19 UTC (rev 5268)
@@ -0,0 +1,3 @@
+replace "flag_red" "textures/flags/flag_red.tga"
+replace "flag_red_cloth" "flag_red_cloth"
+replace "flag_red_laser" "flag_red_laser"
Added: trunk/data/models/ctf/flags.md3_1.skin
===================================================================
--- trunk/data/models/ctf/flags.md3_1.skin (rev 0)
+++ trunk/data/models/ctf/flags.md3_1.skin 2008-12-18 14:20:19 UTC (rev 5268)
@@ -0,0 +1,3 @@
+replace "flag_red" "textures/flags/flag_blue.tga"
+replace "flag_red_cloth" "flag_blue_cloth"
+replace "flag_red_laser" "flag_blue_laser"
Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc 2008-12-18 14:09:41 UTC (rev 5267)
+++ trunk/data/qcsrc/server/ctf.qc 2008-12-18 14:20:19 UTC (rev 5268)
@@ -150,7 +150,7 @@
if(!self.t_width)
self.t_width = 0.1; // frame animation rate
if(!self.t_length)
- self.t_length = 119; // maximum frame
+ self.t_length = 58; // maximum frame
setattachment(self, world, "");
self.mdl = self.model;
@@ -700,7 +700,7 @@
if(self.spawnflags & 1)
self.noalign = 1;
if (!self.model)
- self.model = "models/ctf/flag_red.md3";
+ self.model = "models/ctf/flags.md3";
if (!self.noise)
self.noise = "ctf/take.wav";
if (!self.noise1)
@@ -729,6 +729,8 @@
self.effects = self.effects | EF_LOWPRECISION;
if(cvar("g_ctf_fullbrightflags"))
self.effects |= EF_FULLBRIGHT;
+ if(cvar("g_ctf_dynamiclights"))
+ self.effects |= EF_RED;
waypoint_spawnforitem(self);
@@ -790,11 +792,11 @@
}
self.netname = "^4BLUE^7 flag";
self.target = "###item###";
- self.skin = 0;
+ self.skin = 1;
if(self.spawnflags & 1)
self.noalign = 1;
if (!self.model)
- self.model = "models/ctf/flag_blue.md3";
+ self.model = "models/ctf/flags.md3";
if (!self.noise)
self.noise = "ctf/take.wav";
if (!self.noise1)
@@ -823,6 +825,8 @@
self.effects = self.effects | EF_LOWPRECISION;
if(cvar("g_ctf_fullbrightflags"))
self.effects |= EF_FULLBRIGHT;
+ if(cvar("g_ctf_dynamiclights"))
+ self.effects |= EF_BLUE;
waypoint_spawnforitem(self);
Added: trunk/data/scripts/flags.shader
===================================================================
--- trunk/data/scripts/flags.shader (rev 0)
+++ trunk/data/scripts/flags.shader 2008-12-18 14:20:19 UTC (rev 5268)
@@ -0,0 +1,33 @@
+flag_red_cloth {
+ cull none
+ deformVertexes wave 100 sin 0 0.4 0 2.5
+ {
+ map textures/flags/flag_red_cloth.tga
+ }
+}
+
+flag_red_laser {
+ {
+ map textures/flags/flag_red_laser.tga
+ tcMod scroll 0.2 -1
+ blendfunc add
+ }
+}
+
+
+flag_blue_cloth {
+ cull none
+ deformVertexes wave 100 sin 0 0.4 0 2.5
+ {
+ map textures/flags/flag_blue_cloth.tga
+ }
+}
+
+flag_blue_laser {
+ {
+ map textures/flags/flag_blue_laser.tga
+ tcMod scroll 0.2 -1
+ blendfunc add
+ }
+}
+
Modified: trunk/data/scripts/shaderlist.txt
===================================================================
--- trunk/data/scripts/shaderlist.txt 2008-12-18 14:09:41 UTC (rev 5267)
+++ trunk/data/scripts/shaderlist.txt 2008-12-18 14:20:19 UTC (rev 5268)
@@ -14,8 +14,9 @@
evil6_trims
evil6_walls
evil8_base
-eX
-final_rage
+eX
+final_rage
+flags
harlequin_sky
kaznexctf2
leiprojectile
Added: trunk/data/textures/flags/flag_blue.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/flags/flag_blue.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/flags/flag_blue_cloth.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/flags/flag_blue_cloth.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/flags/flag_blue_gloss.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/flags/flag_blue_gloss.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/flags/flag_blue_glow.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/flags/flag_blue_glow.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/flags/flag_blue_laser.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/flags/flag_blue_laser.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/flags/flag_blue_norm.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/flags/flag_blue_norm.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/flags/flag_red.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/flags/flag_red.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/flags/flag_red_cloth.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/flags/flag_red_cloth.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/flags/flag_red_gloss.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/flags/flag_red_gloss.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/flags/flag_red_glow.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/flags/flag_red_glow.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/flags/flag_red_laser.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/flags/flag_red_laser.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/textures/flags/flag_red_norm.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/textures/flags/flag_red_norm.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the nexuiz-commits
mailing list