From: Rudolf Polzer <divVerent@xonotic.org>
Date: Thu, 21 Oct 2010 16:16:43 +0000 (+0200)
Subject: Merge branch 'master' into fruitiex/g-23sounds
X-Git-Tag: xonotic-v0.1.0preview~91^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3d6355c456ac3a4115b7810703f5f6774359d1cc;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into fruitiex/g-23sounds

Conflicts:
	maps/g-23.map
---

3d6355c456ac3a4115b7810703f5f6774359d1cc
diff --cc maps/g-23.map
index a7db801b,e96386ca..ce54e763
--- a/maps/g-23.map
+++ b/maps/g-23.map
@@@ -13056,9 -11726,6 +11726,7 @@@ exx/wall-metalrib0
  {
  "classname" "func_plat"
  "speed" "300"
 +"sound1" "sounds/machines/Elevator_Up.wav"
- // brush 0
  {
  ( 576 -192 0 ) ( 576 -256 0 ) ( 512 -192 0 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
  ( 576 -192 -32 ) ( 512 -192 -32 ) ( 576 -192 -64 ) exx/wall-bigrib02 0 0 0 0.25 0.25 134217728 0 0
@@@ -13241,15 -11888,13 +11889,13 @@@
  "modelscale" "0.750000"
  "spawnflags" "2"
  }
- // entity 40
  {
  "classname" "misc_model"
 -"origin" "520.000000 -1248.000000 112.000000"
 +"origin" "528.000000 -1244.000000 120.000000"
  "model" "models/it/pc.md3"
 -"angle" "-180.000000"
  "spawnflags" "2"
 +"angles" "90.000000 0.000000 150.000000"
  }
- // entity 41
  {
  "classname" "misc_model"
  "origin" "456.000000 -1232.000000 112.000000"
@@@ -16192,50 -14428,3 +14429,43 @@@
  ( -392 928 64 ) ( -512 928 48 ) ( -512 928 64 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0
  }
  }
- // entity 367
 +{
 +"classname" "target_speaker"
 +"origin" "664.000000 344.000000 -352.000000"
 +"noise" "sounds/machines/Big_machine.wav"
 +}
- // entity 368
 +{
 +"classname" "target_speaker"
 +"origin" "-1648.000000 0.000000 -544.000000"
 +"noise" "sounds/supernatural/space-loop.wav"
 +}
- // entity 369
 +{
 +"classname" "target_speaker"
 +"origin" "1536.000000 -1024.000000 240.000000"
 +"noise" "sounds/machines/Lights(Mono).wav"
 +"volume" "0.6"
 +}
- // entity 370
 +{
 +"classname" "target_speaker"
 +"origin" "832.000000 -1024.000000 240.000000"
 +"noise" "sounds/machines/Lights(Mono).wav"
 +"volume" "0.6"
 +}
- // entity 371
 +{
 +"classname" "target_speaker"
 +"origin" "320.000000 0.000000 240.000000"
 +"noise" "sounds/machines/Lights(Mono).wav"
 +"volume" "0.6"
 +}
- // entity 372
 +{
 +"classname" "target_speaker"
 +"origin" "320.000000 -1024.000000 240.000000"
 +"noise" "sounds/machines/Lights(Mono).wav"
 +"volume" "0.6"
 +}
- // entity 373
 +{
 +"classname" "target_speaker"
 +"origin" "524.000000 -1256.000000 136.000000"
 +"noise" "sounds/machines/Electric-Arcs2.wav"
 +"volume" "0.3"
 +}