[nexuiz-commits] r6455 - in branches/nexuiz-2.0: . data data/maps data/qcsrc/common data/sound/cdtracks
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Apr 7 08:01:09 EDT 2009
Author: div0
Date: 2009-04-07 08:01:08 -0400 (Tue, 07 Apr 2009)
New Revision: 6455
Added:
branches/nexuiz-2.0/data/sound/cdtracks/brokenlight.ogg
branches/nexuiz-2.0/data/sound/cdtracks/stairs.ogg
Removed:
branches/nexuiz-2.0/data/sound/cdtracks/dn-refueled.xm
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/defaultHavoc.cfg
branches/nexuiz-2.0/data/defaultNexuiz.cfg
branches/nexuiz-2.0/data/maps/racetrack.mapinfo
branches/nexuiz-2.0/data/maps/ruiner.mapinfo
branches/nexuiz-2.0/data/maps/soylent.mapinfo
branches/nexuiz-2.0/data/nexuiz-credits.txt
branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qc
branches/nexuiz-2.0/data/sound/cdtracks/beast-of-insanity.ogg
branches/nexuiz-2.0/data/sound/cdtracks/creation.ogg
branches/nexuiz-2.0/data/sound/cdtracks/thunder.ogg
Log:
r6454 | div0 | 2009-04-07 11:44:14 +0200 (Tue, 07 Apr 2009) | 4 lines
-dn-refueled
+brokenlight
+stairs
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-04-07 09:44:14 UTC (rev 6454)
+++ branches/nexuiz-2.0/.patchsets 2009-04-07 12:01:08 UTC (rev 6455)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-6452
+revisions_applied = 1-6454
Modified: branches/nexuiz-2.0/data/defaultHavoc.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultHavoc.cfg 2009-04-07 09:44:14 UTC (rev 6454)
+++ branches/nexuiz-2.0/data/defaultHavoc.cfg 2009-04-07 12:01:08 UTC (rev 6455)
@@ -30,6 +30,7 @@
set g_projectiles_newton_style 0
seta menu_skin "simplygray"
set menu_slist_modfilter "havoc"
+set menu_cdtrack creation
exec physicsHavoc.cfg
exec weaponsHavoc.cfg
Modified: branches/nexuiz-2.0/data/defaultNexuiz.cfg
===================================================================
--- branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-04-07 09:44:14 UTC (rev 6454)
+++ branches/nexuiz-2.0/data/defaultNexuiz.cfg 2009-04-07 12:01:08 UTC (rev 6455)
@@ -1244,9 +1244,11 @@
set sv_foginterval 0
// Audio track names (for old-style "cd loop NUMBER" usage)
-cd remap digital-pursuit breakdown-easy brainsukker chaos-fog infight neuronal-diving subcities thru-the-mirror calling-bogus beast-of-insanity
+set g_cdtracks_remaplist "digital-pursuit breakdown-easy brainsukker chaos-fog infight neuronal-diving subcities thru-the-mirror calling-bogus beast-of-insanity thunder creation brokenlight stairs dn-refueled.xm" "list used by mapinfo system to automatically assign cdtracks - must match the cd remap command"
+set g_cdtracks_dontusebydefault "digital-pursuit thunder brokenlight" "list used by mapinfo system to automatically assign cdtracks - must be a subset of g_cdtracks_remaplist"
+cd remap $g_cdtracks_remaplist
set sv_intermission_cdtrack brainsukker
-set menu_cdtrack calling-bogus
+set menu_cdtrack brokenlight
// maxidle (in seconds): kick players idle for more than that amount of time
set sv_maxidle 0
Modified: branches/nexuiz-2.0/data/maps/racetrack.mapinfo
===================================================================
--- branches/nexuiz-2.0/data/maps/racetrack.mapinfo 2009-04-07 09:44:14 UTC (rev 6454)
+++ branches/nexuiz-2.0/data/maps/racetrack.mapinfo 2009-04-07 12:01:08 UTC (rev 6455)
@@ -5,4 +5,4 @@
_spawnpoints 0
has weapons
type race 5 20 15
-cdtrack dn-refueled.xm
+cdtrack 7
Modified: branches/nexuiz-2.0/data/maps/ruiner.mapinfo
===================================================================
--- branches/nexuiz-2.0/data/maps/ruiner.mapinfo 2009-04-07 09:44:14 UTC (rev 6454)
+++ branches/nexuiz-2.0/data/maps/ruiner.mapinfo 2009-04-07 12:01:08 UTC (rev 6455)
@@ -9,6 +9,6 @@
type rune 200 20
type lms 9 20
type arena 10 20
-cdtrack thunder
+cdtrack 11
clientsettemp_for_type all r_shadow_glossexponent 96
clientsettemp_for_type all r_shadow_glossintensity 2
Modified: branches/nexuiz-2.0/data/maps/soylent.mapinfo
===================================================================
--- branches/nexuiz-2.0/data/maps/soylent.mapinfo 2009-04-07 09:44:14 UTC (rev 6454)
+++ branches/nexuiz-2.0/data/maps/soylent.mapinfo 2009-04-07 12:01:08 UTC (rev 6455)
@@ -10,4 +10,4 @@
type rune 200 20
type lms 9 20
type arena 10 20
-cdtrack 6
+cdtrack 14
Modified: branches/nexuiz-2.0/data/nexuiz-credits.txt
===================================================================
--- branches/nexuiz-2.0/data/nexuiz-credits.txt 2009-04-07 09:44:14 UTC (rev 6454)
+++ branches/nexuiz-2.0/data/nexuiz-credits.txt 2009-04-07 12:01:08 UTC (rev 6455)
@@ -88,6 +88,8 @@
Gerd "Elysis" Raudenbusch - Music
Braden "meoblast001" Walters - Music
+Michael "Tenshihan" Quinn - Music
+blkrbt - Music
Amos "torus" Dudley - Announcer voices
William "Willis" Weilep - Master server host
Severin "sev" Meyer - Artist
Modified: branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qc 2009-04-07 09:44:14 UTC (rev 6454)
+++ branches/nexuiz-2.0/data/qcsrc/common/mapinfo.qc 2009-04-07 12:01:08 UTC (rev 6455)
@@ -542,7 +542,7 @@
string fn;
string s, t;
float fh, fh2;
- float r, f;
+ float r, f, n, i;
if(strstrofs(pFilename, "/", 0) >= 0)
{
@@ -585,7 +585,17 @@
fputs(fh, strcat("cdtrack ", _MapInfo_Map_worldspawn_music, "\n"));
}
else
- fputs(fh, strcat("cdtrack ", ftos(floor(random() * 9 + 2)), "\n")); // track from 2 to 10
+ {
+ n = tokenize_sane(cvar_string("g_cdtracks_remaplist"));
+ s = strcat(" ", cvar_string("g_cdtracks_dontusebydefault"), " ");
+ for(;;)
+ {
+ i = floor(random() * n);
+ if(strstrofs(s, strcat(" ", argv(i), " "), 0) < 0)
+ break;
+ }
+ fputs(fh, strcat("cdtrack ", ftos(i + 1), "\n"));
+ }
if(MapInfo_Map_supportedFeatures & MAPINFO_FEATURE_WEAPONS)
fputs(fh, "has weapons\n");
else
Modified: branches/nexuiz-2.0/data/sound/cdtracks/beast-of-insanity.ogg
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/sound/cdtracks/brokenlight.ogg (from rev 6454, trunk/data/sound/cdtracks/brokenlight.ogg)
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/cdtracks/creation.ogg
===================================================================
(Binary files differ)
Deleted: branches/nexuiz-2.0/data/sound/cdtracks/dn-refueled.xm
===================================================================
(Binary files differ)
Copied: branches/nexuiz-2.0/data/sound/cdtracks/stairs.ogg (from rev 6454, trunk/data/sound/cdtracks/stairs.ogg)
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/sound/cdtracks/thunder.ogg
===================================================================
(Binary files differ)
More information about the nexuiz-commits
mailing list