]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1e3d122)
naming convention fixes
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 9 Mar 2011 16:49:38 +0000 (17:49 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 9 Mar 2011 16:51:17 +0000 (17:51 +0100)
14 files changed:
maps/leave_em_behind.map patch | blob | history
maps/newtonian-nightmare.map patch | blob | history
sound/map-leave_em_behind/lighthum.ogg [deleted file] patch | blob | history
sound/map-leave_em_behind/pumps.ogg [deleted file] patch | blob | history
sound/map-newtonian-nightmare/nn-Electric-Arcs1_looped.ogg [deleted file] patch | blob | history
sound/map-newtonian-nightmare/nn-electrified_looped.ogg [deleted file] patch | blob | history
sound/map-newtonian-nightmare/nn-robotic_laser.ogg [deleted file] patch | blob | history
sound/map-newtonian-nightmare/nn-robotic_launchpad.ogg [deleted file] patch | blob | history
sound/map_leave_em_behind/lighthum.ogg [new file with mode: 0644] patch | blob
sound/map_leave_em_behind/pumps.ogg [new file with mode: 0644] patch | blob
sound/map_newtonian-nightmare/nn-Electric-Arcs1_looped.ogg [new file with mode: 0644] patch | blob
sound/map_newtonian-nightmare/nn-electrified_looped.ogg [new file with mode: 0644] patch | blob
sound/map_newtonian-nightmare/nn-robotic_laser.ogg [new file with mode: 0644] patch | blob
sound/map_newtonian-nightmare/nn-robotic_launchpad.ogg [new file with mode: 0644] patch | blob

diff --git a/maps/leave_em_behind.map b/maps/leave_em_behind.map
index 2d8c1c4d1391dcfa72948f29ac19518bacae0cfb..82d6d74af9131badafccfb8a7abb129003b834a5 100644 (file)
--- a/maps/leave_em_behind.map
+++ b/maps/leave_em_behind.map
@@ -16070,12 +16070,12 @@ exx/panel-q201
 {
 "classname" "target_speaker"
 "origin" "0.000000 -288.000000 184.000000"
 {
 "classname" "target_speaker"
 "origin" "0.000000 -288.000000 184.000000"
-"noise" "sound/map-leave_em_behind/pumps.ogg"
+"noise" "sound/map_leave_em_behind/pumps.ogg"
 }
 {
 "classname" "target_speaker"
 "origin" "0.000000 416.000000 320.000000"
 }
 {
 "classname" "target_speaker"
 "origin" "0.000000 416.000000 320.000000"
-"noise" "sound/map-leave_em_behind/lighthum.ogg"
+"noise" "sound/map_leave_em_behind/lighthum.ogg"
 }
 {
 "classname" "target_speaker"
 }
 {
 "classname" "target_speaker"
@@ -16560,35 +16560,35 @@ exx/panel-q201
 {
 "classname" "target_speaker"
 "origin" "0.000000 288.000000 184.000000"
 {
 "classname" "target_speaker"
 "origin" "0.000000 288.000000 184.000000"
-"noise" "sound/map-leave_em_behind/pumps.ogg"
+"noise" "sound/map_leave_em_behind/pumps.ogg"
 }
 {
 "classname" "target_speaker"
 "origin" "-1184.000000 -704.000000 64.000000"
 }
 {
 "classname" "target_speaker"
 "origin" "-1184.000000 -704.000000 64.000000"
-"noise" "sound/map-leave_em_behind/lighthum.ogg"
+"noise" "sound/map_leave_em_behind/lighthum.ogg"
 }
 {
 "classname" "target_speaker"
 "origin" "-1184.000000 1344.000000 416.000000"
 }
 {
 "classname" "target_speaker"
 "origin" "-1184.000000 1344.000000 416.000000"
-"noise" "sound/map-leave_em_behind/lighthum.ogg"
+"noise" "sound/map_leave_em_behind/lighthum.ogg"
 }
 {
 "classname" "target_speaker"
 "origin" "160.000000 1184.000000 416.000000"
 }
 {
 "classname" "target_speaker"
 "origin" "160.000000 1184.000000 416.000000"
-"noise" "sound/map-leave_em_behind/lighthum.ogg"
+"noise" "sound/map_leave_em_behind/lighthum.ogg"
 }
 {
 "classname" "target_speaker"
 "origin" "1344.000000 -1184.000000 416.000000"
 }
 {
 "classname" "target_speaker"
 "origin" "1344.000000 -1184.000000 416.000000"
-"noise" "sound/map-leave_em_behind/lighthum.ogg"
+"noise" "sound/map_leave_em_behind/lighthum.ogg"
 }
 {
 "classname" "target_speaker"
 "origin" "0.000000 -1344.000000 416.000000"
 }
 {
 "classname" "target_speaker"
 "origin" "0.000000 -1344.000000 416.000000"
-"noise" "sound/map-leave_em_behind/lighthum.ogg"
+"noise" "sound/map_leave_em_behind/lighthum.ogg"
 }
 {
 "classname" "target_speaker"
 "origin" "0.000000 -608.000000 320.000000"
 }
 {
 "classname" "target_speaker"
 "origin" "0.000000 -608.000000 320.000000"
-"noise" "sound/map-leave_em_behind/lighthum.ogg"
+"noise" "sound/map_leave_em_behind/lighthum.ogg"
 }
 }
diff --git a/maps/newtonian-nightmare.map b/maps/newtonian-nightmare.map
index 12de463a1c62f2f0935d1fd2f4f6f81b825ae4ff..1717cc8f02545bad11be0794419cde676e028165 100644 (file)
--- a/maps/newtonian-nightmare.map
+++ b/maps/newtonian-nightmare.map
@@ -23606,7 +23606,7 @@ exx/trim-simple03
 "origin" "160.000000 -144.000000 -192.000000"
 "spawnflags" "2"
 "targetname" "blue_speakers_loop"
 "origin" "160.000000 -144.000000 -192.000000"
 "spawnflags" "2"
 "targetname" "blue_speakers_loop"
-"noise" "sound/map-newtonian-nightmare/nn-electrified_looped.ogg"
+"noise" "sound/map_newtonian-nightmare/nn-electrified_looped.ogg"
 "atten" "3"
 "volume" "0.25"
 }
 "atten" "3"
 "volume" "0.25"
 }
@@ -23615,7 +23615,7 @@ exx/trim-simple03
 "origin" "-160.000000 144.000000 -192.000000"
 "spawnflags" "2"
 "targetname" "red_speakers_loop"
 "origin" "-160.000000 144.000000 -192.000000"
 "spawnflags" "2"
 "targetname" "red_speakers_loop"
-"noise" "sound/map-newtonian-nightmare/nn-electrified_looped.ogg"
+"noise" "sound/map_newtonian-nightmare/nn-electrified_looped.ogg"
 "atten" "3"
 "volume" "0.25"
 }
 "atten" "3"
 "volume" "0.25"
 }
