r5972 - in branches/nexuiz-2.0: . Docs Docs/htmlfiles data/gfx/menu/blueplastic data/gfx/menu/default data/gfx/menu/silver data/gfx/menu/simplygray data/gfx/menu/wickedblack data/gfx/menu/wickedblue data/gfx/menu/wickedgreen data/gfx/menu/wickedred data/gfx/menu/wickedwhite data/gfx/menu/wickedyellow data/gfx/menu/wickedz data/gfx/menu/xaw data/maps data/maps/skyway data/qcsrc/server data/scripts
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Feb 25 11:50:06 EST 2009
Author: div0
Date: 2009-02-25 11:50:05 -0500 (Wed, 25 Feb 2009)
New Revision: 5972
Added:
branches/nexuiz-2.0/data/gfx/menu/blueplastic/crosshairbutton_d.tga
branches/nexuiz-2.0/data/gfx/menu/default/crosshairbutton_d.tga
branches/nexuiz-2.0/data/gfx/menu/silver/crosshairbutton_d.tga
branches/nexuiz-2.0/data/gfx/menu/simplygray/crosshairbutton_d.tga
branches/nexuiz-2.0/data/gfx/menu/wickedblack/crosshairbutton_d.tga
branches/nexuiz-2.0/data/gfx/menu/wickedblue/crosshairbutton_d.tga
branches/nexuiz-2.0/data/gfx/menu/wickedgreen/crosshairbutton_d.tga
branches/nexuiz-2.0/data/gfx/menu/wickedred/crosshairbutton_d.tga
branches/nexuiz-2.0/data/gfx/menu/wickedwhite/crosshairbutton_d.tga
branches/nexuiz-2.0/data/gfx/menu/wickedyellow/crosshairbutton_d.tga
branches/nexuiz-2.0/data/gfx/menu/wickedz/crosshairbutton_d.tga
branches/nexuiz-2.0/data/gfx/menu/xaw/crosshairbutton_d.tga
branches/nexuiz-2.0/data/scripts/domination.shader
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/Docs/faq.html
branches/nexuiz-2.0/Docs/htmlfiles/faq.aft
branches/nexuiz-2.0/data/maps/skyway.bsp
branches/nexuiz-2.0/data/maps/skyway/lm_0000.tga
branches/nexuiz-2.0/data/maps/skyway/lm_0001.tga
branches/nexuiz-2.0/data/maps/skyway/lm_0002.tga
branches/nexuiz-2.0/data/maps/skyway/lm_0003.tga
branches/nexuiz-2.0/data/maps/skyway/lm_0004.tga
branches/nexuiz-2.0/data/maps/skyway/lm_0005.tga
branches/nexuiz-2.0/data/qcsrc/server/assault.qc
branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc
Log:
r5963 | m0rfar | 2009-02-24 23:35:34 +0100 (Tue, 24 Feb 2009) | 1 line
ooops. I forgot the shader file for the dom points. Now it looks like it was supposed to.
r5964 | div0 | 2009-02-24 23:39:06 +0100 (Tue, 24 Feb 2009) | 2 lines
add a missing image to the menu skins (fixes notexture on disabled crosshair buttons)
r5965 | esteel | 2009-02-25 12:24:29 +0100 (Wed, 25 Feb 2009) | 1 line
all the server files are in Nexuiz/server now.. the FAQ was still pointing to the old Nexuiz/Docs/server directory
r5966 | div0 | 2009-02-25 15:59:55 +0100 (Wed, 25 Feb 2009) | 2 lines
remove assault entities in non-assault games
r5967 | div0 | 2009-02-25 17:13:31 +0100 (Wed, 25 Feb 2009) | 2 lines
fix skyway by using current q3map2
r5968 | div0 | 2009-02-25 17:26:15 +0100 (Wed, 25 Feb 2009) | 2 lines
fix crash with sv_spectate 0 in team games
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-02-25 16:49:46 UTC (rev 5971)
+++ branches/nexuiz-2.0/.patchsets 2009-02-25 16:50:05 UTC (rev 5972)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-5949,5952-5961
+revisions_applied = 1-5949,5952-5968
Modified: branches/nexuiz-2.0/Docs/faq.html
===================================================================
--- branches/nexuiz-2.0/Docs/faq.html 2009-02-25 16:49:46 UTC (rev 5971)
+++ branches/nexuiz-2.0/Docs/faq.html 2009-02-25 16:50:05 UTC (rev 5972)
@@ -269,7 +269,7 @@
<h3><a name="How do I start a server?" id="How do I start a server?">How do I start a server?</a></h3>
<p class="Body">
Use the <tt>Multiplayer / Create</tt> menu to start a <tt>listen server</tt>. You will always have to play yourself in a <tt>listen server</tt>.
-If you want to create a server without being forced to play yourself please take a look at the file <tt>readme.txt</tt> in the <tt>Docs/server/</tt> directory where the <tt>dedicated server</tt> is explained.
+If you want to create a server without being forced to play yourself please take a look at the file <tt>readme.txt</tt> in the <tt>Nexuiz/server/</tt> directory where the <tt>dedicated server</tt> is explained.
</p>
<!--End Section 2-->
<h3><a name="Which ports do I have to open in firewall/forward from my router to run a server?" id="Which ports do I have to open in firewall/forward from my router to run a server?">Which ports do I have to open in firewall/forward from my router to run a server?</a></h3>
Modified: branches/nexuiz-2.0/Docs/htmlfiles/faq.aft
===================================================================
--- branches/nexuiz-2.0/Docs/htmlfiles/faq.aft 2009-02-25 16:49:46 UTC (rev 5971)
+++ branches/nexuiz-2.0/Docs/htmlfiles/faq.aft 2009-02-25 16:50:05 UTC (rev 5972)
@@ -133,7 +133,7 @@
** How do I start a server?
Use the |Multiplayer / Create| menu to start a |listen server|. You will always have to play yourself in a |listen server|.
-If you want to create a server without being forced to play yourself please take a look at the file |readme.txt| in the |Docs/server/| directory where the |dedicated server| is explained.
+If you want to create a server without being forced to play yourself please take a look at the file |readme.txt| in the |Nexuiz/server/| directory where the |dedicated server| is explained.
** Which ports do I have to open in firewall/forward from my router to run a server?
The default port is 26000 UDP. You can change that in the |Multiplayer / Create| menu or by starting Nexuiz with the parameter |-port <port>| or having a line |port <port>| in the server config file.
Copied: branches/nexuiz-2.0/data/gfx/menu/blueplastic/crosshairbutton_d.tga (from rev 5968, trunk/data/gfx/menu/blueplastic/crosshairbutton_d.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/gfx/menu/default/crosshairbutton_d.tga (from rev 5968, trunk/data/gfx/menu/default/crosshairbutton_d.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/gfx/menu/silver/crosshairbutton_d.tga (from rev 5968, trunk/data/gfx/menu/silver/crosshairbutton_d.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/gfx/menu/simplygray/crosshairbutton_d.tga (from rev 5968, trunk/data/gfx/menu/simplygray/crosshairbutton_d.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/gfx/menu/wickedblack/crosshairbutton_d.tga (from rev 5968, trunk/data/gfx/menu/wickedblack/crosshairbutton_d.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/gfx/menu/wickedblue/crosshairbutton_d.tga (from rev 5968, trunk/data/gfx/menu/wickedblue/crosshairbutton_d.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/gfx/menu/wickedgreen/crosshairbutton_d.tga (from rev 5968, trunk/data/gfx/menu/wickedgreen/crosshairbutton_d.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/gfx/menu/wickedred/crosshairbutton_d.tga (from rev 5968, trunk/data/gfx/menu/wickedred/crosshairbutton_d.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/gfx/menu/wickedwhite/crosshairbutton_d.tga (from rev 5968, trunk/data/gfx/menu/wickedwhite/crosshairbutton_d.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/gfx/menu/wickedyellow/crosshairbutton_d.tga (from rev 5968, trunk/data/gfx/menu/wickedyellow/crosshairbutton_d.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/gfx/menu/wickedz/crosshairbutton_d.tga (from rev 5968, trunk/data/gfx/menu/wickedz/crosshairbutton_d.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/gfx/menu/xaw/crosshairbutton_d.tga (from rev 5968, trunk/data/gfx/menu/xaw/crosshairbutton_d.tga)
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/maps/skyway/lm_0000.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/maps/skyway/lm_0001.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/maps/skyway/lm_0002.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/maps/skyway/lm_0003.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/maps/skyway/lm_0004.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/maps/skyway/lm_0005.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/maps/skyway.bsp
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/qcsrc/server/assault.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/assault.qc 2009-02-25 16:49:46 UTC (rev 5971)
+++ branches/nexuiz-2.0/data/qcsrc/server/assault.qc 2009-02-25 16:50:05 UTC (rev 5972)
@@ -51,6 +51,11 @@
}
void spawnfunc_target_objective() {
+ if(!g_assault)
+ {
+ remove(self);
+ return;
+ }
self.classname = "target_objective";
self.use = assault_objective_use;
assault_objective_reset();
@@ -155,6 +160,11 @@
//=============================================================================
void spawnfunc_target_objective_decrease() {
+ if(!g_assault)
+ {
+ remove(self);
+ return;
+ }
self.classname = "target_objective_decrease";
@@ -171,6 +181,11 @@
// destructible walls that can be used to trigger target_objective_decrease
void spawnfunc_func_assault_destructible() {
+ if(!g_assault)
+ {
+ remove(self);
+ return;
+ }
self.spawnflags = 3;
spawnfunc_func_breakable();
}
@@ -188,6 +203,11 @@
}
void spawnfunc_func_assault_wall() {
+ if(!g_assault)
+ {
+ remove(self);
+ return;
+ }
self.classname = "func_assault_wall";
self.mdl = self.model;
setmodel(self, self.mdl);
@@ -209,6 +229,11 @@
}
void spawnfunc_target_assault_roundend() {
+ if(!g_assault)
+ {
+ remove(self);
+ return;
+ }
self.winning = 0; // round not yet won by attackers
self.classname = "target_assault_roundend";
self.use = target_assault_roundend_use;
@@ -250,6 +275,11 @@
}
void spawnfunc_target_assault_roundstart() {
+ if(!g_assault)
+ {
+ remove(self);
+ return;
+ }
assault_attacker_team = COLOR_TEAM1;
self.classname = "target_assault_roundstart";
self.use = assault_roundstart_use;
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2009-02-25 16:49:46 UTC (rev 5971)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2009-02-25 16:50:05 UTC (rev 5972)
@@ -1207,13 +1207,27 @@
//if(g_domination)
// dom_player_join_team(self);
- //JoinBestTeam(self, FALSE, FALSE);
- //
if((cvar("sv_spectate") == 1 && !g_lms) || cvar("g_campaign")) {
self.classname = "observer";
} else {
- self.classname = "player";
- campaign_bots_may_start = 1;
+ if(cvar("teamplay"))
+ {
+ if(cvar("g_balance_teams") || cvar("g_balance_teams_force"))
+ {
+ self.classname = "player";
+ campaign_bots_may_start = 1;
+ JoinBestTeam(self, FALSE, TRUE);
+ }
+ else
+ {
+ self.classname = "observer"; // do it anyway
+ }
+ }
+ else
+ {
+ self.classname = "player";
+ campaign_bots_may_start = 1;
+ }
}
self.playerid = (playerid_last = playerid_last + 1);
Modified: branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc 2009-02-25 16:49:46 UTC (rev 5971)
+++ branches/nexuiz-2.0/data/qcsrc/server/teamplay.qc 2009-02-25 16:50:05 UTC (rev 5972)
@@ -919,7 +919,7 @@
steam = 2;
else if(scolor == COLOR_TEAM3 - 1)
steam = 3;
- else if(scolor == COLOR_TEAM4 - 1)
+ else // if(scolor == COLOR_TEAM4 - 1)
steam = 4;
if(dcolor == COLOR_TEAM1 - 1)
dteam = 1;
@@ -927,7 +927,7 @@
dteam = 2;
else if(dcolor == COLOR_TEAM3 - 1)
dteam = 3;
- else if(dcolor == COLOR_TEAM4 - 1)
+ else // if(dcolor == COLOR_TEAM4 - 1)
dteam = 4;
CheckAllowedTeams(self);
Copied: branches/nexuiz-2.0/data/scripts/domination.shader (from rev 5968, trunk/data/scripts/domination.shader)
===================================================================
--- branches/nexuiz-2.0/data/scripts/domination.shader (rev 0)
+++ branches/nexuiz-2.0/data/scripts/domination.shader 2009-02-25 16:50:05 UTC (rev 5972)
@@ -0,0 +1,39 @@
+textures/domination/dom_unclaimed {
+ nopicmip
+ {
+ map textures/domination/dom_unclaimed.tga
+ blendfunc add
+ }
+}
+
+textures/domination/dom_red {
+ nopicmip
+ {
+ map textures/domination/dom_red.tga
+ blendfunc add
+ }
+}
+
+textures/domination/dom_blue {
+ nopicmip
+ {
+ map textures/domination/dom_blue.tga
+ blendfunc add
+ }
+}
+
+textures/domination/dom_yellow {
+ nopicmip
+ {
+ map textures/domination/dom_yellow.tga
+ blendfunc add
+ }
+}
+
+textures/domination/dom_pink {
+ nopicmip
+ {
+ map textures/domination/dom_pink.tga
+ blendfunc add
+ }
+}
More information about the nexuiz-commits
mailing list