r2874 - in branches/nexuiz-2.0/data: . maps qcsrc/common qcsrc/menu qcsrc/server scripts textures/water
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Oct 31 07:07:10 EDT 2007
Author: div0
Date: 2007-10-31 07:07:10 -0400 (Wed, 31 Oct 2007)
New Revision: 2874
Modified:
branches/nexuiz-2.0/data/default.cfg
branches/nexuiz-2.0/data/maps/ruiner.bsp
branches/nexuiz-2.0/data/maps/ruiner.map
branches/nexuiz-2.0/data/qcsrc/common/util.qc
branches/nexuiz-2.0/data/qcsrc/common/util.qh
branches/nexuiz-2.0/data/qcsrc/menu/mbuiltin.qc
branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
branches/nexuiz-2.0/data/scripts/water.shader
branches/nexuiz-2.0/data/textures/water/water0.tga
branches/nexuiz-2.0/data/textures/water/water1.tga
branches/nexuiz-2.0/data/textures/water/water2.tga
Log:
change menu_showteamselect alias to use menu_cmd (compatibility to new menu code)
water updates
mbuiltin.qc update
fix observer spawn point selection
set _teams_available bitmask (compatibility to new menu code)
add (unused) depth first search function to util.qc (for new menu code)
Modified: branches/nexuiz-2.0/data/default.cfg
===================================================================
--- branches/nexuiz-2.0/data/default.cfg 2007-10-31 11:04:19 UTC (rev 2873)
+++ branches/nexuiz-2.0/data/default.cfg 2007-10-31 11:07:10 UTC (rev 2874)
@@ -603,7 +603,7 @@
bind F3 spec
// alias for switching the teamselect menu
-alias menu_showteamselect "set scmenu_directmenu TeamSelect; togglemenu"
+alias menu_showteamselect "menu_cmd directmenu TeamSelect"
alias menu_sync "menu_cmd sync"
bind f5 menu_showteamselect
Modified: branches/nexuiz-2.0/data/maps/ruiner.bsp
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/maps/ruiner.map
===================================================================
--- branches/nexuiz-2.0/data/maps/ruiner.map 2007-10-31 11:04:19 UTC (rev 2873)
+++ branches/nexuiz-2.0/data/maps/ruiner.map 2007-10-31 11:07:10 UTC (rev 2874)
@@ -6425,16 +6425,6 @@
}
// brush 689
{
-( 448 -576 -242 ) ( 448 -192 -242 ) ( 1152 -192 -242 ) water/water0 -280 0 0 1 1.25 0 281 0
-( 448 -576 -202 ) ( 1152 -576 -202 ) ( 1152 -576 -266 ) common/nodraw 0 -20 0 0.5 0.5 0 12 0
-( 1152 -576 -202 ) ( 1152 -192 -202 ) ( 1152 -192 -266 ) common/nodraw 0 -20 0 0.5 0.5 0 12 0
-( 1160 64 -202 ) ( 456 64 -202 ) ( 456 64 -266 ) common/nodraw 16 44 0 0.5 0.5 0 12 0
-( 448 -192 -202 ) ( 448 -576 -202 ) ( 448 -576 -266 ) common/nodraw 0 -20 0 0.5 0.5 0 12 0
-( 448 -192 -266 ) ( 896 144 -266 ) ( 896 144 -242 ) common/nodraw 0 -20 0 0.5 0.5 0 12 0
-( 920 144 -256 ) ( 904 144 -256 ) ( 920 -576 -256 ) common/nodraw 0 -20 0 0.5 0.5 0 12 0
-}
-// brush 690
-{
( 336 1008 -128 ) ( 336 1104 -128 ) ( 240 1104 -128 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
( 256 1024 -112 ) ( 256 1088 -112 ) ( 320 1088 -112 ) evil3_floors/cemtiledrk 0 255 0 -0.2499890029 0.25000301 134217728 0 0
( 328 1008 -128 ) ( 240 1008 -128 ) ( 256 1024 -112 ) evil3_support/mtlsupport_wrn-d 16 -4 -90 0.5 0.5 134217728 0 0
@@ -6442,7 +6432,7 @@
( 240 1104 -128 ) ( 328 1104 -128 ) ( 320 1088 -112 ) evil3_support/mtlsupport_wrn-d 16 0 -90 0.5 0.5 134217728 0 0
( 240 1024 -128 ) ( 240 1088 -128 ) ( 256 1088 -112 ) evil3_support/mtlsupport_wrn-d -16 0 0 0.5 0.5 134217728 0 0
}
-// brush 691
+// brush 690
{
( 1008 1024 -128 ) ( 1008 1088 -128 ) ( 1024 1088 -112 ) evil3_support/mtlsupport_wrn-d -16 2 -360 0.5 0.5 134217728 0 0
( 1008 1104 -128 ) ( 1096 1104 -128 ) ( 1088 1088 -112 ) evil3_support/mtlsupport_wrn-d -16 1 -90 0.5 0.5 134217728 0 0
@@ -6451,7 +6441,7 @@
( 1024 1024 -112 ) ( 1024 1088 -112 ) ( 1088 1088 -112 ) evil3_floors/cemtiledrk 0 -1 0 -0.2499890029 0.25000301 134217728 0 0
( 1104 1008 -128 ) ( 1104 1104 -128 ) ( 1008 1104 -128 ) common/caulk 0 0 0 0.5 0.5 134217728 0 0
}
-// brush 692
+// brush 691
{
( 1144 400 -128 ) ( 1128 400 -128 ) ( 1128 336 -128 ) common/caulk 16 0 0 0.5 0.5 134217728 0 0
( 1128 368 -128 ) ( 1144 368 -112 ) ( 1144 336 -128 ) evil3_support/mtlsupport_grt2 -29 72 0 0.5 0.5 134217728 0 0
@@ -6459,7 +6449,7 @@
( 1152 512 -128 ) ( 1152 480 -112 ) ( 1136 480 -128 ) evil3_support/mtlsupport_grt2 -30 73 0 0.5 0.5 134217728 0 0
( 1152 384 -112 ) ( 1136 384 -128 ) ( 1136 480 -128 ) evil3_support/mtlsupport_grts -16 66 0 0.5 0.5 134217728 0 0
}
-// brush 693
+// brush 692
{
( 1152 928 -112 ) ( 1136 928 -128 ) ( 1136 1024 -128 ) evil3_support/mtlsupport_grts -16 2 0 0.5 0.5 134217728 0 0
( 1152 1056 -128 ) ( 1152 1024 -112 ) ( 1136 1024 -128 ) evil3_support/mtlsupport_grt2 -30 9 0 0.5 0.5 134217728 0 0
@@ -6467,7 +6457,7 @@
( 1136 928 -128 ) ( 1152 928 -112 ) ( 1152 896 -128 ) evil3_support/mtlsupport_grt2 -29 -5 0 0.5 0.5 134217728 0 0
( 1152 960 -128 ) ( 1136 960 -128 ) ( 1136 896 -128 ) common/caulk -48 0 0 0.5 0.5 134217728 0 0
}
-// brush 694
+// brush 693
{
( 32 -64 -112 ) ( 48 -64 -112 ) ( 48 -64 -144 ) common/caulk 36 27 0 0.5 0.5 134217728 0 0
( 96 -64 -160 ) ( 96 -48 -160 ) ( 96 -48 -192 ) evil3_support/mtlsupport_grts -48 98 0 0.5 0.5 134217728 0 0
@@ -6476,7 +6466,7 @@
( 40 -48 -120 ) ( 56 -48 -136 ) ( 56 -64 -136 ) evil3_support/mtlsupport_grts -17 2 -90 0.5 0.5 134217728 0 0
( 88 -48 -368 ) ( 72 -48 -368 ) ( 88 -64 -368 ) evil3_support/mtlsupport_grts -17 2 -90 0.5 0.5 134217728 0 0
}
-// brush 695
+// brush 694
{
( 120 192 -368 ) ( 104 176 -368 ) ( 120 176 -368 ) evil3_support/mtlsupport_grts 15 66 -90 0.5 0.5 134217728 0 0
( 56 192 -136 ) ( 56 176 -136 ) ( 40 176 -120 ) evil3_support/mtlsupport_grts 15 66 -90 0.5 0.5 134217728 0 0
@@ -6485,7 +6475,7 @@
( 96 176 -192 ) ( 96 176 -160 ) ( 96 192 -160 ) evil3_support/mtlsupport_grts -16 98 0 0.5 0.5 134217728 0 0
( 80 192 -144 ) ( 80 192 -112 ) ( 64 192 -112 ) common/caulk -28 27 0 0.5 0.5 134217728 0 0
}
-// brush 696
+// brush 695
{
( 8 0 -160 ) ( -8 0 -160 ) ( 8 -64 -160 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 16 0 -192 ) ( 48 0 -192 ) ( 48 0 -128 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6494,7 +6484,7 @@
( -64 -64 -128 ) ( -64 192 -128 ) ( 40 192 -128 ) evil3_floors/cemdrk_oddtile_crked -160 0 0 0.5 0.5 0 0 0
( 64 -48 -160 ) ( 40 -48 -160 ) ( 64 -48 -128 ) evil3_floors/cemdrk_oddtile_crked -160 0 0 0.5 0.5 0 0 0
}
-// brush 697
+// brush 696
{
( 8 0 -160 ) ( -8 0 -160 ) ( 8 -64 -160 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( -64 192 -128 ) ( -64 -64 -128 ) ( -64 -64 -192 ) rustymetal_tex/wall01 0 0 0 0.5 0.5 0 0 0
@@ -6503,7 +6493,7 @@
( -64 -64 -128 ) ( -64 192 -128 ) ( 40 192 -128 ) evil3_support/mtlsupport_grts -17 2 -90 0.5 0.5 0 0 0
( 40 -48 -160 ) ( 64 -48 -160 ) ( 64 -48 -128 ) evil3_floors/cemdrk_oddtile_crked -160 0 0 0.5 0.5 0 0 0
}
-// brush 698
+// brush 697
{
( -64 192 -128 ) ( -64 -64 -128 ) ( -64 -64 -192 ) rustymetal_tex/wall01 0 0 0 0.5 0.5 0 0 0
( 64 192 -128 ) ( -40 192 -128 ) ( -40 192 -192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6512,7 +6502,7 @@
( 40 192 -192 ) ( -64 192 -192 ) ( -64 -64 -192 ) rustymetal_tex/wall02 0 -24 -270 0.5 0.5 0 0 0
( 56 176 -192 ) ( 48 176 -192 ) ( 56 176 -128 ) rustymetal_tex/wall02 0 -24 -270 0.5 0.5 0 0 0
}
-// brush 699
+// brush 698
{
( 56 128 -192 ) ( 24 128 -192 ) ( 56 128 -128 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( -64 192 -128 ) ( -64 -64 -128 ) ( -64 -64 -192 ) rustymetal_tex/wall01 0 0 0 0.5 0.5 0 0 0
@@ -6521,7 +6511,7 @@
( 40 192 -192 ) ( -64 192 -192 ) ( -64 -64 -192 ) rustymetal_tex/wall02 0 -24 -270 0.5 0.5 0 0 0
( 48 176 -192 ) ( 56 176 -192 ) ( 56 176 -128 ) rustymetal_tex/wall02 0 -24 -270 0.5 0.5 0 0 0
}
-// brush 700
+// brush 699
{
( -448 1280 512 ) ( -448 384 512 ) ( -448 384 448 ) common/caulk 0 8 0 0.5 0.5 0 0 0
( 768 1280 512 ) ( 320 1280 512 ) ( 320 1280 448 ) common/caulk 0 8 0 0.5 0.5 0 0 0
@@ -6530,7 +6520,7 @@
( 320 320 512 ) ( 320 1216 512 ) ( 768 1216 512 ) common/caulk 0 8 0 0.5 0.5 0 0 0
( 768 1216 448 ) ( 320 1216 448 ) ( 320 320 448 ) skies/green_storm 0 0 0 0.5 0.5 0 0 0
}
-// brush 701
+// brush 700
{
( 576 320 448 ) ( 576 128 448 ) ( 576 128 320 ) skies/green_storm 0 0 0 0.5 0.5 0 0 0
( 1152 320 448 ) ( 960 320 448 ) ( 960 320 320 ) skies/green_storm 0 0 0 0.5 0.5 0 0 0
@@ -6539,7 +6529,7 @@
( 960 128 448 ) ( 960 320 448 ) ( 1152 320 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1152 320 320 ) ( 960 320 320 ) ( 960 128 320 ) skies/green_storm 0 0 0 0.5 0.5 0 0 0
}
-// brush 702
+// brush 701
{
( 896 -128 448 ) ( 896 -384 448 ) ( 896 -384 320 ) skies/green_storm 0 0 0 0.5 0.5 0 0 0
( 960 -192 448 ) ( 896 -192 448 ) ( 896 -192 320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6548,7 +6538,7 @@
( 896 -384 448 ) ( 896 -128 448 ) ( 960 -128 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 960 -128 320 ) ( 896 -128 320 ) ( 896 -384 320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 703
+// brush 702
{
( 448 -576 448 ) ( 448 -640 448 ) ( 448 -640 320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 896 -576 448 ) ( 640 -576 448 ) ( 640 -576 320 ) skies/green_storm 0 0 0 0.5 0.5 0 0 0
@@ -6557,7 +6547,7 @@
( 640 -640 448 ) ( 640 -576 448 ) ( 896 -576 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 896 -576 320 ) ( 640 -576 320 ) ( 640 -640 320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 704
+// brush 703
{
( -320 -384 448 ) ( -320 -576 448 ) ( -320 -576 320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 448 -192 448 ) ( 384 -192 448 ) ( 384 -192 320 ) skies/green_storm 0 0 0 0.5 0.5 0 0 0
@@ -6566,7 +6556,7 @@
( 384 -576 448 ) ( 384 -384 448 ) ( 448 -384 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 448 -384 320 ) ( 384 -384 320 ) ( 384 -576 320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 705
+// brush 704
{
( -512 256 448 ) ( -512 64 448 ) ( -512 64 320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( -448 320 448 ) ( -512 320 448 ) ( -512 320 320 ) skies/green_storm 0 0 0 0.5 0.5 0 0 0
@@ -6575,7 +6565,7 @@
( -384 -192 448 ) ( -384 0 448 ) ( -320 0 448 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( -320 0 320 ) ( -384 0 320 ) ( -384 -192 320 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 706
+// brush 705
{
( -64 64 0 ) ( -64 -64 0 ) ( -64 -64 -128 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( -48 768 128 ) ( -304 768 128 ) ( -304 768 -128 ) common/caulk -32 0 0 0.5 0.5 0 0 0
@@ -6583,7 +6573,7 @@
( -304 768 128 ) ( -48 768 128 ) ( -48 512 0 ) evil3_support/mtlsupport_pipes -16 0 -180 0.5 0.5 0 0 0
( -64 752 64 ) ( -64 720 64 ) ( -48 752 64 ) evil3_support/mtlsupport_pipes -16 0 -180 0.5 0.5 0 0 0
}
-// brush 707
+// brush 706
{
( -32 768 0 ) ( -80 768 0 ) ( -32 512 0 ) common/caulk -32 0 0 0.5 0.5 0 0 0
( -64 64 0 ) ( -64 -64 0 ) ( -64 -64 -128 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6592,7 +6582,7 @@
( -64 720 64 ) ( -64 752 64 ) ( -48 752 64 ) evil3_support/mtlsupport_pipes -16 0 -180 0.5 0.5 0 0 0
( -64 672 48 ) ( -64 672 16 ) ( -48 672 48 ) evil3_support/mtlsupport_pipes -16 0 -180 0.5 0.5 0 0 0
}
-// brush 708
+// brush 707
{
( 576 320 320 ) ( 368 320 320 ) ( 368 64 320 ) common/clip 0 0 0 0.5 0.5 0 13 0
( 368 64 448 ) ( 368 320 448 ) ( 576 320 448 ) common/clip 0 0 0 0.5 0.5 0 13 0
@@ -6601,7 +6591,7 @@
( 576 320 448 ) ( 368 320 448 ) ( 368 320 320 ) common/clip 0 0 0 0.5 0.5 0 13 0
( -320 304 448 ) ( -320 48 448 ) ( -320 48 320 ) common/clip 0 0 0 0.5 0.5 0 13 0
}
-// brush 709
+// brush 708
{
( 992 -192 320 ) ( 448 -192 320 ) ( 448 -576 320 ) common/clip 0 0 0 0.5 0.5 0 13 0
( 448 -576 448 ) ( 448 -192 448 ) ( 992 -192 448 ) common/clip 0 0 0 0.5 0.5 0 13 0
@@ -6610,7 +6600,7 @@
( 992 -192 448 ) ( 448 -192 448 ) ( 448 -192 320 ) common/clip 0 0 0 0.5 0.5 0 13 0
( 448 -192 448 ) ( 448 -576 448 ) ( 448 -576 320 ) common/clip 0 0 0 0.5 0.5 0 13 0
}
-// brush 710
+// brush 709
{
( 2336 0 -64 ) ( 1952 0 -64 ) ( 1952 -128 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1952 -128 -16 ) ( 1952 0 -16 ) ( 2336 0 -16 ) evil3_floors/cemdrk 0 0 0 0.5 0.5 0 0 0
@@ -6619,7 +6609,7 @@
( 2848 0 64 ) ( 2464 0 64 ) ( 2464 0 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2752 -48 -64 ) ( 2752 -32 -64 ) ( 2752 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 711
+// brush 710
{
( 2944 0 0 ) ( 2880 0 0 ) ( 2880 -128 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2880 -128 128 ) ( 2880 0 128 ) ( 2944 0 128 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6628,7 +6618,7 @@
( 2944 0 128 ) ( 2880 0 128 ) ( 2880 0 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2880 0 128 ) ( 2880 -128 128 ) ( 2880 -128 0 ) evil3_metals/mtl_rivplt2-yellow 0 0 0 0.5 0.5 0 0 0
}
-// brush 712
+// brush 711
{
( 2112 64 0 ) ( 1792 64 0 ) ( 1792 0 0 ) common/caulk 40 0 -360 0.5 0.5 0 0 0
( 1792 0 128 ) ( 1792 64 128 ) ( 2112 64 128 ) common/caulk 40 0 -360 0.5 0.5 0 0 0
@@ -6637,7 +6627,7 @@
( 2112 64 128 ) ( 1792 64 128 ) ( 1792 64 0 ) common/caulk 40 0 -360 0.5 0.5 0 0 0
( 2496 -48 0 ) ( 2496 -32 0 ) ( 2496 -48 128 ) common/caulk -24 0 -360 0.5 0.5 0 0 0
}
-// brush 713
+// brush 712
{
( 1856 64 0 ) ( 1536 64 0 ) ( 1536 0 0 ) common/caulk -24 0 -360 0.5 0.5 0 0 0
( 1536 0 128 ) ( 1536 64 128 ) ( 1856 64 128 ) common/caulk -24 0 -360 0.5 0.5 0 0 0
@@ -6646,7 +6636,7 @@
( 1536 64 128 ) ( 1536 0 128 ) ( 1536 0 0 ) common/caulk -24 0 -360 0.5 0.5 0 0 0
( 2496 -24 0 ) ( 2496 -40 0 ) ( 2496 -40 128 ) common/caulk -24 0 -360 0.5 0.5 0 0 0
}
-// brush 714
+// brush 713
{
( 2368 -128 128 ) ( 2048 -128 128 ) ( 2048 -128 0 ) evil3_metals/mtl_pipeswll_drkb-b 0 0 0 0.5 0.5 0 0 0
( 2880 -192 128 ) ( 2880 -128 128 ) ( 2880 -128 0 ) common/caulk 40 0 -360 0.5 0.5 0 0 0
@@ -6655,7 +6645,7 @@
( 2112 -128 0 ) ( 1792 -128 0 ) ( 1792 -192 0 ) common/caulk 40 0 -360 0.5 0.5 0 0 0
( 2496 -48 0 ) ( 2496 -32 0 ) ( 2496 -48 128 ) common/caulk -23 -63 -360 0.5 0.5 0 0 0
}
-// brush 715
+// brush 714
{
( 1536 -128 128 ) ( 1536 -192 128 ) ( 1536 -192 0 ) common/caulk 40 0 -360 0.5 0.5 0 0 0
( 1856 -128 128 ) ( 1536 -128 128 ) ( 1536 -128 0 ) evil3_metals/mtl_pipeswll_drkb-b 0 0 0 0.5 0.5 0 0 0
@@ -6664,7 +6654,7 @@
( 1856 -128 0 ) ( 1536 -128 0 ) ( 1536 -192 0 ) common/caulk -23 -63 -360 0.5 0.5 0 0 0
( 2496 -32 0 ) ( 2496 -48 0 ) ( 2496 -48 128 ) common/caulk -23 -63 -360 0.5 0.5 0 0 0
}
-// brush 716
+// brush 715
{
( 1472 64 128 ) ( 1408 64 128 ) ( 1408 -192 128 ) evil3_floors/cemdrk 0 0 0 0.5 0.5 0 0 0
( 1936 0 0 ) ( 1968 0 0 ) ( 1936 0 256 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6673,7 +6663,7 @@
( 2496 -32 128 ) ( 2496 -48 128 ) ( 2496 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2224 -48 128 ) ( 2208 -48 128 ) ( 2224 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 717
+// brush 716
{
( 1472 64 128 ) ( 1408 64 128 ) ( 1408 -192 128 ) evil3_floors/cemdrk 0 0 0 0.5 0.5 0 0 0
( 1984 -128 0 ) ( 1936 -128 0 ) ( 1936 -128 256 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6682,7 +6672,7 @@
( 2496 -32 128 ) ( 2496 -48 128 ) ( 2496 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2464 -80 128 ) ( 2480 -80 128 ) ( 2480 -80 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 718
+// brush 717
{
( 1536 -48 128 ) ( 1536 -64 128 ) ( 1536 -48 192 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
( 1472 64 128 ) ( 1408 64 128 ) ( 1408 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
@@ -6691,7 +6681,7 @@
( 2208 -48 128 ) ( 2224 -48 128 ) ( 2224 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2224 -80 128 ) ( 2208 -80 128 ) ( 2224 -80 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 719
+// brush 718
{
( 1536 -48 -64 ) ( 1536 -64 -64 ) ( 1536 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2224 -80 -64 ) ( 2208 -80 -64 ) ( 2224 -80 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6700,7 +6690,7 @@
( 1440 -128 0 ) ( 1440 0 0 ) ( 1824 0 0 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
( 1824 0 -64 ) ( 1440 0 -64 ) ( 1440 -128 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 720
+// brush 719
{
( 1536 -64 128 ) ( 1536 -48 128 ) ( 1536 -48 192 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
( 1472 64 128 ) ( 1408 64 128 ) ( 1408 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
@@ -6709,7 +6699,7 @@
( 2224 -80 128 ) ( 2208 -80 128 ) ( 2224 -80 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1600 -48 128 ) ( 1600 -80 128 ) ( 1600 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 721
+// brush 720
{
( 1536 -64 -64 ) ( 1536 -48 -64 ) ( 1536 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2224 -80 -64 ) ( 2208 -80 -64 ) ( 2224 -80 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6718,7 +6708,7 @@
( 1824 0 -64 ) ( 1440 0 -64 ) ( 1440 -128 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1600 -48 -64 ) ( 1600 -80 -64 ) ( 1600 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 722
+// brush 721
{
( 1472 64 128 ) ( 1408 64 128 ) ( 1408 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
( 1408 0 192 ) ( 1472 0 192 ) ( 1472 -128 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6727,7 +6717,7 @@
( 1600 -80 128 ) ( 1600 -48 128 ) ( 1600 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1664 -48 128 ) ( 1664 -64 128 ) ( 1664 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 723
+// brush 722
{
( 2224 -80 -64 ) ( 2208 -80 -64 ) ( 2224 -80 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2208 -48 -64 ) ( 2224 -48 -64 ) ( 2224 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6736,7 +6726,7 @@
( 1600 -80 -64 ) ( 1600 -48 -64 ) ( 1600 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1664 -48 -64 ) ( 1664 -64 -64 ) ( 1664 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 724
+// brush 723
{
( 1472 64 128 ) ( 1408 64 128 ) ( 1408 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
( 1408 0 192 ) ( 1472 0 192 ) ( 1472 -128 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6745,7 +6735,7 @@
( 1664 -64 128 ) ( 1664 -48 128 ) ( 1664 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1728 -48 128 ) ( 1728 -64 128 ) ( 1728 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 725
+// brush 724
{
( 2224 -80 -64 ) ( 2208 -80 -64 ) ( 2224 -80 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2208 -48 -64 ) ( 2224 -48 -64 ) ( 2224 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6754,7 +6744,7 @@
( 1664 -64 -64 ) ( 1664 -48 -64 ) ( 1664 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1728 -48 -64 ) ( 1728 -64 -64 ) ( 1728 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 726
+// brush 725
{
( 1472 64 128 ) ( 1408 64 128 ) ( 1408 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
( 1408 0 192 ) ( 1472 0 192 ) ( 1472 -128 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6763,7 +6753,7 @@
( 1728 -64 128 ) ( 1728 -48 128 ) ( 1728 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1792 -48 128 ) ( 1792 -64 128 ) ( 1792 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 727
+// brush 726
{
( 2224 -80 -64 ) ( 2208 -80 -64 ) ( 2224 -80 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2208 -48 -64 ) ( 2224 -48 -64 ) ( 2224 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6772,7 +6762,7 @@
( 1728 -64 -64 ) ( 1728 -48 -64 ) ( 1728 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1792 -48 -64 ) ( 1792 -64 -64 ) ( 1792 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 728
+// brush 727
{
( 1472 64 128 ) ( 1408 64 128 ) ( 1408 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
( 1408 0 192 ) ( 1472 0 192 ) ( 1472 -128 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6781,7 +6771,7 @@
( 1792 -64 128 ) ( 1792 -48 128 ) ( 1792 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1856 -48 128 ) ( 1856 -64 128 ) ( 1856 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 729
+// brush 728
{
( 2224 -80 -64 ) ( 2208 -80 -64 ) ( 2224 -80 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2208 -48 -64 ) ( 2224 -48 -64 ) ( 2224 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6790,7 +6780,7 @@
( 1792 -64 -64 ) ( 1792 -48 -64 ) ( 1792 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1856 -48 -64 ) ( 1856 -64 -64 ) ( 1856 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 730
+// brush 729
{
( 1472 64 128 ) ( 1408 64 128 ) ( 1408 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
( 1408 0 192 ) ( 1472 0 192 ) ( 1472 -128 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6799,7 +6789,7 @@
( 1856 -64 128 ) ( 1856 -48 128 ) ( 1856 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1920 -48 128 ) ( 1920 -64 128 ) ( 1920 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 731
+// brush 730
{
( 2224 -80 -64 ) ( 2208 -80 -64 ) ( 2224 -80 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2208 -48 -64 ) ( 2224 -48 -64 ) ( 2224 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6808,7 +6798,7 @@
( 1856 -64 -64 ) ( 1856 -48 -64 ) ( 1856 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1920 -48 -64 ) ( 1920 -64 -64 ) ( 1920 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 732
+// brush 731
{
( 1472 64 128 ) ( 1408 64 128 ) ( 1408 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
( 1408 0 192 ) ( 1472 0 192 ) ( 1472 -128 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6817,7 +6807,7 @@
( 1920 -64 128 ) ( 1920 -48 128 ) ( 1920 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1984 -48 128 ) ( 1984 -64 128 ) ( 1984 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 733
+// brush 732
{
( 2480 -80 -64 ) ( 2464 -80 -64 ) ( 2480 -80 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2464 -48 -64 ) ( 2480 -48 -64 ) ( 2480 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6826,7 +6816,7 @@
( 1920 -64 -64 ) ( 1920 -48 -64 ) ( 1920 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2240 -48 -64 ) ( 2240 -64 -64 ) ( 2240 -48 0 ) e7/e7trimlight 0 0 0 0.5 0.25 0 0 0
}
-// brush 734
+// brush 733
{
( 1472 64 128 ) ( 1408 64 128 ) ( 1408 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
( 1408 0 192 ) ( 1472 0 192 ) ( 1472 -128 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6835,7 +6825,7 @@
( 1984 -64 128 ) ( 1984 -48 128 ) ( 1984 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2048 -48 128 ) ( 2048 -64 128 ) ( 2048 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 735
+// brush 734
{
( 1472 64 128 ) ( 1408 64 128 ) ( 1408 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
( 1408 0 192 ) ( 1472 0 192 ) ( 1472 -128 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6844,7 +6834,7 @@
( 2048 -64 128 ) ( 2048 -48 128 ) ( 2048 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2112 -48 128 ) ( 2112 -64 128 ) ( 2112 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 736
+// brush 735
{
( 1728 64 128 ) ( 1664 64 128 ) ( 1664 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
( 1664 0 192 ) ( 1728 0 192 ) ( 1728 -128 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6853,7 +6843,7 @@
( 2368 -64 128 ) ( 2368 -48 128 ) ( 2368 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2432 -48 128 ) ( 2432 -64 128 ) ( 2432 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 737
+// brush 736
{
( 2480 -80 -64 ) ( 2464 -80 -64 ) ( 2480 -80 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2464 -48 -64 ) ( 2480 -48 -64 ) ( 2480 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6862,7 +6852,7 @@
( 2368 -64 -64 ) ( 2368 -48 -64 ) ( 2368 -48 0 ) e7/e7trimlight 0 0 0 0.5 0.25 0 0 0
( 2432 -48 -64 ) ( 2432 -64 -64 ) ( 2432 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 738
+// brush 737
{
( 2080 0 -64 ) ( 1696 0 -64 ) ( 1696 -128 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1696 -128 0 ) ( 1696 0 0 ) ( 2080 0 0 ) evil3_floors/cemdrk 0 0 0 0.5 0.5 0 0 0
@@ -6871,7 +6861,7 @@
( 2736 -48 -64 ) ( 2720 -48 -64 ) ( 2736 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2368 -48 -64 ) ( 2368 -32 -64 ) ( 2368 -48 0 ) e7/e7trimlight 0 0 0 0.5 0.25 0 0 0
}
-// brush 739
+// brush 738
{
( 2080 0 -64 ) ( 1696 0 -64 ) ( 1696 -128 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1696 -128 -16 ) ( 1696 0 -16 ) ( 2080 0 -16 ) evil3_floors/cemdrk 0 0 0 0.5 0.5 0 0 0
@@ -6880,7 +6870,7 @@
( 2240 -48 -64 ) ( 2240 -32 -64 ) ( 2240 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2368 -32 -64 ) ( 2368 -48 -64 ) ( 2368 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 740
+// brush 739
{
( 2224 -80 -64 ) ( 2208 -80 -64 ) ( 2224 -80 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2208 -48 -64 ) ( 2224 -48 -64 ) ( 2224 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6889,7 +6879,7 @@
( 1984 -64 -64 ) ( 1984 -48 -64 ) ( 1984 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2048 -48 -64 ) ( 2048 -64 -64 ) ( 2048 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 741
+// brush 740
{
( 2080 0 -64 ) ( 1696 0 -64 ) ( 1696 -128 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1696 -128 0 ) ( 1696 0 0 ) ( 2080 0 0 ) evil3_floors/cemdrk 0 0 0 0.5 0.5 0 0 0
@@ -6898,7 +6888,7 @@
( 2720 -80 -64 ) ( 2736 -80 -64 ) ( 2736 -80 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2368 -48 -64 ) ( 2368 -32 -64 ) ( 2368 -48 0 ) e7/e7trimlight 0 0 0 0.5 0.25 0 0 0
}
-// brush 742
+// brush 741
{
( 2080 0 -64 ) ( 1696 0 -64 ) ( 1696 -128 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1696 -128 -16 ) ( 1696 0 -16 ) ( 2080 0 -16 ) evil3_floors/cemdrk 0 0 0 0.5 0.5 0 0 0
@@ -6907,7 +6897,7 @@
( 2240 -48 -64 ) ( 2240 -32 -64 ) ( 2240 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2368 -32 -64 ) ( 2368 -48 -64 ) ( 2368 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 743
+// brush 742
{
( 2480 -80 -64 ) ( 2464 -80 -64 ) ( 2480 -80 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2464 -48 -64 ) ( 2480 -48 -64 ) ( 2480 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6916,7 +6906,7 @@
( 2304 -64 -64 ) ( 2304 -48 -64 ) ( 2304 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2368 -48 -64 ) ( 2368 -64 -64 ) ( 2368 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 744
+// brush 743
{
( 1824 0 -64 ) ( 1440 0 -64 ) ( 1440 -128 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1440 -128 0 ) ( 1440 0 0 ) ( 1824 0 0 ) evil3_floors/cemdrk 0 0 0 0.5 0.5 0 0 0
@@ -6925,7 +6915,7 @@
( 2480 -48 -64 ) ( 2464 -48 -64 ) ( 2480 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2240 -32 -64 ) ( 2240 -48 -64 ) ( 2240 -48 0 ) e7/e7trimlight 0 0 0 0.5 0.25 0 0 0
}
-// brush 745
+// brush 744
{
( 1824 0 -64 ) ( 1440 0 -64 ) ( 1440 -128 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1440 -128 0 ) ( 1440 0 0 ) ( 1824 0 0 ) evil3_floors/cemdrk 0 0 0 0.5 0.5 0 0 0
@@ -6934,7 +6924,7 @@
( 2464 -80 -64 ) ( 2480 -80 -64 ) ( 2480 -80 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2240 -32 -64 ) ( 2240 -48 -64 ) ( 2240 -48 0 ) e7/e7trimlight 0 0 0 0.5 0.25 0 0 0
}
-// brush 746
+// brush 745
{
( 2496 64 -16 ) ( 1792 64 -16 ) ( 1792 0 -16 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1792 0 0 ) ( 1792 64 0 ) ( 2496 64 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6943,7 +6933,7 @@
( 2368 32 -16 ) ( 2368 16 -16 ) ( 2368 16 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2240 0 -16 ) ( 2240 32 -16 ) ( 2240 0 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 747
+// brush 746
{
( 2240 -192 -16 ) ( 2240 -160 -16 ) ( 2240 -192 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2368 -160 -16 ) ( 2368 -176 -16 ) ( 2368 -176 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6952,7 +6942,7 @@
( 1792 -192 0 ) ( 1792 -128 0 ) ( 2496 -128 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2496 -128 -16 ) ( 1792 -128 -16 ) ( 1792 -192 -16 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 748
+// brush 747
{
( 2368 0 -16 ) ( 2240 0 -16 ) ( 2240 -128 -16 ) common/nodraw 0 0 0 0.5 0.5 0 12 0
( 2240 -128 0 ) ( 2240 0 0 ) ( 2368 0 0 ) sav-liquids/slime1 0 0 0 0.5 0.5 0 265 0
@@ -6961,7 +6951,7 @@
( 2368 0 0 ) ( 2240 0 0 ) ( 2240 0 -16 ) common/nodraw 0 0 0 0.5 0.5 0 12 0
( 2240 0 0 ) ( 2240 -128 0 ) ( 2240 -128 -16 ) common/nodraw 0 0 0 0.5 0.5 0 12 0
}
-// brush 749
+// brush 748
{
( 3008 -128 -16 ) ( 2304 -128 -16 ) ( 2304 -192 -16 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2304 -192 0 ) ( 2304 -128 0 ) ( 3008 -128 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -6970,7 +6960,7 @@
( 2880 -160 -16 ) ( 2880 -176 -16 ) ( 2880 -176 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2752 -192 -16 ) ( 2752 -160 -16 ) ( 2752 -192 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 750
+// brush 749
{
( 2752 0 0 ) ( 2752 -128 0 ) ( 2752 -128 -16 ) common/nodraw 0 0 0 0.5 0.5 0 12 0
( 2880 0 0 ) ( 2752 0 0 ) ( 2752 0 -16 ) common/nodraw 0 0 0 0.5 0.5 0 12 0
@@ -6979,7 +6969,7 @@
( 2752 -128 0 ) ( 2752 0 0 ) ( 2880 0 0 ) sav-liquids/slime1 0 0 0 0.5 0.5 0 265 0
( 2880 0 -16 ) ( 2752 0 -16 ) ( 2752 -128 -16 ) common/nodraw 0 0 0 0.5 0.5 0 12 0
}
-// brush 751
+// brush 750
{
( 2880 64 -16 ) ( 2880 32 -16 ) ( 2880 64 0 ) common/caulk 0 0 -180 0.5 -0.5 0 0 0
( 2752 32 -16 ) ( 2752 48 -16 ) ( 2752 48 0 ) common/caulk 0 0 -180 0.5 -0.5 0 0 0
@@ -6988,7 +6978,7 @@
( 3328 64 0 ) ( 3328 0 0 ) ( 2624 0 0 ) common/caulk 0 0 -180 0.5 0.5 0 0 0
( 2624 0 -16 ) ( 3328 0 -16 ) ( 3328 64 -16 ) common/caulk 0 0 -180 0.5 0.5 0 0 0
}
-// brush 752
+// brush 751
{
( 2880 128 -16 ) ( 2880 -576 -16 ) ( 2944 -576 -16 ) common/caulk 0 0 90 0.5 0.5 0 0 0
( 2944 -576 0 ) ( 2880 -576 0 ) ( 2880 128 0 ) common/caulk 0 0 90 0.5 0.5 0 0 0
@@ -6997,7 +6987,7 @@
( 2912 0 -16 ) ( 2928 0 -16 ) ( 2928 0 0 ) common/caulk 0 0 -180 0.5 -0.5 0 0 0
( 2944 -128 -16 ) ( 2912 -128 -16 ) ( 2944 -128 0 ) common/caulk 0 0 -180 0.5 -0.5 0 0 0
}
-// brush 753
+// brush 752
{
( 1728 64 128 ) ( 1664 64 128 ) ( 1664 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
( 1664 0 192 ) ( 1728 0 192 ) ( 1728 -128 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -7006,7 +6996,7 @@
( 2480 -80 128 ) ( 2464 -80 128 ) ( 2480 -80 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2432 -64 128 ) ( 2432 -48 128 ) ( 2432 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 754
+// brush 753
{
( 1728 64 128 ) ( 1664 64 128 ) ( 1664 -192 128 ) evil3_floors/cemdrk 0 0 0 0.5 0.5 0 0 0
( 2880 -272 0 ) ( 2880 48 0 ) ( 2880 48 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -7015,7 +7005,7 @@
( 2496 -48 128 ) ( 2496 -32 128 ) ( 2496 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2512 -80 128 ) ( 2528 -80 128 ) ( 2512 -80 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 755
+// brush 754
{
( 1728 64 128 ) ( 1664 64 128 ) ( 1664 -192 128 ) evil3_floors/cemdrk 0 0 0 0.5 0.5 0 0 0
( 2880 -272 0 ) ( 2880 48 0 ) ( 2880 48 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -7024,7 +7014,7 @@
( 2496 -48 128 ) ( 2496 -32 128 ) ( 2496 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2528 -48 128 ) ( 2504 -48 128 ) ( 2504 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 756
+// brush 755
{
( 1728 64 128 ) ( 1664 64 128 ) ( 1664 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
( 2880 -272 0 ) ( 2880 48 0 ) ( 2880 48 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -7033,7 +7023,7 @@
( 2528 -80 128 ) ( 2512 -80 128 ) ( 2512 -80 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2752 -64 128 ) ( 2752 -40 128 ) ( 2752 -64 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 757
+// brush 756
{
( 1728 64 128 ) ( 1664 64 128 ) ( 1664 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
( 1664 0 192 ) ( 1728 0 192 ) ( 1728 -128 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -7042,7 +7032,7 @@
( 2688 -64 128 ) ( 2688 -40 128 ) ( 2688 -64 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2752 -40 128 ) ( 2752 -64 128 ) ( 2752 -64 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 758
+// brush 757
{
( 1728 64 128 ) ( 1664 64 128 ) ( 1664 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
( 1664 0 192 ) ( 1728 0 192 ) ( 1728 -128 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -7051,7 +7041,7 @@
( 2624 -64 128 ) ( 2624 -48 128 ) ( 2624 -64 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2688 -40 128 ) ( 2688 -64 128 ) ( 2688 -64 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 759
+// brush 758
{
( 1728 64 128 ) ( 1664 64 128 ) ( 1664 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
( 1664 0 192 ) ( 1728 0 192 ) ( 1728 -128 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -7060,7 +7050,7 @@
( 2560 -64 128 ) ( 2560 -48 128 ) ( 2560 -64 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2624 -48 128 ) ( 2624 -64 128 ) ( 2624 -64 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 760
+// brush 759
{
( 1728 64 128 ) ( 1664 64 128 ) ( 1664 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
( 1664 0 192 ) ( 1728 0 192 ) ( 1728 -128 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -7069,7 +7059,7 @@
( 2528 -80 128 ) ( 2512 -80 128 ) ( 2512 -80 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2560 -48 128 ) ( 2560 -64 128 ) ( 2560 -64 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 761
+// brush 760
{
( 2736 -80 -64 ) ( 2720 -80 -64 ) ( 2736 -80 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2720 -48 -64 ) ( 2736 -48 -64 ) ( 2736 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -7078,7 +7068,7 @@
( 2080 0 -64 ) ( 1696 0 -64 ) ( 1696 -128 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2688 -64 -64 ) ( 2688 -48 -64 ) ( 2688 -64 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 762
+// brush 761
{
( 2736 -80 -64 ) ( 2720 -80 -64 ) ( 2736 -80 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2720 -48 -64 ) ( 2736 -48 -64 ) ( 2736 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -7087,7 +7077,7 @@
( 2624 -64 -64 ) ( 2624 -48 -64 ) ( 2624 -64 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2688 -48 -64 ) ( 2688 -64 -64 ) ( 2688 -64 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 763
+// brush 762
{
( 2736 -80 -64 ) ( 2720 -80 -64 ) ( 2736 -80 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2720 -48 -64 ) ( 2736 -48 -64 ) ( 2736 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -7096,7 +7086,7 @@
( 2560 -64 -64 ) ( 2560 -48 -64 ) ( 2560 -64 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2624 -48 -64 ) ( 2624 -64 -64 ) ( 2624 -64 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 764
+// brush 763
{
( 2736 -80 -64 ) ( 2720 -80 -64 ) ( 2736 -80 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2720 -48 -64 ) ( 2736 -48 -64 ) ( 2736 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -7105,7 +7095,7 @@
( 2496 -72 -64 ) ( 2496 -48 -64 ) ( 2496 -72 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2560 -48 -64 ) ( 2560 -64 -64 ) ( 2560 -64 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 765
+// brush 764
{
( 2736 -80 -64 ) ( 2720 -80 -64 ) ( 2736 -80 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2720 -48 -64 ) ( 2736 -48 -64 ) ( 2736 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -7114,7 +7104,7 @@
( 2432 -64 -64 ) ( 2432 -48 -64 ) ( 2432 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2496 -48 -64 ) ( 2496 -72 -64 ) ( 2496 -72 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 766
+// brush 765
{
( 2304 -48 -64 ) ( 2304 -64 -64 ) ( 2304 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2240 -64 -64 ) ( 2240 -48 -64 ) ( 2240 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -7123,7 +7113,7 @@
( 2400 -48 -64 ) ( 2416 -48 -64 ) ( 2416 -48 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2352 -80 -64 ) ( 2336 -80 -64 ) ( 2352 -80 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 767
+// brush 766
{
( 2368 -48 128 ) ( 2368 -64 128 ) ( 2368 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2304 -64 128 ) ( 2304 -48 128 ) ( 2304 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -7132,7 +7122,7 @@
( 1600 0 192 ) ( 1664 0 192 ) ( 1664 -128 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1664 64 128 ) ( 1600 64 128 ) ( 1600 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
}
-// brush 768
+// brush 767
{
( 1600 64 128 ) ( 1536 64 128 ) ( 1536 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
( 1536 0 192 ) ( 1600 0 192 ) ( 1600 -128 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -7141,7 +7131,7 @@
( 2240 -64 128 ) ( 2240 -48 128 ) ( 2240 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2304 -48 128 ) ( 2304 -64 128 ) ( 2304 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 769
+// brush 768
{
( 2240 -48 128 ) ( 2240 -64 128 ) ( 2240 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2176 -64 128 ) ( 2176 -48 128 ) ( 2176 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -7150,7 +7140,7 @@
( 1472 0 192 ) ( 1536 0 192 ) ( 1536 -128 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 1536 64 128 ) ( 1472 64 128 ) ( 1472 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
}
-// brush 770
+// brush 769
{
( 1472 64 128 ) ( 1408 64 128 ) ( 1408 -192 128 ) evil3_support/mtlsupgrt2_light -64 0 -90 0.5 0.5 0 0 0
( 1408 0 192 ) ( 1472 0 192 ) ( 1472 -128 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -7159,7 +7149,7 @@
( 2112 -64 128 ) ( 2112 -48 128 ) ( 2112 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 2176 -48 128 ) ( 2176 -64 128 ) ( 2176 -48 192 ) common/caulk 0 0 0 0.5 0.5 0 0 0
}
-// brush 771
+// brush 770
{
( 768 -240 -64 ) ( 768 -288 -64 ) ( 896 -288 -64 ) common/caulk 0 0 0 0.5 0.5 0 0 0
( 768 -272 0 ) ( 768 -224 0 ) ( 896 -272 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0
@@ -7168,7 +7158,7 @@
( 896 -320 320 ) ( 896 -192 320 ) ( 896 -192 256 ) evil3_support/mtlsupport_grt3wrn 0 0 -270 -0.5 0.5 0 0 0
( 808 -320 -64 ) ( 784 -320 -64 ) ( 808 -320 0 ) evil3_support/mtlsupport_grt3wrn 0 0 -270 -0.5 0.5 0 0 0
}
-// brush 772
+// brush 771
{
( 768 -240 -64 ) ( 768 -288 -64 ) ( 896 -288 -64 ) e7/e7trimlight 0 0 0 0.5 0.5 0 0 0
( 768 -272 0 ) ( 768 -224 0 ) ( 896 -272 0 ) e7/e7trimlight 0 0 0 0.5 0.5 0 0 0
@@ -7177,19 +7167,8 @@
( 768 -352 320 ) ( 896 -352 320 ) ( 896 -352 256 ) evil3_support/mtlsupport_grt3wrn 0 0 -270 -0.5 0.5 0 0 0
( 784 -320 -64 ) ( 808 -320 -64 ) ( 808 -320 0 ) evil3_support/mtlsupport_grt3wrn 0 0 -270 -0.5 0.5 0 0 0
}
-// brush 773
+// brush 772
{
-( -464 1168 -362 ) ( -464 912 -362 ) ( -464 912 -386 ) common/nodraw 0 -4 0 0.5 0.5 0 12 0
-( 768 1416 -362 ) ( 576 1416 -362 ) ( 576 1416 -386 ) common/nodraw 0 -4 0 0.5 0.5 0 12 0
-( 768 896 -362 ) ( 768 1152 -362 ) ( 768 1152 -386 ) common/nodraw 0 -4 0 0.5 0.5 0 12 0
-( 552 -224 -362 ) ( 744 -224 -362 ) ( 744 -224 -386 ) common/nodraw 0 -4 0 0.5 0.5 0 12 0
-( 576 896 -374 ) ( 576 1152 -374 ) ( 768 1152 -374 ) water/water0 0 368 0 1 1.25 0 281 0
-( 768 1152 -386 ) ( 576 1152 -386 ) ( 576 896 -386 ) common/nodraw 0 0 0 0.5 0.5 0 12 0
-( 768 896 -386 ) ( 64 -64 -386 ) ( 768 896 -374 ) common/nodraw 0 0 0 0.5 0.5 0 12 0
-( 64 -64 -386 ) ( -256 -224 -386 ) ( -256 -224 -374 ) common/nodraw 0 0 0 0.5 0.5 0 12 0
-}
-// brush 774
-{
( 64 -64 -384 ) ( -256 -224 -384 ) ( -256 -224 -372 ) common/nodraw 0 0 0 0.5 0.5 0 12 0
( 768 896 -384 ) ( 64 -64 -384 ) ( 64 -64 -372 ) common/nodraw 0 0 0 0.5 0.5 0 12 0
( -464 1168 -360 ) ( -464 912 -360 ) ( -464 912 -384 ) common/nodraw 0 0 0 0.5 0.5 0 12 0
Modified: branches/nexuiz-2.0/data/qcsrc/common/util.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/common/util.qc 2007-10-31 11:04:19 UTC (rev 2873)
+++ branches/nexuiz-2.0/data/qcsrc/common/util.qc 2007-10-31 11:07:10 UTC (rev 2874)
@@ -101,3 +101,39 @@
// vlen of the remaining vector
return vlen(p);
}
+
+void depthfirst(entity start, .entity up, .entity downleft, .entity right, void(entity, entity) funcPre, void(entity, entity) funcPost, entity pass)
+{
+ entity e;
+ e = start;
+ funcPre(pass, e);
+ while(e.downleft)
+ {
+ e = e.downleft;
+ funcPre(pass, e);
+ }
+ funcPost(pass, e);
+ while(e != start)
+ {
+ if(e.right)
+ {
+ e = e.right;
+ funcPre(pass, e);
+ while(e.downleft)
+ {
+ e = e.downleft;
+ funcPre(pass, e);
+ }
+ }
+ else
+ e = e.up;
+ funcPost(pass, e);
+ }
+}
+
+float median(float a, float b, float c)
+{
+ if(a < c)
+ return bound(a, b, c);
+ return bound(c, b, a);
+}
Modified: branches/nexuiz-2.0/data/qcsrc/common/util.qh
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/common/util.qh 2007-10-31 11:04:19 UTC (rev 2873)
+++ branches/nexuiz-2.0/data/qcsrc/common/util.qh 2007-10-31 11:07:10 UTC (rev 2874)
@@ -20,3 +20,9 @@
float GameCommand_Generic(string cmd);
// returns TRUE if handled, FALSE otherwise
// uses tokenize on its argument!
+
+// iterative depth-first search, with fields that go "up", "down left" and "right" in a tree
+// for each element, funcPre is called first, then funcPre and funcPost for all its children, and funcPost last
+void depthfirst(entity start, .entity up, .entity downleft, .entity right, void(entity, entity) funcPre, void(entity, entity) funcPost, entity pass);
+
+float median(float a, float b, float c);
Modified: branches/nexuiz-2.0/data/qcsrc/menu/mbuiltin.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/mbuiltin.qc 2007-10-31 11:04:19 UTC (rev 2873)
+++ branches/nexuiz-2.0/data/qcsrc/menu/mbuiltin.qc 2007-10-31 11:07:10 UTC (rev 2874)
@@ -180,8 +180,11 @@
float drawcharacter(vector position, float character, vector scale, vector rgb, float alpha, float flag) = #454;
float drawstring(vector position, string text, vector scale, vector rgb, float alpha, float flag) = #455;
+float drawcolorcodedstring(vector position, string text, vector scale, float alpha, float flag) = #467;
+float stringwidth(string text, float handleColors) = #468;
float drawpic(vector position, string pic, vector size, vector rgb, float alpha, float flag) = #456;
+float drawsubpic(vector position, vector size, string pic, vector srcPosition, vector srcSize, vector rgb, float alpha, float flag) = #469;
float drawfill(vector position, vector size, vector rgb, float alpha, float flag) = #457;
Modified: branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2007-10-31 11:04:19 UTC (rev 2873)
+++ branches/nexuiz-2.0/data/qcsrc/server/cl_client.qc 2007-10-31 11:07:10 UTC (rev 2874)
@@ -277,7 +277,7 @@
void PutObserverInServer (void)
{
entity spot;
- spot = SelectSpawnPoint (FALSE);
+ spot = SelectSpawnPoint (TRUE);
RemoveGrapplingHook(self); // Wazat's Grappling Hook
if(clienttype(self) == CLIENTTYPE_REAL)
@@ -587,6 +587,7 @@
void FixClientCvars(entity e)
{
+ float t;
// send prediction settings to the client
stuffcmd(e, "\nin_bindmap 0 0\n");
stuffcmd(e, strcat("cl_gravity ", ftos(cvar("sv_gravity")), "\n"));
@@ -602,6 +603,11 @@
stuffcmd(e, strcat("set cl_movement_airaccel_qw ", ftos(cvar("sv_airaccel_qw")), "\n"));
stuffcmd(e, strcat("set cl_movement_airaccel_sideways_friction ", ftos(cvar("sv_airaccel_sideways_friction")), "\n"));
stuffcmd(e, "cl_movement_edgefriction 1\n");
+
+ // notify about available teams
+ CheckAllowedTeams(e);
+ t = 0; if(c1 >= 0) t |= 1; if(c2 >= 0) t |= 2; if(c3 >= 0) t |= 4; if(c4 >= 0) t |= 8;
+ stuffcmd(e, strcat("set _teams_available ", ftos(t), "\n"));
}
/*
Modified: branches/nexuiz-2.0/data/scripts/water.shader
===================================================================
--- branches/nexuiz-2.0/data/scripts/water.shader 2007-10-31 11:04:19 UTC (rev 2873)
+++ branches/nexuiz-2.0/data/scripts/water.shader 2007-10-31 11:07:10 UTC (rev 2874)
@@ -18,7 +18,7 @@
tcmod rotate 0.5
blendfunc blend
}
- dp_water 0.2 0.6 3 3 1 1 1 1 1 1
+ dp_water 0.4 0.9 3 3 1 1 1 1 1 1
}
textures/water/water1
@@ -39,7 +39,7 @@
tcmod rotate 0.5
blendfunc blend
}
- dp_water 0.2 0.6 3 3 1 1 1 1 1 1
+ dp_water 0.4 0.9 3 3 1 1 1 1 1 1
}
textures/water/water2
@@ -60,7 +60,7 @@
tcmod rotate 0.5
blendfunc blend
}
- dp_water 0.2 0.6 3 3 1 1 1 1 1 1
+ dp_water 0.4 0.9 3 3 1 1 1 1 1 1
}
textures/water/slime1
Modified: branches/nexuiz-2.0/data/textures/water/water0.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/water/water1.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/textures/water/water2.tga
===================================================================
(Binary files differ)
More information about the nexuiz-commits
mailing list