@@ -23624,7 +23624,7 @@ exx/trim-simple03
 "origin" "784.000000 -144.000000 192.000000"
 "spawnflags" "2"
 "targetname" "blue_speakers_loop"
 "origin" "784.000000 -144.000000 192.000000"
 "spawnflags" "2"
 "targetname" "blue_speakers_loop"
-"noise" "sound/map-newtonian-nightmare/nn-electrified_looped.ogg"
+"noise" "sound/map_newtonian-nightmare/nn-electrified_looped.ogg"
 "atten" "3"
 }
 {
 "atten" "3"
 }
 {
@@ -23632,13 +23632,13 @@ exx/trim-simple03
 "origin" "-784.000000 144.000000 192.000000"
 "spawnflags" "2"
 "targetname" "red_speakers_loop"
 "origin" "-784.000000 144.000000 192.000000"
 "spawnflags" "2"
 "targetname" "red_speakers_loop"
-"noise" "sound/map-newtonian-nightmare/nn-electrified_looped.ogg"
+"noise" "sound/map_newtonian-nightmare/nn-electrified_looped.ogg"
 "atten" "3"
 }
 {
 "classname" "target_speaker"
 "origin" "0.000000 0.000000 2208.000000"
 "atten" "3"
 }
 {
 "classname" "target_speaker"
 "origin" "0.000000 0.000000 2208.000000"
-"noise" "sound/map-newtonian-nightmare/nn-Electric-Arcs1_looped.ogg"
+"noise" "sound/map_newtonian-nightmare/nn-Electric-Arcs1_looped.ogg"
 "spawnflags" "1"
 "atten" "3"
 "volume" "0.25"
 "spawnflags" "1"
 "atten" "3"
 "volume" "0.25"
@@ -23647,7 +23647,7 @@ exx/trim-simple03
 {
 "classname" "target_speaker"
 "origin" "0.000000 -1536.000000 736.000000"
 {
 "classname" "target_speaker"
 "origin" "0.000000 -1536.000000 736.000000"
-"noise" "sound/map-newtonian-nightmare/nn-Electric-Arcs1_looped.ogg"
+"noise" "sound/map_newtonian-nightmare/nn-Electric-Arcs1_looped.ogg"
 "spawnflags" "1"
 "atten" "3"
 "volume" "0.25"
 "spawnflags" "1"
 "atten" "3"
 "volume" "0.25"
@@ -23655,7 +23655,7 @@ exx/trim-simple03
 {
 "classname" "target_speaker"
 "origin" "0.000000 1536.000000 736.000000"
 {
 "classname" "target_speaker"
 "origin" "0.000000 1536.000000 736.000000"
-"noise" "sound/map-newtonian-nightmare/nn-Electric-Arcs1_looped.ogg"
+"noise" "sound/map_newtonian-nightmare/nn-Electric-Arcs1_looped.ogg"
 "spawnflags" "1"
 "atten" "3"
 "volume" "0.25"
 "spawnflags" "1"
 "atten" "3"
 "volume" "0.25"
@@ -23663,7 +23663,7 @@ exx/trim-simple03
 {
 "classname" "target_speaker"
 "origin" "4384.000000 0.000000 1632.000000"
 {
 "classname" "target_speaker"
 "origin" "4384.000000 0.000000 1632.000000"
-"noise" "sound/map-newtonian-nightmare/nn-Electric-Arcs1_looped.ogg"
+"noise" "sound/map_newtonian-nightmare/nn-Electric-Arcs1_looped.ogg"
 "spawnflags" "1"
 "atten" "3"
 "volume" "0.25"
 "spawnflags" "1"
 "atten" "3"
 "volume" "0.25"
@@ -23671,7 +23671,7 @@ exx/trim-simple03
 {
 "classname" "target_speaker"
 "origin" "-4384.000000 0.000000 1632.000000"
 {
 "classname" "target_speaker"
 "origin" "-4384.000000 0.000000 1632.000000"
-"noise" "sound/map-newtonian-nightmare/nn-Electric-Arcs1_looped.ogg"
+"noise" "sound/map_newtonian-nightmare/nn-Electric-Arcs1_looped.ogg"
 "spawnflags" "1"
 "atten" "3"
 "volume" "0.25"
 "spawnflags" "1"
 "atten" "3"
 "volume" "0.25"
@@ -23699,7 +23699,7 @@ exx/trim-simple03
 {
 "classname" "target_speaker"
 "origin" "4256.000000 416.000000 264.000000"
 {
 "classname" "target_speaker"
 "origin" "4256.000000 416.000000 264.000000"
-"noise" "sound/map-newtonian-nightmare/nn-robotic_laser.ogg"
+"noise" "sound/map_newtonian-nightmare/nn-robotic_laser.ogg"
 "targetname" "target_speaker3"
 }
 {
 "targetname" "target_speaker3"
 }
 {
@@ -23720,40 +23720,40 @@ exx/trim-simple03
 "classname" "target_speaker"
 "origin" "-4256.000000 -416.000000 264.000000"
 "targetname" "target_speaker4"
 "classname" "target_speaker"
 "origin" "-4256.000000 -416.000000 264.000000"
 "targetname" "target_speaker4"
-"noise" "sound/map-newtonian-nightmare/nn-robotic_laser.ogg"
+"noise" "sound/map_newtonian-nightmare/nn-robotic_laser.ogg"
 "atten" "0.1"
 }
 {
 "classname" "target_speaker"
 "origin" "-736.000000 416.000000 64.000000"
 "atten" "0.1"
 }
 {
 "classname" "target_speaker"
 "origin" "-736.000000 416.000000 64.000000"
-"noise" "sound/map-newtonian-nightmare/nn-robotic_launchpad.ogg"
+"noise" "sound/map_newtonian-nightmare/nn-robotic_launchpad.ogg"
 "atten" "0.1"
 "targetname" "red_speakers"
 }
 {
 "classname" "target_speaker"
 "origin" "736.000000 -416.000000 64.000000"
 "atten" "0.1"
 "targetname" "red_speakers"
 }
 {
 "classname" "target_speaker"
 "origin" "736.000000 -416.000000 64.000000"
-"noise" "sound/map-newtonian-nightmare/nn-robotic_launchpad.ogg"
+"noise" "sound/map_newtonian-nightmare/nn-robotic_launchpad.ogg"
 "atten" "0.1"
 "targetname" "blue_speakers"
 }
 {
 "classname" "target_speaker"
 "origin" "3792.000000 0.000000 264.000000"
 "atten" "0.1"
 "targetname" "blue_speakers"
 }
 {
 "classname" "target_speaker"
 "origin" "3792.000000 0.000000 264.000000"
-"noise" "sound/map-newtonian-nightmare/nn-robotic_laser.ogg"
+"noise" "sound/map_newtonian-nightmare/nn-robotic_laser.ogg"
 "targetname" "target_speaker3"
 }
 {
 "classname" "target_speaker"
 "origin" "0.000000 -384.000000 64.000000"
 "targetname" "target_speaker3"
 }
 {
 "classname" "target_speaker"
 "origin" "0.000000 -384.000000 64.000000"
-"noise" "sound/map-newtonian-nightmare/nn-robotic_launchpad.ogg"
+"noise" "sound/map_newtonian-nightmare/nn-robotic_launchpad.ogg"
 "atten" "0.1"
 "targetname" "blue_speakers"
 }
 {
 "classname" "target_speaker"
 "origin" "0.000000 384.000000 64.000000"
 "atten" "0.1"
 "targetname" "blue_speakers"
 }
 {
 "classname" "target_speaker"
 "origin" "0.000000 384.000000 64.000000"
-"noise" "sound/map-newtonian-nightmare/nn-robotic_launchpad.ogg"
+"noise" "sound/map_newtonian-nightmare/nn-robotic_launchpad.ogg"
 "atten" "0.1"
 "targetname" "red_speakers"
 }
 "atten" "0.1"
 "targetname" "red_speakers"
 }
@@ -23761,7 +23761,7 @@ exx/trim-simple03
 "classname" "target_speaker"
 "origin" "-3792.000000 0.000000 264.000000"
 "targetname" "target_speaker4"
 "classname" "target_speaker"
 "origin" "-3792.000000 0.000000 264.000000"
 "targetname" "target_speaker4"
-"noise" "sound/map-newtonian-nightmare/nn-robotic_laser.ogg"
+"noise" "sound/map_newtonian-nightmare/nn-robotic_laser.ogg"
 "atten" "0.1"
 }
 {
 "atten" "0.1"
 }
 {
diff --git a/sound/map-leave_em_behind/lighthum.ogg b/sound/map-leave_em_behind/lighthum.ogg
deleted file mode 100644 (file)
index f7456d5..0000000
Binary files a/sound/map-leave_em_behind/lighthum.ogg and /dev/null differ
diff --git a/sound/map-leave_em_behind/pumps.ogg b/sound/map-leave_em_behind/pumps.ogg
deleted file mode 100644 (file)
index 85a76a5..0000000
Binary files a/sound/map-leave_em_behind/pumps.ogg and /dev/null differ
diff --git a/sound/map-newtonian-nightmare/nn-Electric-Arcs1_looped.ogg b/sound/map-newtonian-nightmare/nn-Electric-Arcs1_looped.ogg
deleted file mode 100644 (file)
index 573dac1..0000000
Binary files a/sound/map-newtonian-nightmare/nn-Electric-Arcs1_looped.ogg and /dev/null differ
diff --git a/sound/map-newtonian-nightmare/nn-electrified_looped.ogg b/sound/map-newtonian-nightmare/nn-electrified_looped.ogg
deleted file mode 100644 (file)
index 2d474fe..0000000
Binary files a/sound/map-newtonian-nightmare/nn-electrified_looped.ogg and /dev/null differ
diff --git a/sound/map-newtonian-nightmare/nn-robotic_laser.ogg b/sound/map-newtonian-nightmare/nn-robotic_laser.ogg
deleted file mode 100644 (file)
index a6c53f0..0000000
Binary files a/sound/map-newtonian-nightmare/nn-robotic_laser.ogg and /dev/null differ
diff --git a/sound/map-newtonian-nightmare/nn-robotic_launchpad.ogg b/sound/map-newtonian-nightmare/nn-robotic_launchpad.ogg
deleted file mode 100644 (file)
index 7558569..0000000
Binary files a/sound/map-newtonian-nightmare/nn-robotic_launchpad.ogg and /dev/null differ
diff --git a/sound/map_leave_em_behind/lighthum.ogg b/sound/map_leave_em_behind/lighthum.ogg
new file mode 100644 (file)
index 0000000..f7456d5
Binary files /dev/null and b/sound/map_leave_em_behind/lighthum.ogg differ
diff --git a/sound/map_leave_em_behind/pumps.ogg b/sound/map_leave_em_behind/pumps.ogg
new file mode 100644 (file)
index 0000000..85a76a5
Binary files /dev/null and b/sound/map_leave_em_behind/pumps.ogg differ
diff --git a/sound/map_newtonian-nightmare/nn-Electric-Arcs1_looped.ogg b/sound/map_newtonian-nightmare/nn-Electric-Arcs1_looped.ogg
new file mode 100644 (file)
index 0000000..573dac1
Binary files /dev/null and b/sound/map_newtonian-nightmare/nn-Electric-Arcs1_looped.ogg differ
diff --git a/sound/map_newtonian-nightmare/nn-electrified_looped.ogg b/sound/map_newtonian-nightmare/nn-electrified_looped.ogg
new file mode 100644 (file)
index 0000000..2d474fe
Binary files /dev/null and b/sound/map_newtonian-nightmare/nn-electrified_looped.ogg differ
diff --git a/sound/map_newtonian-nightmare/nn-robotic_laser.ogg b/sound/map_newtonian-nightmare/nn-robotic_laser.ogg
new file mode 100644 (file)
index 0000000..a6c53f0
Binary files /dev/null and b/sound/map_newtonian-nightmare/nn-robotic_laser.ogg differ
diff --git a/sound/map_newtonian-nightmare/nn-robotic_launchpad.ogg b/sound/map_newtonian-nightmare/nn-robotic_launchpad.ogg
new file mode 100644 (file)
index 0000000..7558569
Binary files /dev/null and b/sound/map_newtonian-nightmare/nn-robotic_launchpad.ogg differ