From: Samual Lenks <samual@xonotic.org>
Date: Tue, 14 May 2013 03:28:04 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/cbrutail/nexballarena_cortez'
X-Git-Tag: xonotic-v0.7.0~37
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=63fc798aeb431eb03bba8aed9ee4d974b3a499bd;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/cbrutail/nexballarena_cortez'
---

63fc798aeb431eb03bba8aed9ee4d974b3a499bd
diff --cc maps/nexballarena.map
index d809092d,680fe4ab..e727ce51
--- a/maps/nexballarena.map
+++ b/maps/nexballarena.map
@@@ -8341,82 -8453,174 +8453,179 @@@ ex2x/base-metalmaterial
  }
  }
  {
- "classname" "func_group"
+ "classname" "light"
+ "target" "t4"
+ "origin" "-120.000000 944.000000 136.000000"
+ "light" "300"
+ "_color" "1 0 0"
+ }
  {
- ( 368 -816 224 ) ( 368 -784 224 ) ( 224 -784 224 ) common/caulk 0 -31 90 0.5 0.5 0 0 0
- ( 384 -736 288 ) ( 384 -736 256 ) ( 224 -736 288 ) common/caulk 225 -96 -180 0.5 0.5 0 0 0
- ( 384 -736 256 ) ( 384 -752 256 ) ( 224 -736 256 ) common/caulk 0 -31 90 0.5 0.5 0 0 0
- ( 224 -720 96 ) ( 160 -720 96 ) ( 160 -720 64 ) trak5x/trim-trim5e 0 384 -90 0.25 0.25 0 0 0
- ( 272 -768 224 ) ( 272 -736 224 ) ( 272 -736 256 ) common/caulk 1 -95 0 0.5 -0.5 0 0 0
- ( 304 -752 224 ) ( 304 -768 224 ) ( 304 -752 256 ) common/caulk 1 -95 0 0.5 -0.5 0 0 0
+ "classname" "light"
+ "target" "t3"
+ "origin" "120.000000 944.000000 136.000000"
+ "light" "300"
+ "_color" "1 0 0"
  }
  {
- ( 304 -720 224 ) ( 304 -736 224 ) ( 320 -720 224 ) common/caulk -31 -31 90 0.5 0.5 0 0 0
- ( 304 -736 224 ) ( 304 -736 256 ) ( 320 -720 256 ) common/caulk -63 -95 -180 0.5 0.5 0 0 0
- ( 304 -736 256 ) ( 304 -720 256 ) ( 320 -704 256 ) common/caulk -31 -31 90 0.5 0.5 0 0 0
- ( 304 -720 256 ) ( 304 -720 224 ) ( 320 -704 224 ) trak5x/trim-trim5e 0 -153 -90 0.25 0.25 0 0 0
- ( 320 -720 224 ) ( 320 -752 224 ) ( 320 -720 256 ) common/caulk -31 -95 0 0.5 -0.5 0 0 0
- ( 304 -768 224 ) ( 304 -752 224 ) ( 304 -752 256 ) common/caulk -31 -95 0 0.5 -0.5 0 0 0
+ "classname" "target_position"
+ "angle" "-90.000000"
+ "targetname" "t4"
+ "origin" "-40.000000 944.000000 92.000000"
  }
  {
- ( 224 -704 96 ) ( 160 -704 96 ) ( 160 -704 64 ) trak5x/trim-basictrim1a 0 -256 -90 0.25 -0.25 0 0 0
- ( 368 -816 192 ) ( 368 -768 192 ) ( 224 -816 192 ) common/caulk -31 -31 90 0.5 0.5 0 0 0
- ( 304 -720 224 ) ( 304 -704 208 ) ( 320 -704 224 ) trak5x/trim-trim5e -120 -391 90 0.25 0.25 0 0 0
- ( 320 -704 192 ) ( 304 -720 192 ) ( 320 -704 224 ) common/caulk -31 -95 -180 0.5 0.5 0 0 0
- ( 304 -736 192 ) ( 304 -704 192 ) ( 304 -704 224 ) common/caulk -31 -95 0 0.5 -0.5 0 0 0
+ "classname" "target_position"
+ "angle" "90.000000"
+ "targetname" "t3"
+ "origin" "40.000000 944.000000 92.000000"
  }
  {
- ( 304 -704 208 ) ( 272 -704 208 ) ( 272 -704 192 ) trak5x/trim-basictrim1a 0 -256 -90 0.25 -0.25 0 0 0
- ( 384 -720 288 ) ( 384 -720 256 ) ( 224 -720 288 ) common/caulk 225 -96 -180 0.5 0.5 0 0 0
- ( 368 -816 192 ) ( 368 -768 192 ) ( 224 -816 192 ) common/caulk -31 -31 90 0.5 0.5 0 0 0
- ( 272 -704 208 ) ( 304 -704 208 ) ( 304 -720 224 ) trak5x/trim-trim5e -120 -391 90 0.25 0.25 0 0 0
- ( 304 -704 192 ) ( 304 -736 192 ) ( 304 -704 224 ) common/caulk -31 -95 0 0.5 -0.5 0 0 0
- ( 272 -752 192 ) ( 272 -736 192 ) ( 272 -736 224 ) common/caulk -31 -95 0 0.5 -0.5 0 0 0
+ "classname" "light"
+ "target" "t9"
+ "origin" "-192.000000 856.000000 288.000000"
+ "light" "300"
+ "_color" "1 0.984314 0.733333"
  }
  {
- ( 224 -704 96 ) ( 160 -704 96 ) ( 160 -704 64 ) trak5x/trim-basictrim1a 0 -256 -90 0.25 -0.25 0 0 0
- ( 368 -816 192 ) ( 368 -768 192 ) ( 224 -816 192 ) common/caulk -31 -31 90 0.5 0.5 0 0 0
- ( 272 -704 208 ) ( 272 -720 224 ) ( 256 -704 224 ) trak5x/trim-trim5e -120 -391 90 0.25 0.25 0 0 0
- ( 272 -720 192 ) ( 256 -704 192 ) ( 272 -720 224 ) common/caulk -159 -95 0 0.5 -0.5 0 0 0
- ( 272 -736 192 ) ( 272 -752 192 ) ( 272 -736 224 ) common/caulk -31 -95 0 0.5 -0.5 0 0 0
+ "classname" "light"
+ "target" "t10"
+ "origin" "192.000000 856.000000 288.000000"
+ "light" "300"
+ "_color" "1 0.984314 0.733333"
  }
  {
- ( 272 -736 224 ) ( 272 -720 224 ) ( 256 -704 224 ) common/caulk -31 -31 90 0.5 0.5 0 0 0
- ( 272 -736 256 ) ( 272 -736 224 ) ( 256 -720 224 ) common/caulk -128 -95 0 0.5 -0.5 0 0 0
- ( 272 -720 256 ) ( 272 -736 256 ) ( 256 -720 256 ) common/caulk -31 -31 90 0.5 0.5 0 0 0
- ( 272 -720 224 ) ( 272 -720 256 ) ( 256 -704 256 ) trak5x/trim-trim5e 0 152 -90 0.25 -0.25 0 0 0
- ( 272 -736 224 ) ( 272 -768 224 ) ( 272 -736 256 ) common/caulk -31 -95 0 0.5 -0.5 0 0 0
- ( 256 -736 224 ) ( 256 -720 224 ) ( 256 -720 256 ) common/caulk -31 -95 0 0.5 -0.5 0 0 0
+ "classname" "target_position"
+ "_color" "1 0.984314 0.733333"
+ "angle" "-179.999985"
+ "targetname" "t9"
+ "origin" "-192.000000 792.000000 140.000000"
  }
