r6031 - in branches/nexuiz-2.0: . data data/gfx data/models/weapons data/qcsrc/menu/nexuiz data/qcsrc/server data/scripts data/textures/domination server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Mar 1 06:31:57 EST 2009
Author: div0
Date: 2009-03-01 06:31:57 -0500 (Sun, 01 Mar 2009)
New Revision: 6031
Added:
branches/nexuiz-2.0/data/textures/domination/dom_axe.tga
branches/nexuiz-2.0/data/textures/domination/dom_bolt.tga
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/defaultNexuiz.cfg
branches/nexuiz-2.0/data/gfx/conback.tga
branches/nexuiz-2.0/data/gfx/loading.tga
branches/nexuiz-2.0/data/models/weapons/g_electro.md3
branches/nexuiz-2.0/data/nexuiz-credits.txt
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_network.c
branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_video.c
branches/nexuiz-2.0/data/qcsrc/server/havocbot.qc
branches/nexuiz-2.0/data/scripts/shaderlist.txt
branches/nexuiz-2.0/server/server.cfg
Log:
r6015 | mand1nga | 2009-02-27 22:55:49 +0100 (Fri, 27 Feb 2009) | 2 lines
Slightly better dangers detection
r6016 | m0rfar | 2009-02-28 12:01:17 +0100 (Sat, 28 Feb 2009) | 1 line
Correctly credit Sev
r6017 | m0rfar | 2009-02-28 12:05:12 +0100 (Sat, 28 Feb 2009) | 1 line
Synced shaderlist.txt
r6018 | m0rfar | 2009-02-28 12:16:17 +0100 (Sat, 28 Feb 2009) | 1 line
synced the default maplist (excluded turret_test)
r6019 | m0rfar | 2009-02-28 12:31:41 +0100 (Sat, 28 Feb 2009) | 1 line
At least make radiant open the main electro skin. It still can't open the shaders. Radiant expects "textures/" prefix on those.
r6020 | div0 | 2009-02-28 15:11:40 +0100 (Sat, 28 Feb 2009) | 2 lines
new conback.tga by FruitieX
r6021 | div0 | 2009-02-28 16:22:39 +0100 (Sat, 28 Feb 2009) | 2 lines
update the default values for the weapon priority cvars to match the empiric results
r6022 | div0 | 2009-02-28 18:48:07 +0100 (Sat, 28 Feb 2009) | 2 lines
fix some overlong text
r6023 | div0 | 2009-02-28 19:09:52 +0100 (Sat, 28 Feb 2009) | 2 lines
new loading.tga
r6024 | div0 | 2009-03-01 10:58:40 +0100 (Sun, 01 Mar 2009) | 2 lines
cl_bob 0.01
r6025 | m0rfar | 2009-03-01 12:16:49 +0100 (Sun, 01 Mar 2009) | 1 line
[ 2650477 ] Old Flag Models Untextured
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-03-01 11:31:09 UTC (rev 6030)
+++ branches/nexuiz-2.0/.patchsets 2009-03-01 11:31:57 UTC (rev 6031)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6014,6026-6026
+revisions_applied = 1-6026
Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-03-01 11:31:09 UTC (rev 6030)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-03-01 11:31:57 UTC (rev 6031)
@@ -208,7 +208,7 @@
// these settings determine how much the view is affected by movement/damage
cl_bobcycle 0 // how long the cycle of up/down view movement takes (only works if cl_bob is not 0), default is 0.6
-cl_bob 0.02 // how much view moves up/down when moving (does not move if cl_bobcycle is 0, but still enables cl_bobmodel), default is 0.02
+cl_bob 0.01 // how much view moves up/down when moving (does not move if cl_bobcycle is 0, but still enables cl_bobmodel), default is 0.02
cl_bobmodel 1 // whether to have gun model move around on screen when moving (only works if cl_bob is not 0), default is 1
cl_rollangle 0 // amount of view tilt when strafing, default is 2.0
v_kicktime 0 // how long damage kicks of the view last, default is 0.5 seconds
@@ -426,7 +426,7 @@
set g_throughfloor 1
set g_maplist_mostrecent ""
seta g_maplist_mostrecent_count 3 "number of most recent maps that are blocked from being played again"
-seta g_maplist "aggressor aneurysm basement basementctf bleach bloodprison bloodprisonctf bluesky darkzone dieselpower dismal downer evilspace farewell final_rage reslimed ruiner runningman_1on1remix runningman runningmanctf silvercity skyway slimepit soylent starship stormkeep strength toxic warfare"
+seta g_maplist "accident aggressor aneurysm basement basementctf bleach bloodprison bloodprisonctf bluesky darkzone desertfactory dieselpower dismal downer eggandbacon evilspace farewell final_rage ons-reborn racetrack reslimed ruiner runningman runningman_1on1remix runningmanctf silvercity skyway slimepit soylent starship stormkeep 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"
@@ -1264,14 +1264,14 @@
alias allready "sv_cmd allready"
// note: these cvars use weapon NUMBERS. Use the menu to edit this cvar, or look the numbers up in qcsrc/common/constants.qh.
-seta cl_weaponpriority "14 13 9 8 11 7 6 5 4 15 3 2 1 10 12" "default porto and hook as LOW priority, use the weapon key numbers otherwise"
+seta cl_weaponpriority "11 7 9 4 13 8 6 15 3 5 14 2 1 12 10" "weapon priority list (edit it using the menu, numbers see constants.qh)"
seta cl_weaponpriority_useforcycling 0
-seta cl_weaponpriority0 "14 9 8 4" "use impulse 200 for prev gun from this list, 210 for best gun, 220 for next gun. Default value: explosives (RL Hagar Mortar)"
-seta cl_weaponpriority1 "13 7 6 5 1" "use impulse 201 for prev gun from this list, 211 for best gun, 221 for next gun. Default value: energy (Nex Crylink Electro Laser)"
-seta cl_weaponpriority2 "15 11 7 3" "use impulse 202 for prev gun from this list, 212 for best gun, 222 for next gun. Default value: hitscan exact (Nex MG)"
-seta cl_weaponpriority3 "15 11 7 3 2" "use impulse 203 for prev gun from this list, 213 for best gun, 223 for next gun. Default value: hitscan all (Nex MG Shotgun)"
-seta cl_weaponpriority4 "13 8 6 5 2" "use impulse 204 for prev gun from this list, 214 for best gun, 224 for next gun. Default value: spam (Hagar Crylink Electro Shotgun)"
-seta cl_weaponpriority5 "1 12 10" "use impulse 205 for prev gun from this list, 215 for best gun, 225 for next gun. Default value: for moving (Laser Hook Port-O-Launch)"
+seta cl_weaponpriority0 "9 4 13 8 14" "use impulse 200 for prev gun from this list, 210 for best gun, 220 for next gun. Default value: explosives"
+seta cl_weaponpriority1 "11 7 6 5 1" "use impulse 201 for prev gun from this list, 211 for best gun, 221 for next gun. Default value: energy"
+seta cl_weaponpriority2 "11 7 15 3" "use impulse 202 for prev gun from this list, 212 for best gun, 222 for next gun. Default value: hitscan exact"
+seta cl_weaponpriority3 "11 7 15 3 2" "use impulse 203 for prev gun from this list, 213 for best gun, 223 for next gun. Default value: hitscan all"
+seta cl_weaponpriority4 "4 13 8 6 2" "use impulse 204 for prev gun from this list, 214 for best gun, 224 for next gun. Default value: spam weapons"
+seta cl_weaponpriority5 "1 12 10" "use impulse 205 for prev gun from this list, 215 for best gun, 225 for next gun. Default value: weapons for moving"
seta cl_weaponpriority6 "" "use impulse 206 for prev gun from this list, 216 for best gun, 226 for next gun"
seta cl_weaponpriority7 "" "use impulse 207 for prev gun from this list, 217 for best gun, 227 for next gun"
seta cl_weaponpriority8 "" "use impulse 208 for prev gun from this list, 218 for best gun, 228 for next gun"
Modified: branches/nexuiz-2.0/data/gfx/conback.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/loading.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/models/weapons/g_electro.md3
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/nexuiz-credits.txt
===================================================================
--- branches/nexuiz-2.0/data/nexuiz-credits.txt 2009-03-01 11:31:09 UTC (rev 6030)
+++ branches/nexuiz-2.0/data/nexuiz-credits.txt 2009-03-01 11:31:57 UTC (rev 6031)
@@ -90,7 +90,7 @@
Braden "meoblast001" Walters - Music
Amos "torus" Dudley - Announcer voices
William "Willis" Weilep - Master server host
-"sev" - "Wicked" menu skins
+Severin "sev" Meyer - Artist
Simon O'Callaghan - "egyptsoc" texture set
Robert "ai" Kuroto - Various models
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c 2009-03-01 11:31:09 UTC (rev 6030)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_create.c 2009-03-01 11:31:57 UTC (rev 6031)
@@ -100,7 +100,7 @@
me.TD(me, 1, 2.8, e = makeNexuizSliderCheckBox(-1, 0, me.sliderFraglimit, "Use map specified default"));
me.TR(me);
me.TR(me);
- me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Number of players:"));
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Player slots:"));
me.TD(me, 1, 2, makeNexuizSlider(1, 32, 1, "menu_maxplayers"));
me.TR(me);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Number of bots:"));
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c 2009-03-01 11:31:09 UTC (rev 6030)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c 2009-03-01 11:31:57 UTC (rev 6031)
@@ -77,7 +77,7 @@
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Zoom Factor:"));
me.TD(me, 1, 2, e = makeNexuizSlider(2, 16, 0.5, "cl_zoomfactor"));
me.TR(me);
- me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Zoom Sensitivity:"));
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Zoom Sens.:"));
me.TD(me, 1, 2, e = makeNexuizSlider(0, 1, 0.01, "cl_zoomsensitivity"));
me.TR(me);
sl = makeNexuizSlider(1, 8, 0.5, "cl_zoomspeed");
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_effects.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_effects.c 2009-03-01 11:31:09 UTC (rev 6030)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_effects.c 2009-03-01 11:31:57 UTC (rev 6031)
@@ -36,7 +36,7 @@
me.TR(me);
me.TR(me);
- me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Geometry quality:"));
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Geometry detail:"));
me.TD(me, 1, 2, e = makeNexuizTextSlider("r_subdivisions_tolerance"));
e.addValue(e, "Lowest", "16");
e.addValue(e, "Low", "8");
@@ -69,7 +69,7 @@
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Particle quality:"));
me.TD(me, 1, 2, e = makeNexuizSlider(0.1, 1.0, 0.05, "cl_particles_quality"));
me.TR(me);
- me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Particle distance:"));
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Particle dist.:"));
me.TD(me, 1, 2, e = makeNexuizSlider(500, 2000, 100, "r_drawparticles_drawdistance"));
me.TR(me);
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_decals", "Decals"));
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_network.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_network.c 2009-03-01 11:31:09 UTC (rev 6030)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_network.c 2009-03-01 11:31:57 UTC (rev 6031)
@@ -39,7 +39,7 @@
e.addValue(e, "Broadband", "25000");
e.configureNexuizTextSliderValues(e);
me.TR(me);
- me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Outgoing packets/s:"));
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Input packets/s:"));
me.TD(me, 1, 2, e = makeNexuizSlider(20, 120, 1, "cl_netfps"));
me.TR(me);
me.TR(me);
Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_video.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_video.c 2009-03-01 11:31:09 UTC (rev 6030)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/dialog_settings_video.c 2009-03-01 11:31:57 UTC (rev 6031)
@@ -82,10 +82,10 @@
setDependent(e, "r_glsl", 1, 1);
me.TR(me);
me.TR(me);
- me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Ambient lighting:"));
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Ambient:"));
me.TD(me, 1, 2, e = makeNexuizSlider(0, 20.0, 1.0, "r_ambient"));
me.TR(me);
- me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Scene brightness:"));
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Intensity:"));
me.TD(me, 1, 2, e = makeNexuizSlider(0.5, 2.0, 0.05, "r_hdr_scenebrightness"));
me.TR(me);
me.TR(me);
Modified: branches/nexuiz-2.0/data/qcsrc/server/havocbot.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/havocbot.qc 2009-03-01 11:31:09 UTC (rev 6030)
+++ branches/nexuiz-2.0/data/qcsrc/server/havocbot.qc 2009-03-01 11:31:57 UTC (rev 6031)
@@ -147,7 +147,11 @@
return;
if(self.aistatus & AI_STATUS_DANGER_AHEAD)
+ {
+ self.aistatus &~= AI_STATUS_RUNNING;
+ self.BUTTON_JUMP = FALSE;
return;
+ }
if(self.bot_lastseengoal != self.goalcurrent && !(self.aistatus & AI_STATUS_RUNNING))
{
@@ -354,11 +358,11 @@
}
// avoiding dangers and obstacles
- // TODO: don't make this check every frame
local vector dst_ahead, dst_down;
dst_ahead = self.origin + self.view_ofs + (self.velocity * 0.32);
dst_down = dst_ahead + '0 0 -1500';
+ // Look ahead
traceline(self.origin + self.view_ofs , dst_ahead, TRUE, world);
// Check head-banging against walls
@@ -386,30 +390,39 @@
}
}
- // Check for water/slime/lava and edges
+ // Check for water/slime/lava and dangerous edges
+ // (only when the bot is on the ground or jumping intentionally)
self.aistatus &~= AI_STATUS_DANGER_AHEAD;
- if(trace_fraction == 1){
+
+ if(trace_fraction == 1)
+ if(self.flags & FL_ONGROUND || self.aistatus & AI_STATUS_RUNNING || self.BUTTON_JUMP == TRUE)
+ {
+ // Look downwards
traceline(dst_ahead , dst_down, TRUE, world);
// te_lightning2(world, self.origin, dst_ahead); // Draw "ahead" look
- s = pointcontents(trace_endpos + '0 0 1');
- if (s != CONTENT_SOLID)
- if (s == CONTENT_LAVA || s == CONTENT_SLIME)
- evadelava = normalize(self.velocity) * -1;
- else if (s == CONTENT_SKY)
- evadeobstacle = normalize(self.velocity) * -1;
- else if (tracebox_hits_trigger_hurt(dst_ahead, self.mins, self.maxs, trace_endpos))
+ // te_lightning2(world, dst_ahead, dst_down); // Draw "downwards" look
+ if(trace_endpos_z < self.origin_z + self.mins_z)
{
- // te_lightning2(world, dst_ahead, dst_down); // Draw "downwards" look
- // if ain't a safe goal with "holes" (like the soylent jumpad)
- if(!boxesoverlap(dst_ahead - self.view_ofs + self.mins, dst_ahead - self.view_ofs + self.maxs,
- self.goalcurrent.absmin, self.goalcurrent.absmax))
+ s = pointcontents(trace_endpos + '0 0 1');
+ if (s != CONTENT_SOLID)
+ if (s == CONTENT_LAVA || s == CONTENT_SLIME)
+ evadelava = normalize(self.velocity) * -1;
+ else if (s == CONTENT_SKY)
+ evadeobstacle = normalize(self.velocity) * -1;
+ else if (!boxesoverlap(dst_ahead - self.view_ofs + self.mins, dst_ahead - self.view_ofs + self.maxs,
+ self.goalcurrent.absmin, self.goalcurrent.absmax))
{
- // Remove dangerous dynamic goals from stack
- if (self.goalcurrent.classname == "player" || self.goalcurrent.classname == "droppedweapon")
- navigation_poproute();
- // try to stop
- flatdir = '0 0 0';
- evadeobstacle = normalize(self.velocity) * -1;
+ // if ain't a safe goal with "holes" (like the jumpad on soylent)
+ // and there is a trigger_hurt below
+ if(tracebox_hits_trigger_hurt(dst_ahead, self.mins, self.maxs, trace_endpos))
+ {
+ // Remove dangerous dynamic goals from stack
+ if (self.goalcurrent.classname == "player" || self.goalcurrent.classname == "droppedweapon")
+ navigation_poproute();
+ // try to stop
+ flatdir = '0 0 0';
+ evadeobstacle = normalize(self.velocity) * -1;
+ }
}
}
}
Modified: branches/nexuiz-2.0/data/scripts/shaderlist.txt
===================================================================
--- branches/nexuiz-2.0/data/scripts/shaderlist.txt 2009-03-01 11:31:09 UTC (rev 6030)
+++ branches/nexuiz-2.0/data/scripts/shaderlist.txt 2009-03-01 11:31:57 UTC (rev 6031)
@@ -2,11 +2,13 @@
blacksky
common
desertfactory
+domination
dsi
e7
eggandbacon
egyptsoc
el3dm1
+electro
evil1_grates
evil2
evil3
@@ -21,6 +23,7 @@
eX
final_rage
flags
+flamethrower
harlequin_sky
hlac
kaznexctf2
@@ -40,6 +43,7 @@
sav-graysky1
sav-liquids
sfx
+shotgun
stralenex1
stralenex8
strength
Copied: branches/nexuiz-2.0/data/textures/domination/dom_axe.tga (from rev 6025, trunk/data/textures/domination/dom_axe.tga)
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/textures/domination/dom_bolt.tga (from rev 6025, trunk/data/textures/domination/dom_bolt.tga)
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/server/server.cfg
===================================================================
--- branches/nexuiz-2.0/server/server.cfg 2009-03-01 11:31:09 UTC (rev 6030)
+++ branches/nexuiz-2.0/server/server.cfg 2009-03-01 11:31:57 UTC (rev 6031)
@@ -18,7 +18,7 @@
//log_file server.log // server console output will also be copied to this file
// 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 "aggressor aneurysm basement basementctf bleach bloodprison bloodprisonctf bluesky darkzone dieselpower dismal downer evilspace farewell final_rage reslimed ruiner runningman_1on1remix runningman runningmanctf silvercity skyway slimepit soylent starship stormkeep strength toxic warfare"
+//g_maplist "accident aggressor aneurysm basement basementctf bleach bloodprison bloodprisonctf bluesky darkzone desertfactory dieselpower dismal downer eggandbacon evilspace farewell final_rage ons-reborn racetrack reslimed ruiner runningman runningman_1on1remix runningmanctf silvercity skyway slimepit soylent starship stormkeep 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