r2792 - in branches/nexuiz-2.0/data: . gfx models models/player qcsrc/server textures
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Aug 10 09:16:04 EDT 2007
Author: div0
Date: 2007-08-10 09:16:04 -0400 (Fri, 10 Aug 2007)
New Revision: 2792
Added:
branches/nexuiz-2.0/data/gfx/colormap_palette.base
branches/nexuiz-2.0/data/gfx/colormap_palette.lmp
branches/nexuiz-2.0/data/models/newprojectiles2.blend
branches/nexuiz-2.0/data/models/player/nexus.zym_6.skin
branches/nexuiz-2.0/data/textures/fbcolored.tga
branches/nexuiz-2.0/data/textures/fbcolored_bump.tga
branches/nexuiz-2.0/data/textures/fbcolored_gloss.tga
branches/nexuiz-2.0/data/textures/fbcolored_shirt.tga
Modified:
branches/nexuiz-2.0/data/default.cfg
branches/nexuiz-2.0/data/gfx/0.tga
branches/nexuiz-2.0/data/gfx/1.tga
branches/nexuiz-2.0/data/gfx/10.tga
branches/nexuiz-2.0/data/gfx/11.tga
branches/nexuiz-2.0/data/gfx/12.tga
branches/nexuiz-2.0/data/gfx/13.tga
branches/nexuiz-2.0/data/gfx/14.tga
branches/nexuiz-2.0/data/gfx/2.tga
branches/nexuiz-2.0/data/gfx/3.tga
branches/nexuiz-2.0/data/gfx/4.tga
branches/nexuiz-2.0/data/gfx/5.tga
branches/nexuiz-2.0/data/gfx/6.tga
branches/nexuiz-2.0/data/gfx/7.tga
branches/nexuiz-2.0/data/gfx/8.tga
branches/nexuiz-2.0/data/gfx/9.tga
branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc
Log:
new colors, new noobs
Modified: branches/nexuiz-2.0/data/default.cfg
===================================================================
--- branches/nexuiz-2.0/data/default.cfg 2007-08-10 13:10:01 UTC (rev 2791)
+++ branches/nexuiz-2.0/data/default.cfg 2007-08-10 13:16:04 UTC (rev 2792)
@@ -58,7 +58,7 @@
mod_q3bsp_lightmapmergepower 3
// player defaults
-_cl_color 153
+_cl_color 102
_cl_name Player
_cl_playermodel models/player/marine.zym
_cl_playerskin 0
@@ -125,6 +125,7 @@
seta sv_defaultcharacter 0
seta sv_defaultplayermodel models/player/nexus.zym
seta sv_defaultplayerskin 0
+seta sv_defaultplayercolors "" // set to 16*shirt+pants to force a color
set sv_autoscreenshot 0
net_messagetimeout 300
net_connecttimeout 30
@@ -653,14 +654,14 @@
alias singleplayer_levellist "set scmenu_campaign_dump 1; togglemenu; wait; togglemenu"
// Green's fullbright skins
-alias player_fbskin_green "playermodel models/player/nexus.zym;playerskin 3"
-alias player_fbskin_red "playermodel models/player/nexus.zym;playerskin 4"
-alias player_fbskin_orange "playermodel models/player/nexus.zym;playerskin 5"
+alias player_fbskin_green "playermodel models/player/nexus.zym;playerskin 6;color 3 3"
+alias player_fbskin_red "playermodel models/player/nexus.zym;playerskin 6;color 4 4"
+alias player_fbskin_orange "playermodel models/player/nexus.zym;playerskin 6;color 14 14"
alias player_fbskin_off "playermodel models/player/nexus.zym;playerskin 0"
-alias sv_defaultplayer_fbskin_green "sv_defaultcharacter 1;sv_defaultplayermodel models/player/nexus.zym;sv_defaultplayerskin 3"
-alias sv_defaultplayer_fbskin_red "sv_defaultcharacter 1;sv_defaultplayermodel models/player/nexus.zym;sv_defaultplayerskin 4"
-alias sv_defaultplayer_fbskin_orange "sv_defaultcharacter 1;sv_defaultplayermodel models/player/nexus.zym;sv_defaultplayerskin 5"
-alias sv_defaultplayer_fbskin_off "sv_defaultcharacter 0;sv_defaultplayerskin 0"
+alias sv_defaultplayer_fbskin_green "g_fullbrightplayers 1;sv_defaultcharacter 1;sv_defaultplayermodel models/player/nexus.zym;sv_defaultplayerskin 6;sv_defaultplayercolors 51"
+alias sv_defaultplayer_fbskin_red "g_fullbrightplayers 1;sv_defaultcharacter 1;sv_defaultplayermodel models/player/nexus.zym;sv_defaultplayerskin 6;sv_defaultplayercolors 68"
+alias sv_defaultplayer_fbskin_orange "g_fullbrightplayers 1;sv_defaultcharacter 1;sv_defaultplayermodel models/player/nexus.zym;sv_defaultplayerskin 6;sv_defaultplayercolors 238"
+alias sv_defaultplayer_fbskin_off "g_fullbrightplayers 0;sv_defaultcharacter 0;sv_defaultplayerskin 0;sv_defaultplayercolors \"\""
seta sv_servermodelsonly 1
Modified: branches/nexuiz-2.0/data/gfx/0.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/1.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/10.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/11.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/12.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/13.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/14.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/2.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/3.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/4.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/5.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/6.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/7.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/8.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/9.tga
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/gfx/colormap_palette.base (from rev 2791, trunk/data/gfx/colormap_palette.base)
===================================================================
--- branches/nexuiz-2.0/data/gfx/colormap_palette.base (rev 0)
+++ branches/nexuiz-2.0/data/gfx/colormap_palette.base 2007-08-10 13:16:04 UTC (rev 2792)
@@ -0,0 +1,26 @@
+bbbbbb
+73571f
+00BBBB
+00FF00
+FF0000
+0080ff
+cf8f2b
+b7876b
+c38baa
+FF00FF
+a3877b
+4f6357
+FFFF00
+0000FF
+ff8000
+e30074
+
+processing of player colors:
+:'<,'>!perl -pe '$_ = sprintf "\%s\n", unpack "H6", pack "CCC", map { $_ * 15/16 + 255/16 } unpack "CCC", pack "H6", $_'
+(put 1/16 white on them so other-colored light still affects them a bit)
+
+processing of scoreboard colors:
+:'<,'>!perl -pe '$_ = sprintf "\%s\n", unpack "H6", pack "CCC", map { $_ * 0.7 + 0.5 } unpack "CCC", pack "H6", $_'
+(made them darker by 30%)
+
+red has been darkened further manually
Copied: branches/nexuiz-2.0/data/gfx/colormap_palette.lmp (from rev 2791, trunk/data/gfx/colormap_palette.lmp)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/models/newprojectiles2.blend (from rev 2791, trunk/data/models/newprojectiles2.blend)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/models/player/nexus.zym_6.skin (from rev 2791, trunk/data/models/player/nexus.zym_6.skin)
===================================================================
--- branches/nexuiz-2.0/data/models/player/nexus.zym_6.skin (rev 0)
+++ branches/nexuiz-2.0/data/models/player/nexus.zym_6.skin 2007-08-10 13:16:04 UTC (rev 2792)
@@ -0,0 +1 @@
+replace "nexus" "fbcolored"
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2007-08-10 13:10:01 UTC (rev 2791)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2007-08-10 13:16:04 UTC (rev 2792)
@@ -472,16 +472,28 @@
self.customizeentityforclient = Client_customizeentityforclient;
- if(cvar("sv_defaultcharacter") == 1 && !teams_matter) {
+ if(cvar("sv_defaultcharacter") == 1) {
local string defaultmodel;
defaultmodel = cvar_string("sv_defaultplayermodel");
setmodel_lod (self, defaultmodel);
self.skin = stof(cvar_string("sv_defaultplayerskin"));
+ if(!teams_matter)
+ if(strlen(cvar_string("sv_defaultplayercolors")))
+ setcolor(self, cvar("sv_defaultplayercolors"));
} else {
self.playermodel = CheckPlayerModel(self.playermodel);
setmodel_lod (self, self.playermodel);
if(teams_matter)
- self.skin = math_mod(stof(self.playerskin), NUM_PLAYERSKINS_TEAMPLAY);
+ {
+ float s;
+ s = stof(self.playerskin);
+ if(s >= 0 && s < 3)
+ self.skin = s;
+ else if(s == 6)
+ self.skin = 6;
+ else
+ self.skin = 0;
+ }
else
self.skin = stof(self.playerskin);
}
@@ -1344,7 +1356,7 @@
}
}
- if(cvar("sv_defaultcharacter") == 1 && !teams_matter) {
+ if(cvar("sv_defaultcharacter") == 1) {
local string defaultmodel;
defaultmodel = cvar_string("sv_defaultplayermodel");
@@ -1358,6 +1370,10 @@
if (self.skin != cvar("sv_defaultplayerskin"))
self.skin = cvar("sv_defaultplayerskin");
+ if(!teams_matter)
+ if(strlen(cvar_string("sv_defaultplayercolors")))
+ if(self.clientcolors != cvar("sv_defaultplayercolors"))
+ setcolor(self, cvar("sv_defaultplayercolors"));
} else {
if (self.playermodel != self.model)
{
Modified: branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc 2007-08-10 13:10:01 UTC (rev 2791)
+++ branches/nexuiz-2.0/data/qcsrc/server/keyhunt.qc 2007-08-10 13:16:04 UTC (rev 2792)
@@ -20,7 +20,7 @@
vector KH_KEY_MIN = '-10 -10 -46';
vector KH_KEY_MAX = '10 10 3';
-float KH_KEY_BRIGHTNESS = 4;
+float KH_KEY_BRIGHTNESS = 2;
typedef void(void) kh_Think_t;
var kh_Think_t kh_Controller_Thinkfunc;
@@ -289,17 +289,13 @@
switch(teem)
{
case COLOR_TEAM1:
- //return '103 0 0' / 255.0;
- return '0.4039 0.0000 0.0000';
+ return '1 0.0625 0.0625';
case COLOR_TEAM2:
- //return '35 35 191' / 255.0;
- return '0.1373 0.1373 0.7490';
+ return '0.0625 0.0625 1';
case COLOR_TEAM3:
- //return '187 167 15' / 255.0;
- return '0.7333 0.6549 0.0588';
+ return '1 1 0.0625';
case COLOR_TEAM4:
- //return '139 79 107' / 255.0;
- return '0.5451 0.3099 0.4196';
+ return '1 0.0625 1';
default:
return '1 1 1';
}
Copied: branches/nexuiz-2.0/data/textures/fbcolored.tga (from rev 2791, trunk/data/textures/fbcolored.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/fbcolored_bump.tga (from rev 2791, trunk/data/textures/fbcolored_bump.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/fbcolored_gloss.tga (from rev 2791, trunk/data/textures/fbcolored_gloss.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/fbcolored_shirt.tga (from rev 2791, trunk/data/textures/fbcolored_shirt.tga)
===================================================================
(Binary files differ)
More information about the nexuiz-commits
mailing list