+ {
+ "classname" "target_position"
+ "_color" "1 0.984314 0.733333"
+ "angle" "-179.999985"
+ "targetname" "t10"
+ "origin" "192.000000 792.000000 140.000000"
  }
  {
- "classname" "ball_bluegoal"
+ "classname" "light"
+ "target" "t8"
+ "origin" "-312.000000 672.000000 288.000000"
+ "light" "300"
+ "_color" "1 0.984314 0.733333"
+ }
  {
- ( -192 832 176 ) ( -192 672 176 ) ( -192 672 -16 ) common/trigger 0 128 0 0.25 0.25 0 7 0
- ( 192 832 160 ) ( 176 832 160 ) ( 176 832 -32 ) common/trigger 64 128 0 0.25 0.25 0 7 0
- ( 192 672 160 ) ( 192 832 160 ) ( 192 832 -32 ) common/trigger 0 128 0 0.25 0.25 0 7 0
- ( 176 688 160 ) ( 192 688 160 ) ( 192 688 -32 ) common/trigger 64 128 0 0.25 0.25 0 7 0
- ( 176 672 160 ) ( 176 832 160 ) ( 192 832 160 ) common/trigger 64 0 0 0.25 0.25 0 7 0
- ( 200 832 0 ) ( 184 832 0 ) ( 184 672 0 ) common/trigger 64 0 0 0.25 0.25 0 7 0
+ "classname" "light"
+ "target" "t5"
+ "origin" "312.000000 672.000000 288.000000"
+ "light" "300"
+ "_color" "1 0.984314 0.733333"
  }
