r3814 - in branches/nexuiz-2.0: . data/maps data/scripts
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Jul 13 12:31:29 EDT 2008
Author: div0
Date: 2008-07-13 12:31:29 -0400 (Sun, 13 Jul 2008)
New Revision: 3814
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/maps/bleach.ent
branches/nexuiz-2.0/data/scripts/default_project.proj
branches/nexuiz-2.0/data/scripts/entities.def
Log:
r3777 | m0rfar | 2008-07-05 13:30:17 +0200 (Sat, 05 Jul 2008) | 2 lines
Added Nexuiz specific compile options, based on compile-settings.txt (Aggressor is still missing...)
Changed health colors a bit. And fixed trigger_hurt descriptions a bit.
r3778 | m0rfar | 2008-07-05 21:00:16 +0200 (Sat, 05 Jul 2008) | 1 line
Fixed Bleach jumpads by using target_position as target.
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2008-07-11 10:24:54 UTC (rev 3813)
+++ branches/nexuiz-2.0/.patchsets 2008-07-13 16:31:29 UTC (rev 3814)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-3760,3762-3773,3787-3788,3790-3790,3796-3797
+revisions_applied = 1-3760,3762-3773,3777-3778,3787-3788,3790-3790,3796-3797
Modified: branches/nexuiz-2.0/data/maps/bleach.ent
===================================================================
--- branches/nexuiz-2.0/data/maps/bleach.ent 2008-07-11 10:24:54 UTC (rev 3813)
+++ branches/nexuiz-2.0/data/maps/bleach.ent 2008-07-13 16:31:29 UTC (rev 3814)
@@ -567,7 +567,7 @@
"targetname" "t78"
"target" "t77"
"origin" "3564 -400 548"
-"classname" "info_null"
+"classname" "target_position"
}
{
"target" "t78"
@@ -767,7 +767,7 @@
{
"targetname" "t3"
"origin" "344 32 536"
-"classname" "info_null"
+"classname" "target_position"
}
{
"target" "t3"
@@ -1004,7 +1004,7 @@
"targetname" "t91"
}
{
-"classname" "info_null"
+"classname" "target_position"
"origin" "3256 -1144 320"
"targetname" "section1jump"
}
@@ -1029,12 +1029,12 @@
"model" "*18"
}
{
-"classname" "info_null"
+"classname" "target_position"
"origin" "2936 992 476"
"targetname" "t100"
}
{
-"classname" "info_null"
+"classname" "target_position"
"origin" "3040 1324 12"
"targetname" "t101"
}
@@ -1049,7 +1049,7 @@
"model" "*20"
}
{
-"classname" "info_null"
+"classname" "target_position"
"origin" "3144 1508 368"
"targetname" "t102"
}
Modified: branches/nexuiz-2.0/data/scripts/default_project.proj
===================================================================
--- branches/nexuiz-2.0/data/scripts/default_project.proj 2008-07-11 10:24:54 UTC (rev 3813)
+++ branches/nexuiz-2.0/data/scripts/default_project.proj 2008-07-13 16:31:29 UTC (rev 3814)
@@ -23,6 +23,8 @@
<key name="texturepath" value="$TEMPLATEenginepath$TEMPLATEbasedir/textures/"/>
<key name="autosave" value="$TEMPLATEuserhomepath$TEMPLATEbasedir/maps/autosave.map"/>
<key name="mapspath" value="$TEMPLATEuserhomepath$TEMPLATEbasedir/maps/"/>
+
+<key name="bsp_Q3Map2: (update) Update entitites only" value="! "$TEMPLATEapppathq3map2" -v # -game quake3 -fs_basepath "$TEMPLATEenginepath" -onlyents $" />
<key name="bsp_Q3Map2: (single) BSP -meta" value="! "$TEMPLATEapppathq3map2" -v # -game quake3 -fs_basepath "$TEMPLATEenginepath" -meta $"/>
@@ -57,7 +59,12 @@
<key name="bsp_Q3Map2: (final) BSP -meta, -vis, -light -fast -filter -super 2 -bounce 8" value="! "$TEMPLATEapppathq3map2" -v # -game quake3 -fs_basepath "$TEMPLATEenginepath" -meta $ && ! "$TEMPLATEapppathq3map2" # -game quake3 -fs_basepath "$TEMPLATEenginepath" -vis -saveprt $ && ! "$TEMPLATEapppathq3map2" -v # -game quake3 -fs_basepath "$TEMPLATEenginepath" -light -fast -super 2 -filter -bounce 8 $" />
<key name="bsp_Q3Map2: (final) BSP -meta, -vis, -light -deluxe -fast -filter -super 2 -bounce 8" value="! "$TEMPLATEapppathq3map2" -v # -game quake3 -fs_basepath "$TEMPLATEenginepath" -meta $ && ! "$TEMPLATEapppathq3map2" # -game quake3 -fs_basepath "$TEMPLATEenginepath" -vis -saveprt $ && ! "$TEMPLATEapppathq3map2" -v # -game quake3 -fs_basepath "$TEMPLATEenginepath" -light -deluxe -fast -super 2 -filter -bounce 8 $" />
-
+
+<key name="bsp_Q3Map2: (final) Nexuiz standard" value="! "$TEMPLATEapppathq3map2" # -game quake3 -fs_basepath "$TEMPLATEenginepath" -meta $ && ! "$TEMPLATEapppathq3map2" # -game quake3 -fs_basepath "$TEMPLATEenginepath" -vis $ && ! "$TEMPLATEapppathq3map2" # -game quake3 -fs_basepath "$TEMPLATEenginepath" -light -bounce 3 -deluxe -fast -filter -patchshadows -samples 2 $" />
+<key name="bsp_Q3Map2: (final) Bloodprison(ctf)" value="! "$TEMPLATEapppathq3map2" # -game quake3 -fs_basepath "$TEMPLATEenginepath" -meta -samplesize 8 -mv 1000000 -mi 6000000 $ && ! "$TEMPLATEapppathq3map2" # -game quake3 -fs_basepath "$TEMPLATEenginepath" -scale 1.2 $ && ! "$TEMPLATEapppathq3map2" # -game quake3 -fs_basepath "$TEMPLATEenginepath" -vis $ && ! "$TEMPLATEapppathq3map2" # -game quake3 -fs_basepath "$TEMPLATEenginepath" -light -deluxe -fast -filter -deluxe -patchshadows -samples 3 $" />
+<key name="bsp_Q3Map2: (final) Final Rage" value="! "$TEMPLATEapppathq3map2" # -game quake3 -fs_basepath "$TEMPLATEenginepath" -meta -v -samplesize 8 -skyfix -np 50 $ && ! "$TEMPLATEapppathq3map2" # -game quake3 -fs_basepath "$TEMPLATEenginepath" -vis -v $ && ! "$TEMPLATEapppathq3map2" # -game quake3 -fs_basepath "$TEMPLATEenginepath" -light -deluxe -compensate 1.4 -fast -gamma 1.5 -patchshadows -areascale 1.5 -pointscale 2 -v -bounce 3 -bouncegrid $" />
+<key name="bsp_Q3Map2: (final) Reslimed" value="! "$TEMPLATEapppathq3map2" # -game quake3 -fs_basepath "$TEMPLATEenginepath" -meta -patchmeta -v $ && ! "$TEMPLATEapppathq3map2" # -game quake3 -fs_basepath "$TEMPLATEenginepath" -vis $ && ! "$TEMPLATEapppathq3map2" # -game quake3 -fs_basepath "$TEMPLATEenginepath" -light -bounce 3 -deluxe -fast -filter -patchshadows -samples 2 $" />
+
<key name="bsp_Q3Map2: (simulate old style -light -extra) BSP -meta, -vis, -light -super 2" value="! "$TEMPLATEapppathq3map2" -v # -game quake3 -fs_basepath "$TEMPLATEenginepath" -meta $ && ! "$TEMPLATEapppathq3map2" # -game quake3 -fs_basepath "$TEMPLATEenginepath" -vis -saveprt $ && ! "$TEMPLATEapppathq3map2" -v # -game quake3 -fs_basepath "$TEMPLATEenginepath" -light -super 2 $" />
<key name="bsp_Q3Map2: (simulate old style -light -deluxe -extra) BSP -meta, -vis, -light -deluxe -super 2" value="! "$TEMPLATEapppathq3map2" -v # -game quake3 -fs_basepath "$TEMPLATEenginepath" -meta $ && ! "$TEMPLATEapppathq3map2" # -game quake3 -fs_basepath "$TEMPLATEenginepath" -vis -saveprt $ && ! "$TEMPLATEapppathq3map2" -v # -game quake3 -fs_basepath "$TEMPLATEenginepath" -light -deluxe -super 2 $" />
Modified: branches/nexuiz-2.0/data/scripts/entities.def
===================================================================
--- branches/nexuiz-2.0/data/scripts/entities.def 2008-07-11 10:24:54 UTC (rev 3813)
+++ branches/nexuiz-2.0/data/scripts/entities.def 2008-07-13 16:31:29 UTC (rev 3814)
@@ -346,7 +346,7 @@
noise3: sound played when flag is lost in the field and respawns itself
*/
-/*QUAKED item_health_large (.8 .4 .4) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED item_health_large (.9 .3 .3) (-16 -16 0) (16 16 32) FLOATING
Large Health (default 50 health points)
-------- KEYS --------
respawntime: time till it respawns (default: 15)
@@ -358,7 +358,7 @@
model="models/items/g_h50.md3"
*/
-/*QUAKED item_health_medium (.8 .4 .4) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED item_health_medium (.9 .3 .3) (-16 -16 0) (16 16 32) FLOATING
Medium Health (default 25 health points)
-------- KEYS --------
respawntime: time till it respawns (default: 15)
@@ -370,7 +370,7 @@
model="models/items/g_h25.md3"
*/
-/*QUAKED item_health_mega (.8 .4 .4) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED item_health_mega (.9 .3 .3) (-16 -16 0) (16 16 32) FLOATING
Mega Health (default 100 health points)
In Minstagib, this randomly turns into either an invisibility, an extra lives or a speed power-up with a default respawn time of 120.
-------- KEYS --------
@@ -383,7 +383,7 @@
model="models/items/g_h100.md3"
*/
-/*QUAKED item_health_small (.8 .4 .4) (-16 -16 0) (16 16 32) FLOATING
+/*QUAKED item_health_small (.9 .3 .3) (-16 -16 0) (16 16 32) FLOATING
Small Health (default 5 health points)
-------- KEYS --------
respawntime: time till it respawns (default: 15)
@@ -677,7 +677,7 @@
Any object touching this will be hurt.
Has the useful effect of automatically returning flags, keys and runes when they touch it.
-------- KEYS --------
-dmg: amount of damage to deal when it (default: 1000)
+dmg: amount of damage to deal (default: 1000)
message: kill message when someone gets killed by this (default: "was in the wrong place.")
*/
More information about the nexuiz-commits
mailing list