[nexuiz-commits] r7543 - in branches/nexuiz-2.0: . data data/env/hip_inter data/gfx/hud data/qcsrc/client data/qcsrc/server/tturrets/system data/qcsrc/server/tturrets/units data/scripts misc/mediasource/hud server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu Aug 27 06:48:25 EDT 2009
Author: div0
Date: 2009-08-27 06:48:25 -0400 (Thu, 27 Aug 2009)
New Revision: 7543
Added:
branches/nexuiz-2.0/data/env/hip_inter/README.TXT
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/defaultNexuiz.cfg
branches/nexuiz-2.0/data/gfx/hud/sbar.tga
branches/nexuiz-2.0/data/qcsrc/client/main.qh
branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
branches/nexuiz-2.0/data/qcsrc/server/tturrets/system/system_main.qc
branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_ewheel.qc
branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_flac.qc
branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_fusionreactor.qc
branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_hellion.qc
branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_hk.qc
branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_machinegun.qc
branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_mlrs.qc
branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_phaser.qc
branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_plasma.qc
branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_tessla.qc
branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_walker.qc
branches/nexuiz-2.0/data/scripts/shaderlist.txt
branches/nexuiz-2.0/misc/mediasource/hud/sbar.xcf
branches/nexuiz-2.0/server/server.cfg
Log:
r7528 | fruitiex | 2009-08-26 08:08:39 -0400 (Wed, 26 Aug 2009) | 2 lines
bigger observed player's name
r7529 | fruitiex | 2009-08-26 08:15:53 -0400 (Wed, 26 Aug 2009) | 2 lines
dynamic placement for the spectator's name according to sbar_fontsize_spec...
r7530 | fruitiex | 2009-08-26 08:57:25 -0400 (Wed, 26 Aug 2009) | 2 lines
move powerup timer instead of scores at vid_conwidth < 800
r7531 | fruitiex | 2009-08-26 09:33:46 -0400 (Wed, 26 Aug 2009) | 2 lines
move fuel ammo at vid_conwidth < 800
r7534 | fruitiex | 2009-08-26 11:16:21 -0400 (Wed, 26 Aug 2009) | 2 lines
sbar.qc positioning fixes, please test
r7535 | fruitiex | 2009-08-26 11:17:45 -0400 (Wed, 26 Aug 2009) | 2 lines
whoops, forgot these
r7536 | fruitiex | 2009-08-26 14:24:59 -0400 (Wed, 26 Aug 2009) | 2 lines
warmup text hidden for spectators
r7537 | tzork | 2009-08-26 15:06:39 -0400 (Wed, 26 Aug 2009) | 1 line
Fix turrets bboxes.
r7538 | fruitiex | 2009-08-26 15:25:21 -0400 (Wed, 26 Aug 2009) | 2 lines
readme.txt for hip_inter
r7539 | m0rfar | 2009-08-26 15:32:28 -0400 (Wed, 26 Aug 2009) | 1 line
sync shaderlist and maplist
r7540 | fruitiex | 2009-08-27 00:45:58 -0400 (Thu, 27 Aug 2009) | 2 lines
original stormkeep removed from maplist, the map should be there only for compatibility. revert if you think otherwise :P
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-08-27 10:47:02 UTC (rev 7542)
+++ branches/nexuiz-2.0/.patchsets 2009-08-27 10:48:25 UTC (rev 7543)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7513,7516-7525
+revisions_applied = 1-7513,7516-7525,7528-7531,7534-7540
Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-08-27 10:47:02 UTC (rev 7542)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-08-27 10:48:25 UTC (rev 7543)
@@ -26,7 +26,7 @@
seta g_configversion 0 "Configuration file version (used to upgrade settings) 0: first run, or previous start was <2.4.1 Later, it's overridden by config.cfg, version ranges are defined in config_update.cfg"
// default.cfg versioning (update using update-cvarcount.sh, run that every time after adding a new cvar)
-set cvar_check_default f65221846eecbdf910cfb40f5839ac0d
+set cvar_check_default ff6f4ae047891b3b61ecfc5b3d3b38b4
// Nexuiz version (formatted for machines)
// used to determine if a client version is compatible
@@ -463,7 +463,7 @@
set g_throughfloor 1 "set to 0 to disable damage through floor"
set g_maplist_mostrecent "" "contains the name of the maps that were most recently played"
seta g_maplist_mostrecent_count 3 "number of most recent maps that are blocked from being played again"
-seta g_maplist "accident aggressor aneurysm basement basementctf bleach bloodprison bloodprisonctf bluesky cyberparcour01 darkzone desertfactory dieselpower downer eggandbacon evilspace farewell final_rage nr_piece-o-cake ons-reborn racetrack reslimed ruiner runningman runningman_1on1remix runningmanctf silvercity skyway slimepit soylent starship stormkeep strength toxic warfare"
+seta g_maplist "accident aggressor aneurysm basement basementctf bleach bloodprison bloodprisonctf bluesky cyberparcour01 darkzone desertfactory dieselpower downer eggandbacon evilspace farewell final_rage nr_piece-o-cake ons-reborn racetrack reslimed ruiner runningman runningman_1on1remix runningmanctf silvercity skyway slimepit soylent starship stormkeep2 strength toxic warfare"
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"
seta g_maplist_shuffle 1 "new randomization method: like selectrandom, but avoid playing the same maps in short succession. This works by taking out the first element and inserting it into g_maplist with a bias to the end of the list"
@@ -1292,7 +1292,7 @@
// good settings for these fonts
con_chat 5
-con_chatpos -7
+con_chatpos -9
con_chatsize 10
con_chatwidth 0.6
con_notifysize 10
@@ -1410,6 +1410,7 @@
// sbar: font size
seta sbar_fontsize 11
+seta sbar_fontsize_spec 16
seta scr_centersize 11
seta sbar_width 560
alias sbar_font "loadfont user1 $*; loadfont user2 ${*}-big; sbar_columns_set"
Copied: branches/nexuiz-2.0/data/env/hip_inter/README.TXT (from rev 7540, trunk/data/env/hip_inter/README.TXT)
===================================================================
--- branches/nexuiz-2.0/data/env/hip_inter/README.TXT (rev 0)
+++ branches/nexuiz-2.0/data/env/hip_inter/README.TXT 2009-08-27 10:48:25 UTC (rev 7543)
@@ -0,0 +1,14 @@
+UPDATED THE 28TH, REMOVED A FUNKY PLANET
+
+INTERSTELLAR
+high res 1024^2 environment map
+ships as TGA.
+
+
+By Jockum Skoglund aka hipshot
+hipshot at zfight.com
+www.zfight.com
+Stockholm, 2005 08 25
+
+
+Modify however you like, just cred me for my work, maybe link to my page.
Modified: branches/nexuiz-2.0/data/gfx/hud/sbar.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/qcsrc/client/main.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/main.qh 2009-08-27 10:47:02 UTC (rev 7542)
+++ branches/nexuiz-2.0/data/qcsrc/client/main.qh 2009-08-27 10:48:25 UTC (rev 7543)
@@ -96,6 +96,7 @@
vector sbar_fontsize;
+vector sbar_fontsize_spec;
//float csqc_flags;
Modified: branches/nexuiz-2.0/data/qcsrc/client/sbar.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/sbar.qc 2009-08-27 10:47:02 UTC (rev 7542)
+++ branches/nexuiz-2.0/data/qcsrc/client/sbar.qc 2009-08-27 10:48:25 UTC (rev 7543)
@@ -1284,14 +1284,8 @@
offset = '0 0 0';
- if (vid_conwidth >= 800) {
- score_offset_x = 196;
- score_offset_y = 36;
- }
- else { // move the scores if vid_conwidth < 800
- score_offset_x = 196;
- score_offset_y = 84;
- }
+ score_offset_x = 196;
+ score_offset_y = 36;
score_offset_z = 0;
if((scores_flags[ps_primary] & SFL_TIME) && !teamplay)
@@ -1625,6 +1619,7 @@
}
void CSQC_Strength_Timer() {
+ vector pos;
vector bottom;
bottom_x = vid_conwidth/2;
@@ -1648,6 +1643,11 @@
picsize = '22 22 0';
countdown_fontsize = 18;
+ if (vid_conwidth >= 800)
+ pos = bottom + '192 -46 0';
+ else
+ pos = bottom + '192 -94 0';
+
//strength
strength_time = getstatf(STAT_STRENGTH_FINISHED);
invincibility_time = getstatf(STAT_INVINCIBLE_FINISHED);
@@ -1658,18 +1658,18 @@
{
if(dt < 5)
{
- drawpic_expanding_two(bottom + '192 -46 0', "gfx/hud/sb_str", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,
+ drawpic_expanding_two(pos, "gfx/hud/sb_str", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,
bound(0, (ceil(dt) - dt) / 0.5, 1));
}
else
{
- drawpic(bottom + '192 -46 0', "gfx/hud/sb_str", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);
+ drawpic(pos, "gfx/hud/sb_str", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);
}
- Sbar_DrawXNum(bottom + '152 -44 0', ceil(dt), 2, countdown_fontsize, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
+ Sbar_DrawXNum(pos - '40 -2 0', ceil(dt), 2, countdown_fontsize, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
}
else if(dt > -1)
{
- drawpic_expanding(bottom + '192 -46 0', "gfx/hud/sb_str", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,
+ drawpic_expanding(pos, "gfx/hud/sb_str", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,
bound(0, -dt / 0.5, 1));
}
}
@@ -1681,18 +1681,18 @@
{
if(dt < 5)
{
- drawpic_expanding_two(bottom + '192 -24 0', "gfx/hud/sb_invinc", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,
+ drawpic_expanding_two(pos - '0 -22 0', "gfx/hud/sb_invinc", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,
bound(0, (ceil(dt) - dt) / 0.5, 1));
}
else
{
- drawpic(bottom + '192 -24 0', "gfx/hud/sb_invinc", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);
+ drawpic(pos - '0 -22 0', "gfx/hud/sb_invinc", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE);
}
- Sbar_DrawXNum(bottom + '152 -22 0', ceil(dt), 2, countdown_fontsize, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
+ Sbar_DrawXNum(pos - '40 -24 0', ceil(dt), 2, countdown_fontsize, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
}
else if(dt > -1)
{
- drawpic_expanding(bottom + '192 -24 0', "gfx/hud/sb_invinc", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,
+ drawpic_expanding(pos - '0 -22 0', "gfx/hud/sb_invinc", picsize, '1 1 1', sbar_alpha_fg, DRAWFLAG_ADDITIVE,
bound(0, -dt / 0.5, 1));
}
}
@@ -2206,6 +2206,7 @@
pos = '0 0 0';
sbar_fontsize = Sbar_GetFontsize("sbar_fontsize");
+ sbar_fontsize_spec = Sbar_GetFontsize("sbar_fontsize_spec");
if(spectatee_status && !intermission)
{
@@ -2215,9 +2216,9 @@
s = GetPlayerName(spectatee_status - 1);
// spectated player name between HUD and chat area, aligned to the left
pos_x = bottomleft_x;
- pos_y = bottom_y - 61;
- s = textShortenToWidth(s, vid_conwidth/2.5/sbar_fontsize_x, stringwidth_colors);
- drawcolorcodedstring(pos, s, sbar_fontsize, 1, DRAWFLAG_NORMAL);
+ pos_y = bottom_y - 50 - sbar_fontsize_spec_y;
+ s = textShortenToWidth(s, vid_conwidth/2.5/sbar_fontsize_spec_x, stringwidth_colors);
+ drawcolorcodedstring(pos, s, sbar_fontsize_spec, 1, DRAWFLAG_NORMAL);
// spectator text in the upper right corner
if(spectatee_status == -1)
@@ -2276,7 +2277,7 @@
else
blinkcolor = "^3";
- if(ready_waiting && !intermission)
+ if(ready_waiting && !intermission && !spectatee_status)
{
if(ready_waiting_for_me)
{
@@ -2294,7 +2295,7 @@
}
o = Sbar_DrawNoteLine(o, s);
}
- else if(warmup_stage && !intermission)
+ else if(warmup_stage && !intermission && !spectatee_status)
{
s = strcat("^2Press ^3", getcommandkey("ready", "ready"), "^2 to end warmup");
o = Sbar_DrawNoteLine(o, s);
@@ -2392,29 +2393,20 @@
fade = bound(0.7, fade, 1);
vector bg_size; // hud background size
- bg_size_x = 800;
- if (vid_conwidth > 800) // if conwidth > 800, resize the background image
- bg_size_x = vid_conwidth;
+ bg_size_x = 1600;
bg_size_y = 58;
bg_size_z = 0;
- vector bgoffset; // hud background offset
- bgoffset_x = 0;
- bgoffset_y = 0;
- bgoffset_z = 0;
- if (vid_conwidth < 800) // if conwidth < 800 we need to offset the background image to keep it centered, as it will be scaled up
- bgoffset_x = (vid_conwidth - 800) / 2;
-
- if (cvar("viewsize") <= 100) {
+ if (cvar("viewsize") <= 100 && vid_conwidth <= 1600) {
if (teamplay)
- drawpic(bottomleft - '0 58 0' + bgoffset, "gfx/hud/sbar", bg_size, GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // hud color = myteam color
+ drawpic(bottom - '800 58 0', "gfx/hud/sbar", bg_size, GetTeamRGB(myteam) * sbar_color_bg_team, sbar_alpha_bg, DRAWFLAG_NORMAL); // hud color = myteam color
else {
// allow for custom HUD colors in non-teamgames
color_x = cvar("sbar_color_bg_r");
color_y = cvar("sbar_color_bg_g");
color_z = cvar("sbar_color_bg_b");
- drawpic(bottomleft - '0 58 0' + bgoffset, "gfx/hud/sbar", bg_size, color, sbar_alpha_bg, DRAWFLAG_NORMAL);
+ drawpic(bottom - '800 58 0', "gfx/hud/sbar", bg_size, color, sbar_alpha_bg, DRAWFLAG_NORMAL);
}
}
@@ -2498,43 +2490,47 @@
{
if (stat_items & GetAmmoItemCode(i))
{
- if (vid_conwidth < 800)
- pos_x = 105;
- else
- pos_x = 170;
- pos_y = -40;
+ if (vid_conwidth >= 800) {
+ pos_x = 230;
+ pos_y = 40;
+ }
+ else {
+ pos_x = 206;
+ pos_y = 33;
+ }
- drawpic(bottomleft + pos + '0 1.5 0', "gfx/hud/sb_ammobg", '107 29 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
- drawpic(bottomleft + pos + '76 3 0', GetAmmoPicture(i), '24 24 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+ if(vid_conwidth >= 800)
+ drawpic(bottom - pos + '0 1.5 0', "gfx/hud/sb_ammobg", '107 29 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+ drawpic(bottom - pos + '76 3 0', GetAmmoPicture(i), '24 24 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
if(a < 10)
- Sbar_DrawXNum(bottomleft + pos + '5 5 0', a, 3, 24, '0.7 0 0', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
+ Sbar_DrawXNum(bottom - pos + '5 5 0', a, 3, 24, '0.7 0 0', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
else
- Sbar_DrawXNum(bottomleft + pos + '5 5 0', a, 3, 24, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
+ Sbar_DrawXNum(bottom - pos + '5 5 0', a, 3, 24, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
}
}
else
{
if (a > 0) {
switch (i) {
- case 0: pos_x = 114; pos_y = -48; break; // shells
- case 1: pos_x = 114; pos_y = -26; break; // bullets
- case 2: pos_x = 200; pos_y = -48; break; // rockets
- case 3: pos_x = 200; pos_y = -26; break; // cells
+ case 0: pos_x = 286; pos_y = 48; break; // shells
+ case 1: pos_x = 286; pos_y = 26; break; // bullets
+ case 2: pos_x = 200; pos_y = 48; break; // rockets
+ case 3: pos_x = 200; pos_y = 26; break; // cells
}
if (stat_items & GetAmmoItemCode(i))
- drawpic(bottomleft + pos + '0 1.5 0', "gfx/hud/sb_ammobg", '80 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
- drawpic(bottomleft + pos + '56 3 0', GetAmmoPicture(i), '18 18 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+ drawpic(bottom - pos + '0 1.5 0', "gfx/hud/sb_ammobg", '80 22 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
+ drawpic(bottom - pos + '56 3 0', GetAmmoPicture(i), '18 18 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
if (a < 10) {
if(stat_items & GetAmmoItemCode(i))
- Sbar_DrawXNum(bottomleft + pos + '6 4.5 0', a, 3, 16, '0.7 0 0', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
+ Sbar_DrawXNum(bottom - pos + '6 4.5 0', a, 3, 16, '0.7 0 0', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
else
- Sbar_DrawXNum(bottomleft + pos + '6 4.5 0', a, 3, 16, '0.7 0 0', 0, 0, sbar_alpha_fg * 0.7, DRAWFLAG_NORMAL);
+ Sbar_DrawXNum(bottom - pos + '6 4.5 0', a, 3, 16, '0.7 0 0', 0, 0, sbar_alpha_fg * 0.7, DRAWFLAG_NORMAL);
} else {
if(stat_items & GetAmmoItemCode(i))
- Sbar_DrawXNum(bottomleft + pos + '6 4.5 0', a, 3, 16, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
+ Sbar_DrawXNum(bottom - pos + '6 4.5 0', a, 3, 16, '1 1 1', 0, 0, sbar_alpha_fg, DRAWFLAG_NORMAL);
else
- Sbar_DrawXNum(bottomleft + pos + '6 4.5 0', a, 3, 16, '0.7 0.7 0.7', 0, 0, sbar_alpha_fg * 0.7, DRAWFLAG_NORMAL);
+ Sbar_DrawXNum(bottom - pos + '6 4.5 0', a, 3, 16, '0.7 0.7 0.7', 0, 0, sbar_alpha_fg * 0.7, DRAWFLAG_NORMAL);
}
}
}
@@ -2547,13 +2543,19 @@
float invincibility_time, dt;
invincibility_time = getstatf(STAT_INVINCIBLE_FINISHED);
dt = invincibility_time - time;
- if (dt > 0) { // if the invincibility timer is active, draw fuel ammo elsewhere
- pos_x = bottom_x + 140;
- pos_y = bottom_y - 72;
+ if (vid_conwidth >= 800) {
+ if (dt > 0) { // if the invincibility timer is active, draw fuel ammo elsewhere
+ pos_x = bottom_x + 140;
+ pos_y = bottom_y - 72;
+ }
+ else { // if the invincibility timer is inactive, draw the fuel ammo there (it's rare to have invincibility + fuel anyway)
+ pos_x = bottom_x + 140;
+ pos_y = bottom_y - 20;
+ }
}
- else { // if the invincibility timer is inactive, draw the fuel ammo there (it's rare to have invincibility + fuel anyway)
- pos_x = bottom_x + 140;
- pos_y = bottom_y - 22;
+ else { // draw fuel on top of ammo if vid_conwidth < 800
+ pos_x = bottom_x - 200;
+ pos_y = bottom_y - 45;
}
drawpic(pos - '0 2 0' + '52 0 0', GetAmmoPicture(4), '20 20 0', '1 1 1', sbar_alpha_fg, DRAWFLAG_NORMAL);
if (a > 10)
Modified: branches/nexuiz-2.0/data/qcsrc/server/tturrets/system/system_main.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/tturrets/system/system_main.qc 2009-08-27 10:47:02 UTC (rev 7542)
+++ branches/nexuiz-2.0/data/qcsrc/server/tturrets/system/system_main.qc 2009-08-27 10:48:25 UTC (rev 7543)
@@ -881,7 +881,7 @@
* (unless you have a very good reason not to)
* if the return value is 0, the turret should be removed.
*/
-float turret_stdproc_init (string cvar_base_name, float csqc_shared)
+float turret_stdproc_init (string cvar_base_name, float csqc_shared, string base, string head)
{
entity e,ee;
@@ -1146,6 +1146,13 @@
self.tur_head.team = self.team;
self.tur_head.owner = self;
+ setmodel(self,base);
+ setmodel(self.tur_head,head);
+
+ setsize(self,'-32 -32 0','32 32 32');
+ setsize(self.tur_head,'-32 -32 0','32 32 32');
+
+
// Defend mode?
if(!self.tur_defend)
if (self.target != "")
Modified: branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_ewheel.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_ewheel.qc 2009-08-27 10:47:02 UTC (rev 7542)
+++ branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_ewheel.qc 2009-08-27 10:48:25 UTC (rev 7543)
@@ -439,7 +439,7 @@
self.turret_respawnhook = ewheel_respawnhook;
self.turret_diehook = ewheel_diehook;
- if (turret_stdproc_init("ewheel_std",0) == 0)
+ if (turret_stdproc_init("ewheel_std",0,"models/turrets/ewheel-base.md3","models/turrets/ewheel-gun1.md3") == 0)
{
remove(self);
return;
@@ -454,9 +454,9 @@
self.solid = SOLID_SLIDEBOX;
self.takedamage = DAMAGE_AIM;
- setmodel(self,"models/turrets/ewheel-base.md3");
- setmodel(self.tur_head,"models/turrets/ewheel-gun1.md3");
setattachment(self.tur_head,self,"tag_head");
+ setsize(self,'-32 -32 0','32 32 48');
+ setsize(self.tur_head,'0 0 0','0 0 0');
self.pos1 = self.origin;
Modified: branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_flac.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_flac.qc 2009-08-27 10:47:02 UTC (rev 7542)
+++ branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_flac.qc 2009-08-27 10:48:25 UTC (rev 7543)
@@ -94,18 +94,16 @@
self.ammo_flags = TFL_AMMO_ROCKETS | TFL_AMMO_RECHARGE;
self.aim_flags = TFL_AIM_LEAD | TFL_AIM_SHOTTIMECOMPENSATE;
- if (turret_stdproc_init("flac_std",0) == 0)
+ if (turret_stdproc_init("flac_std",0,"models/turrets/base.md3","models/turrets/flac.md3") == 0)
{
remove(self);
return;
}
+ setsize(self.tur_head,'-32 -32 0','32 32 64');
self.damage_flags |= TFL_DMG_HEADSHAKE;
self.target_select_flags |= TFL_TARGETSELECT_NOTURRETS;
- setmodel(self,"models/turrets/base.md3");
- setmodel(self.tur_head,"models/turrets/flac.md3");
-
if (!turret_tag_setup())
dprint("Warning: Turret ",self.classname, " faild to initialize md3 tags\n");
Modified: branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_fusionreactor.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_fusionreactor.qc 2009-08-27 10:47:02 UTC (rev 7542)
+++ branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_fusionreactor.qc 2009-08-27 10:48:25 UTC (rev 7543)
@@ -49,18 +49,13 @@
self.aim_flags = TFL_AIM_NO;
self.track_flags = TFL_TRACK_NO;
self.turret_respawnhook = turret_fusionreactor_respawnhook;
- if (turret_stdproc_init("fusreac_std",0) == 0)
+ if (turret_stdproc_init("fusreac_std",0,"models/turrets/base.md3","models/turrets/reactor.md3") == 0)
{
remove(self);
return;
}
+ setsize(self.tur_head,'-32 -32 0','32 32 64');
- setmodel(self,"models/turrets/base.md3");
- setmodel(self.tur_head,"models/turrets/reactor.md3");
-
- //if(!turret_tag_setup())
- // dprint("Warning: Turret ",self.classname, " faild to initialize md3 tags\n");
-
self.tur_head.scale = 0.75;
setorigin(self.tur_head,self.origin + '0 0 25');
self.tur_head.avelocity = '0 50 0';
Modified: branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_hellion.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_hellion.qc 2009-08-27 10:47:02 UTC (rev 7542)
+++ branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_hellion.qc 2009-08-27 10:48:25 UTC (rev 7543)
@@ -188,15 +188,12 @@
self.firecheck_flags = TFL_FIRECHECK_WORLD | TFL_FIRECHECK_DEAD | TFL_FIRECHECK_DISTANCES | TFL_FIRECHECK_TEAMCECK | TFL_FIRECHECK_REFIRE | TFL_FIRECHECK_AFF | TFL_FIRECHECK_OWM_AMMO;
self.ammo_flags = TFL_AMMO_ROCKETS | TFL_AMMO_RECHARGE;
- if (turret_stdproc_init("hellion_std",0) == 0)
+ if (turret_stdproc_init("hellion_std",0,"models/turrets/base.md3","models/turrets/hellion.md3") == 0)
{
remove(self);
return;
}
- setmodel(self,"models/turrets/base.md3");
- setmodel(self.tur_head,"models/turrets/hellion.md3");
-
if (!turret_tag_setup())
dprint("Warning: Turret ",self.classname, " faild to initialize md3 tags\n");
Modified: branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_hk.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_hk.qc 2009-08-27 10:47:02 UTC (rev 7542)
+++ branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_hk.qc 2009-08-27 10:48:25 UTC (rev 7543)
@@ -433,7 +433,7 @@
self.shoot_flags = TFL_SHOOT_CLEARTARGET;
- if (turret_stdproc_init("hk_std",0) == 0)
+ if (turret_stdproc_init("hk_std",0,"models/turrets/base.md3","models/turrets/hk.md3") == 0)
{
remove(self);
return;
@@ -441,8 +441,6 @@
self.target_validate_flags = TFL_TARGETSELECT_PLAYERS | TFL_TARGETSELECT_TEAMCHECK;
- setmodel(self,"models/turrets/base.md3");
- setmodel(self.tur_head,"models/turrets/hk.md3");
if (!turret_tag_setup())
dprint("Warning: Turret ",self.classname, " faild to initialize md3 tags\n");
Modified: branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_machinegun.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_machinegun.qc 2009-08-27 10:47:02 UTC (rev 7542)
+++ branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_machinegun.qc 2009-08-27 10:48:25 UTC (rev 7543)
@@ -42,7 +42,7 @@
else
self.aim_flags |= TFL_AIM_SHOTTIMECOMPENSATE;
- if (turret_stdproc_init("machinegun_std",0) == 0)
+ if (turret_stdproc_init("machinegun_std",0,"models/turrets/base.md3","models/turrets/machinegun.md3") == 0)
{
remove(self);
return;
@@ -50,9 +50,6 @@
self.damage_flags |= TFL_DMG_HEADSHAKE;
- setmodel(self,"models/turrets/base.md3");
- setmodel(self.tur_head,"models/turrets/machinegun.md3");
-
if (!turret_tag_setup())
dprint("Warning: Turret ",self.classname, " faild to initialize md3 tags\n");
Modified: branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_mlrs.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_mlrs.qc 2009-08-27 10:47:02 UTC (rev 7542)
+++ branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_mlrs.qc 2009-08-27 10:48:25 UTC (rev 7543)
@@ -103,7 +103,7 @@
self.ammo_flags = TFL_AMMO_ROCKETS | TFL_AMMO_RECHARGE;
self.aim_flags = TFL_AIM_LEAD | TFL_AIM_ZEASE | TFL_AIM_SHOTTIMECOMPENSATE | TFL_AIM_INFRONT;
- if (turret_stdproc_init("mlrs_std",0) == 0)
+ if (turret_stdproc_init("mlrs_std",0,"models/turrets/base.md3","models/turrets/mlrs.md3") == 0)
{
remove(self);
return;
@@ -114,9 +114,6 @@
self.shoot_flags |= TFL_SHOOT_VOLLYALWAYS;
self.volly_counter = self.shot_volly;
- setmodel(self,"models/turrets/base.md3");
- setmodel(self.tur_head,"models/turrets/mlrs.md3");
-
if (!turret_tag_setup())
dprint("Warning: Turret ",self.classname, " faild to initialize md3 tags\n");
Modified: branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_phaser.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_phaser.qc 2009-08-27 10:47:02 UTC (rev 7542)
+++ branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_phaser.qc 2009-08-27 10:48:25 UTC (rev 7543)
@@ -116,15 +116,12 @@
self.ammo_flags = TFL_AMMO_ENERGY | TFL_AMMO_RECHARGE | TFL_AMMO_RECIVE;
self.aim_flags = TFL_AIM_ZEASE | TFL_AIM_LEAD;
- if (turret_stdproc_init("phaser_std",0) == 0)
+ if (turret_stdproc_init("phaser_std",0,"models/turrets/base.md3","models/turrets/phaser.md3") == 0)
{
remove(self);
return;
}
- setmodel(self,"models/turrets/base.md3");
- setmodel(self.tur_head,"models/turrets/phaser.md3");
-
if (!turret_tag_setup())
dprint("Warning: Turret ",self.classname, " faild to initialize md3 tags\n");
Modified: branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_plasma.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_plasma.qc 2009-08-27 10:47:02 UTC (rev 7542)
+++ branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_plasma.qc 2009-08-27 10:48:25 UTC (rev 7543)
@@ -127,7 +127,7 @@
self.aim_flags = TFL_AIM_LEAD | TFL_AIM_SHOTTIMECOMPENSATE | TFL_AIM_GROUND2;
self.turrcaps_flags = TFL_TURRCAPS_RADIUSDMG | TFL_TURRCAPS_MEDPROJ | TFL_TURRCAPS_PLAYERKILL | TFL_TURRCAPS_MISSILEKILL;
- if (turret_stdproc_init("plasma_std",FALSE) == 0)
+ if (turret_stdproc_init("plasma_std",FALSE,"models/turrets/base.md3","models/turrets/plasma.md3") == 0)
{
remove(self);
return;
@@ -141,8 +141,8 @@
//self.target_select_flags |= TFL_TARGETSELECT_FOV;
//self.target_select_fov = 45;
- setmodel(self,"models/turrets/base.md3");
- setmodel(self.tur_head,"models/turrets/plasma.md3");
+ //setmodel(self,"models/turrets/base.md3");
+ //setmodel(self.tur_head,"models/turrets/plasma.md3");
// self.tur_head.alpha = -1;
if (!turret_tag_setup())
@@ -168,7 +168,7 @@
self.aim_flags = TFL_AIM_LEAD | TFL_AIM_SHOTTIMECOMPENSATE | TFL_AIM_GROUND2 ;
self.turrcaps_flags = TFL_TURRCAPS_RADIUSDMG | TFL_TURRCAPS_MEDPROJ | TFL_TURRCAPS_PLAYERKILL;
- if (turret_stdproc_init("plasma_dual",0) == 0)
+ if (turret_stdproc_init("plasma_dual",0,"models/turrets/base.md3","models/turrets/plasmad.md3") == 0)
{
remove(self);
return;
@@ -178,8 +178,8 @@
//self.firecheck_flags |= (TFL_FIRECHECK_AFF | TFL_FIRECHECK_VERIFIED);
//self.firecheck_flags |= TFL_FIRECHECK_AFF;
- setmodel(self,"models/turrets/base.md3");
- setmodel(self.tur_head,"models/turrets/plasmad.md3");
+ //setmodel(self,"models/turrets/base.md3");
+ //setmodel(self.tur_head,"models/turrets/plasmad.md3");
if (!turret_tag_setup())
Modified: branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_tessla.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_tessla.qc 2009-08-27 10:47:02 UTC (rev 7542)
+++ branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_tessla.qc 2009-08-27 10:48:25 UTC (rev 7543)
@@ -144,15 +144,15 @@
self.aim_flags = TFL_AIM_NO;
self.track_flags = TFL_TRACK_NO;
- if (turret_stdproc_init("tesla_std",0) == 0)
+ if (turret_stdproc_init("tesla_std",0,"models/turrets/tesla_base.md3","models/turrets/tesla_head.md3") == 0)
{
remove(self);
return;
}
+ setsize(self,'-48 -48 0','48 48 96');
+ //setmodel(self,"models/turrets/tesla_base.md3");
+ //setmodel(self.tur_head,"models/turrets/tesla_head.md3");
- setmodel(self,"models/turrets/tesla_base.md3");
- setmodel(self.tur_head,"models/turrets/tesla_head.md3");
-
self.target_validate_flags = TFL_TARGETSELECT_PLAYERS | TFL_TARGETSELECT_MISSILES |
TFL_TARGETSELECT_RANGELIMTS | TFL_TARGETSELECT_TEAMCHECK;
Modified: branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_walker.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_walker.qc 2009-08-27 10:47:02 UTC (rev 7542)
+++ branches/nexuiz-2.0/data/qcsrc/server/tturrets/units/unit_walker.qc 2009-08-27 10:48:25 UTC (rev 7543)
@@ -35,7 +35,7 @@
.entity wkr_spawn;
#define WALKER_MIN '-70 -70 5'
-#define WALKER_MAX '70 70 70'
+#define WALKER_MAX '70 70 90'
#define WALKER_PATH(s,e) pathlib_astar(s,e)
@@ -939,11 +939,12 @@
self.turret_diehook = walker_diehook;
self.ticrate = 0.05;
- if (turret_stdproc_init("walker_std",0) == 0)
+ if (turret_stdproc_init("walker_std",FALSE,"models/turrets/walker_body.md3","models/turrets/walker_head_minigun.md3") == 0)
{
remove(self);
return;
}
+ setsize(self.tur_head,'0 0 0','0 0 0');
self.walker_verbs_move = spawn();
self.walker_verbs_attack = spawn();
@@ -966,8 +967,8 @@
self.solid = SOLID_SLIDEBOX;
self.takedamage = DAMAGE_AIM;
- setmodel(self,"models/turrets/walker_body.md3");
- setmodel(self.tur_head,"models/turrets/walker_head_minigun.md3");
+ //setmodel(self,"models/turrets/walker_body.md3");
+ //setmodel(self.tur_head,"models/turrets/walker_head_minigun.md3");
setmodel(self.wkr_spawn,"models/turrets/walker_spawn.md3");
setattachment(self.tur_head,self,"tag_head");
Modified: branches/nexuiz-2.0/data/scripts/shaderlist.txt
===================================================================
--- branches/nexuiz-2.0/data/scripts/shaderlist.txt 2009-08-27 10:47:02 UTC (rev 7542)
+++ branches/nexuiz-2.0/data/scripts/shaderlist.txt 2009-08-27 10:48:25 UTC (rev 7543)
@@ -28,6 +28,7 @@
flags
flamethrower
harlequin_sky
+hip_interstellar
hlac
kaznexctf2
leiprojectile
Modified: branches/nexuiz-2.0/misc/mediasource/hud/sbar.xcf
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/server/server.cfg
===================================================================
--- branches/nexuiz-2.0/server/server.cfg 2009-08-27 10:47:02 UTC (rev 7542)
+++ branches/nexuiz-2.0/server/server.cfg 2009-08-27 10:48:25 UTC (rev 7543)
@@ -18,7 +18,7 @@
//log_file "server.log" // server console output will also be copied to this file. This: "${serverconfig}.log" uses variable substitution to make the logfile have the same name as your config file with .log appended which is useful if you run several servers
// List of maps to play on the server. Set to "" to autodetect (which would enumerate ALL maps. Maps that don't support the current game mode will be skipped, so you don't need to remove them here.
-//g_maplist "accident aggressor aneurysm basement basementctf bleach bloodprison bloodprisonctf bluesky cyberparcour01 darkzone desertfactory dieselpower downer eggandbacon evilspace farewell final_rage nr_piece-o-cake ons-reborn racetrack reslimed ruiner runningman runningman_1on1remix runningmanctf silvercity skyway slimepit soylent starship stormkeep strength toxic warfare"
+//g_maplist "accident aggressor aneurysm basement basementctf bleach bloodprison bloodprisonctf bluesky cyberparcour01 darkzone desertfactory dieselpower downer eggandbacon evilspace farewell final_rage nr_piece-o-cake ons-reborn racetrack reslimed ruiner runningman runningman_1on1remix runningmanctf silvercity skyway slimepit soylent starship stormkeep2 strength toxic warfare"
//g_maplist_shuffle 1 // 0 always selects the next map out of g_maplist (but then better set g_maplist_votable 0 below to prevent repetitive votes), 1 will select random maps each time
//g_maplist_mostrecent_count 3 // number of maps that have to be played before a map can be repeated
More information about the nexuiz-commits
mailing list