+ {
+ "classname" "target_position"
+ "_color" "1 0.984314 0.733333"
+ "angle" "-90.000000"
+ "targetname" "t8"
+ "origin" "-248.000000 672.000000 140.000000"
  }
  {
- "classname" "ball_redgoal"
+ "classname" "target_position"
+ "_color" "1 0.984314 0.733333"
+ "angle" "90.000000"
+ "targetname" "t5"
+ "origin" "248.000000 672.000000 140.000000"
+ }
  {
- ( 192 -672 0 ) ( -192 -816 0 ) ( 192 -816 0 ) common/trigger 64 192 0 0.25 0.25 0 7 0
- ( 192 -816 160 ) ( -192 -672 160 ) ( 192 -672 160 ) common/trigger 64 192 0 0.25 0.25 0 7 0
- ( 192 -816 0 ) ( -192 -816 160 ) ( 192 -816 160 ) common/trigger 64 128 0 0.25 0.25 0 7 0
- ( 192 -672 160 ) ( 192 -816 0 ) ( 192 -816 160 ) common/trigger 64 128 0 0.25 0.25 0 7 0
- ( -192 -688 160 ) ( 192 -688 0 ) ( 192 -688 160 ) common/trigger 64 128 0 0.25 0.25 0 7 0
- ( -192 -816 0 ) ( -192 -672 160 ) ( -192 -816 160 ) common/trigger 64 128 0 0.25 0.25 0 7 0
+ "classname" "light"
+ "light" "200"
+ "origin" "88 -432 240"
  }
+ {
+ "classname" "light"
+ "light" "200"
+ "origin" "-72 -432 240"
  }
  {
- "classname" "ball_football"
- "origin" "0.000000 0.000000 336.000000"
+ "classname" "target_position"
+ "_color" "1 0.984314 0.733333"
+ "angle" "-90.000000"
+ "targetname" "t12"
+ "origin" "-256.000000 -672.000000 140.000000"
+ }
+ {
+ "classname" "target_position"
+ "_color" "1 0.984314 0.733333"
+ "angle" "90.000000"
+ "targetname" "t15"
+ "origin" "240.000000 -672.000000 140.000000"
+ }
+ {
+ "classname" "target_position"
+ "_color" "1 0.984314 0.733333"
+ "targetname" "t11"
+ "origin" "-200.000000 -792.000000 140.000000"
+ }
+ {
+ "classname" "target_position"
+ "_color" "1 0.984314 0.733333"
+ "targetname" "t16"
+ "origin" "184.000000 -792.000000 140.000000"
+ }
+ {
+ "classname" "light"
+ "target" "t15"
+ "origin" "304.000000 -672.000000 288.000000"
+ "light" "300"
+ "_color" "1 0.984314 0.733333"
+ }
+ {
+ "classname" "light"
+ "target" "t12"
+ "origin" "-320.000000 -672.000000 288.000000"
+ "light" "300"
+ "_color" "1 0.984314 0.733333"
+ }
+ {
+ "classname" "light"
+ "target" "t11"
+ "origin" "-200.000000 -856.000000 288.000000"
+ "light" "300"
+ "_color" "1 0.984314 0.733333"
+ }
+ {
+ "classname" "light"
+ "target" "t16"
+ "origin" "184.000000 -856.000000 288.000000"
+ "light" "300"
+ "_color" "1 0.984314 0.733333"
+ }
+ {
+ "classname" "target_position"
+ "angle" "90.000000"
+ "targetname" "t1"
+ "origin" "32.000000 -944.000000 92.000000"
+ }
+ {
+ "classname" "target_position"
+ "angle" "-90.000000"
+ "targetname" "t2"
+ "origin" "-32.000000 -944.000000 92.000000"
+ }
+ {
+ "classname" "light"
+ "target" "t1"
+ "origin" "120.000000 -944.000000 136.000000"
+ "light" "300"
+ "_color" "0.073518 0 1"
+ }
+ {
+ "classname" "light"
+ "target" "t2"
+ "origin" "-120.000000 -944.000000 136.000000"
+ "light" "300"
+ "_color" "0.073518 0 1"
  }
 +{
 +"classname" "info_autoscreenshot"
 +"origin" "'-130.6 631.6 235.6'"
 +"angles" "' 14.0 -78.8   0.0'"
 +}