Merge in xonotic/xonotic-maps.pk3dir.git: Mirio/runningmanctf
git-manager created issue #1525 on 2013-04-21T22:38:49Z:
Purpose of the branch:
Map cleanup: Updated mapinfo, info_autoscreenshot entities, map picture
Repository: xonotic/xonotic-maps.pk3dir.git Commit: 2a7d324b Branch: Mirio/runningmanctf
Merge commands:
cd data/xonotic-maps.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '2a7d324be6836529f4015a48546598bfbc800f85'..'origin/Mirio/runningmanctf'
# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes
git merge --no-ff 'origin/Mirio/runningmanctf'
# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out
git push && git push --delete origin 'Mirio/runningmanctf'
Diffstat:
maps/runningmanctf.map | 256 +++++++++++++++++++++-------------------
maps/runningmanctf.map.options | 2 +-
maps/runningmanctf.mapinfo | 5 +-
maps/runningmanctf.tga | Bin 0 -> 705258 bytes
4 files changed, 137 insertions(+), 126 deletions(-)
Revision log:
commit 2a7d324be6836529f4015a48546598bfbc800f85
Author: Mirio
Commit: Mirio
Map cleanup, mapinfo, screenshot
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/maps/runningmanctf.map b/maps/runningmanctf.map
index aa6abe8..ea5dde6 100644
— a/maps/runningmanctf.map
**+ b/maps/runningmanctf.map
@ -43,9 +43,9
@ trak5x/light-light3a-surfacelight
)
)
)
~~)
~~ )
~~)
*)
- )
*)
)
)
)
@ -60,11 +60,11
@ trak5x/light-light3a-surfacelight ) ) ~~) ~~ ) ~~) ~~ ) ~~) *) - ) *)
- )
*)
)
)
)
@ -4015,11 +4015,11
@ trak5x/light-light3a-surfacelight ) ) ~~) *) ) ) ) ~~) *) ) ) )@ -5906,15 +5906,15
@ patchDef2 trak5x/light-light3a-surfacelight ) ~~) ~~ ) ~~) ~~ ) ~~) ~~ ) ~~) ~~ ) - ) *)
- ) *)
- ) *)
- ) *)
- )
)
}
}
@ -5944,15 +5944,15
@ patchDef2 trak5x/light-light3a-surfacelight ) ~~ ) ~~) *) - ) *) ) ) ) ~~) ~~ ) ~~) *)
- )
*)
)
}
}
@ -5992,11 +5992,11
@ trak5x/light-light3a-surfacelight ) ) ~~) *) ) ) ) ~~) *) ) ) )@ -6024,7 +6024,7
@ trak5x/light-light3a-surfacelight } { common/caulk 0 0 0 0.25 0.25 0 0 0exx/light-u201-surfacelight 232.7270507812 127.9921875 135 0.243067950.0883884504 0 0 0 - exx/light-u201-surfacelight 232.7270507813 127.9921875 135 0.24306795~~0.0883884504 0 0 0
exx/base-metal03 0 0 90 0.25
0.25 0 0 0 common/caulk 0 0 0 0.25 0.25 0 0 0 exx/base-metal03 384 0 00.25 0.25 0 0 0@ -6323,7 +6323,7
@ trak5x/light-light3a-surfacelight } { common/caulk 0 0 0 0.25 0.25 0 0 0exx/trim-psimple05 170.6661682129 170.6665039062 90 0.3750.375 0 0 0 - exx/trim-psimple05 170.6661682129 170.6665039063 90 0.375~~0.375 0 0 0
common/caulk 0 0 0 0.25 0.25 0 0 0
common/caulk 0 0 90 0.25 ~~0.25 0 0 0
common/caulk 0 0 0 0.25 0.25 0 0 0
@ -7311,15 +7311,15
@ patchDef2 trak5x/light-light3a-surfacelight ) ~~ ) ~~) ~~ ) ~~) ~~ ) ~~) ~~ ) ~~) *) - ) *)
- ) *)
- ) *)
- )
*)
)
}
}
@ -7970,15 +7970,15
@ patchDef2 trak5x/light-light3a-surfacelight ) ~~) ~~ ) - ) *)
- ) ) ) ) ~~ ) ~~) ~~ )
- ) *)
- )
)
}
}
@ -8863,8 +8863,8
@ trak5x/light-light3a-surfacelight exx/base-metal01 140.8497619629 457.6714477539 60.2928657532 0.25 0.25 134217728 0 0 exx/base-metal01 0 389.7604980469~~90 0.250.2878294885 134217728 0 0 exx/base-metal01 0 180.791931152390 0.25 0.2878294885 134217728 0 0exx/base-metal01 0 180.791931152390 0.25 0.2878294885 134217728 0 0exx/base-metal01 0 389.760498046990 0.25 ~~0.2878294885 134217728 0 0 *exx/base-metal01 0 180.7919311523 ~~90 0.25 0.2878294885 134217728 0 0 *exx/base-metal01 0 389.760498046990 0.250.2878294885 134217728 0 0 } { exx/panel-metalbig04 469.3330078125 341.3299865723 0 ~~0.375 0.375 134217728 0 0@ -9147,8 +9147,8
@ decals/scorch02 exx/panel-metalbig04 341.3334960938 341.3299865723 0 0.375 0.375 0 0 0 exx/base-metal01 170.6661682129 341.3299865723 0 0.375 0.375 0 0 0 exx/panel-metalbig04 170.6661682129 341.3299865723 0 0.375 0.375 0 0 0 ~~ exx/panel-metalbig04 170.6661682129 511.9965820312 90 0.375 ~~0.375 0 0 0 ~~ exx/panel-metalbig04 170.6661682129 511.9965820312 90 0.375 ~~0.375 0 0 0 *exx/panel-metalbig04 170.6661682129 511.9965820313 90 0.375 ~~0.375 0 0 0 *exx/panel-metalbig04 170.6661682129 511.9965820313 90 0.3750.375 0 0 0 } { decals/scorch01 0 0 90 0.1250.125 0 0 0@ -9212,59 +9212,59
@ decals/scorch02 narmorx/base-concrete07 512 512 90 0.25 ~~0.25 134217728 0 0 } { ~~ exx/panel-metalbig04 170.6661682129 511.9965820312 90 0.375 ~~0.375 0 0 0 *exx/panel-metalbig04 170.6661682129 511.9965820313 90 0.375 ~~0.375 0 0 0 exx/panel-metalbig04 257.3299865723 341.3299865723 0 0.375 0.375 0 0 0 exx/panel-metalbig04 170.6661682129 341.3299865723 0 0.375 0.375 0 0 0 exx/panel-metalbig04 341.3334960938 341.3299865723 0 0.375 0.375 0 0 0 exx/panel-metalbig04 256.0001525879 341.3299865723 0 0.375 0.375 0 0 0 ~~ exx/panel-metalbig04 170.6661682129 511.9965820312 90 0.375 ~~0.375 0 0 0 *exx/panel-metalbig04 170.6661682129 511.9965820313 90 0.375 ~~0.375 0 0 0 } { ~~ exx/panel-metalbig04 170.6661682129 511.9965820312 90 0.375 ~~0.375 0 0 0 *exx/panel-metalbig04 170.6661682129 511.9965820313 90 0.3750.375 0 0 0 exx/panel-metalbig04 170.6661682129 341.3299865723 0 0.375 0.375 0 0 0 exx/panel-metalbig04 341.3334960938 341.3299865723 0 0.375 0.375 0 0 0 exx/panel-metalbig04 0.0008544922 341.3299865723 00.375 0.375 0 0 0exx/panel-metalbig04 170.6661682129 511.9965820312 90 0.3750.375 0 0 0 - exx/panel-metalbig04 170.6661682129 511.9965820313 90 0.375~~0.375 0 0 0
}
{
exx/panel-metalbig04 170.6661682129 511.9965820312 90 0.3750.375 0 0 0 - exx/panel-metalbig04 170.6661682129 511.9965820313 90 0.375~~0.375 0 0 0
exx/panel-metalbig04 170.6661682129 341.3299865723 0 0.375 0.375 0 0 0
exx/panel-metalbig04 341.3334960938 341.3299865723 0 0.375 0.375 0 0 0
exx/panel-metalbig04 254.6699981689 341.3299865723 0 0.375 0.375 0 0 0
exx/panel-metalbig04 341.3334960938 341.3299865723 0 0.375 0.375 0 0 0
exx/panel-metalbig04 170.6661682129 511.9965820312 90 0.3750.375 0 0 0 - exx/panel-metalbig04 170.6661682129 511.9965820313 90 0.375~~0.375 0 0 0
}
{
exx/panel-metalbig04 341.3334960938 341.3299865723 0 0.375 0.375 0 0 0
exx/panel-metalbig04 170.6661682129 341.3299865723 0 0.375 0.375 0 0 0
exx/panel-metalbig04 170.6661682129 341.3299865723 0 0.375 0.375 0 0 0
exx/panel-metalbig04 341.3334960938 341.3299865723 0 0.375 0.375 0 0 0
exx/panel-metalbig04 170.6661682129 511.9965820312 90 0.3750.375 0 0 0exx/panel-metalbig04 170.6661682129 511.9965820312 90 0.3750.375 0 0 0 - exx/panel-metalbig04 170.6661682129 511.9965820313 90 0.375~~0.375 0 0 0
- exx/panel-metalbig04 170.6661682129 511.9965820313 90 0.375~~0.375 0 0 0
}
{
exx/panel-metalbig04 341.3334960938 341.3299865723 0 0.375 0.375 0 0 0
exx/panel-metalbig04 170.6661682129 341.3299865723 0 0.375 0.375 0 0 0
exx/panel-metalbig04 170.6661682129 341.3299865723 0 0.375 0.375 0 0 0
exx/panel-metalbig04 341.3331604004 341.3299865723 0 0.375 0.375 0 0 0
exx/panel-metalbig04 170.6661682129 511.9965820312 90 0.3750.375 0 0 0exx/panel-metalbig04 170.6661682129 511.9965820312 90 0.3750.375 0 0 0 - exx/panel-metalbig04 170.6661682129 511.9965820313 90 0.375~~0.375 0 0 0
- exx/panel-metalbig04 170.6661682129 511.9965820313 90 0.375~~0.375 0 0 0
}
{
exx/panel-metalbig04 341.3334960938 341.3299865723 0 0.375 0.375 0 0 0
exx/panel-metalbig04 170.6661682129 511.9965820312 90 0.3750.375 0 0 0 - exx/panel-metalbig04 170.6661682129 511.9965820313 90 0.375~~0.375 0 0 0
exx/panel-metalbig04 341.3334960938 341.3299865723 0 0.375 0.375 0 0 0
exx/panel-metalbig04 170.6661682129 341.3299865723 0 0.375 0.375 0 0 0
exx/panel-metalbig04 170.6661682129 341.3299865723 0 0.375 0.375 0 0 0
exx/panel-metalbig04 170.6661682129 511.9965820312 90 0.3750.375 0 0 0 - exx/panel-metalbig04 170.6661682129 511.9965820313 90 0.375~~0.375 0 0 0
}
{
exx/panel-metalbig04 170.6661682129 511.9965820312 90 0.3750.375 0 0 0 - exx/panel-metalbig04 170.6661682129 511.9965820313 90 0.375~~0.375 0 0 0
exx/panel-metalbig04 341.3299865723 341.3299865723 0 0.375 0.375 0 0 0
exx/panel-metalbig04 170.6661682129 341.3299865723 0 0.375 0.375 0 0 0
exx/panel-metalbig04 170.6661682129 341.3299865723 0 0.375 0.375 0 0 0
exx/panel-metalbig04 341.3334960938 341.3299865723 0 0.375 0.375 0 0 0
exx/panel-metalbig04 170.6661682129 511.9965820312 90 0.3750.375 0 0 0 - exx/panel-metalbig04 170.6661682129 511.9965820313 90 0.375~~0.375 0 0 0
}
{
common/caulk 0 0 0 ~~0.25 0.25 0 0 0
@ -10275,9 +10275,9
@ effects_jumppad/jumppadfx1_a ) ) ) ~~ ) ~~) ~~ ) *( (486.5321044922112.9086914063164.0808410645 1.8751 ) (497.8034667969104.1304931641192.7147369385 1.8750.5 ) (509.07479858495.3522949219 ~~221.3486328125 1.875 0 ) ) *) - )
)
)
}
@ -10289,13 +10289,13
@ effects_jumppad/jumppadfx1_a ) ~~( (513.4678955078384.9086914062 ~~199.919128418 0.375 0 ) ) *) ) ) ) ) ~~) ~~ ) - )
*)
)
)
}
@ -11321,7 +11321,7
@ trak5x/base-pipe1a narmorx/base-concrete05_blue 512 512 90 0.25 ~~0.25 0 0 0 } { ~~ common/weapclip 206.646194458 171.4292297363 1.0000002384 0.2500000298 0.2500000298 134217728 0 0 - common/weapclip 206.646194458 171.4292297363 1.0000002384 0.2500000298 0.2500000298 134217728 0 0
common/weapclip 72.3150634766 0 0 0.2549646497 0.25 134217728 0 0
common/weapclip 69.1982727051 0 0 0.2549646497 0.25 134217728 0 0
common/weapclip 247.8369293213 122.7140808105~~7.0000004768 0.2500000298 0.2500000298 134217728 0 0
@ -11330,10 +11330,10
@ trak5x/base-pipe1a } { ( 239.2963867188 200.6921386719 70 ) ( 240.6926269531 120.7041015625 70 ) ( 159.30859375 199.2958984375 70 ) common/weapclip 206.646194458 171.4292297363 1.0000002384 0.2500000298 0.2500000298 134217728 0 0 ~~common/weapclip 72.3150634766 0 0 0.2549646497 0.25 134217728 0 0 *common/weapclip 72.3150634766 0 0 0.2549646497 0.25 134217728 0 0 common/weapclip 69.1982727051 0 0 0.2549646497 0.25 134217728 0 0common/weapclip 247.8369293213 122.71408081057.0000004768 0.2500000298 0.2500000298 134217728 0 0 ~~common/weapclip 72.3150634766 0 0 0.2549646497 0.25 134217728 0 0 *common/weapclip 247.8369293213 122.7140808105 ~~7.0000004768 0.2500000298 0.2500000298 134217728 0 0 *common/weapclip 72.3150634766 0 0 0.2549646497 0.25 134217728 0 0 common/weapclip 69.1982727051 0 0 0.2549646497 0.25 134217728 0 0 } {@ -17060,11 +17060,11
@ trak5x/light-light3a-surfacelight ) ) ~~) *) ) ) ) ~~) *) ) ) )@ -18961,9 +18961,9
@ trak5x/light-light3a-surfacelight ) ) ) ~~) ~~ ) ~~) *) - )
*)
)
)
)
@ -18996,15 +18996,15
@ patchDef2 trak5x/light-light3a-surfacelight ) ~~) ~~ ) ~~) ~~ ) ~~) ~~ ) ~~) ~~ ) - ) *)
- ) *)
- ) *)
- ) *)
- )
)
}
}
@ -19044,11 +19044,11
@ trak5x/light-light3a-surfacelight ) ) ~~ ) - ) ) ) ) ~~ )
- )
)
)
)
@ -20387,15 +20387,15
@ patchDef2 trak5x/light-light3a-surfacelight ) ~~ ) ~~) ~~ ) ~~) ~~ ) ~~) ~~ ) ~~) *) - ) *)
- ) *)
- ) *)
- )
*)
)
}
}
@ -21049,9 +21049,9
@ trak5x/light-light3a-surfacelight ) ) ) ~~) ~~ ) ~~) *) - )
*)
)
)
)
@ -21894,12 +21894,12
@ trak5x/light-light3a-surfacelight common/caulk 0 0 0 0.25 0.25 0 0 0 } {exx/panel-metalbig04 213.0387878418 395.9815979004 29.7071380615 0.3750.375 134217728 0 0 - exx/panel-metalbig04 213.0387878418 395.9815979004 29.7071380615 0.375~~0.375 134217728 0 0
exx/base-metal01 63.5577392578 81.9778060913 29.7071380615 0.25 ~~0.25 134217728 0 0
~~ exx/base-metal01 0 240.5600891113
90 0.250.2878294885 134217728 0 0 - exx/base-metal01 0 240.5600891113~~90 0.25
0.2878294885 134217728 0 0 exx/base-metal01 0 31.591339111390 0.25 0.2878294885 134217728 0 0 exx/base-metal01 0 31.5913391113 ~~90 0.25 0.2878294885 134217728 0 0 ~~ exx/base-metal01 0 240.560089111390 0.250.2878294885 134217728 0 0 - exx/base-metal01 0 240.5600891113~~90 0.25 ~~0.2878294885 134217728 0 0
}
{
patchDef2
@ -23240,13 +23240,13
@ effects_jumppad/jumppadfx1_b ) ~~ ) ~~) ~~ ) - ) *)
- ) ) ~~ )
- )
)
~~( (
1732.9614257812 1121.0386962891199.9191131592 2.625 0 ) (1741.7395019531 1132.3100585938171.2852325439 2.625 –0.5 ) (1750.5177001953 1143.5812988281142.6513214111 2.625 –1 ) ) *) ) ) }@ -23258,12 +23258,12
@ effects_jumppad/jumppadfx1_b ) ~~) ~~ ) ~~) *) - )
*)
)
)
~~)
*)
)
)
)
@ -24288,14 +24288,14
@ trak5x/base-pipe1a } { common/weapclip 67.82371521 56.2803955078 89 0.2500000298 ~~0.2500000298 134217728 0 0 ~~ common/weapclip 201.9203186035 0 0 0.2549646497 0.25 134217728 0 0 - common/weapclip 201.9203186035 0 0 0.2549646497 0.25 134217728 0 0
common/weapclip 195.5931396484 0 0 0.2549646497 0.25 134217728 0 0
~~ common/weapclip 254.2882385254 215.4901428223 97 0.2500000298 ~~0.2500000298 134217728 0 0
*common/weapclip 254.2882385254 215.4901428223 97 0.2500000298 ~~0.2500000298 134217728 0 0
common/weapclip 201.9203186035 0 0 0.2549646497 0.25 134217728 0 0
common/weapclip 195.5931396484 0 0 0.2549646497 0.25 134217728 0 0
}
{
~~ common/weapclip 67.82371521 56.2803955078 89 0.2500000298 ~~0.2500000298 134217728 0 0
*common/weapclip 67.82371521 56.2803955078 89 0.2500000298
0.2500000298 134217728 0 0 common/weapclip 198.7098388672 0 0 0.2549646497 0.25 134217728 0 0 common/weapclip 198.8033752441 0 0 0.2549646497 0.25 134217728 0 0 common/weapclip 254.2882385254 215.4901428223 97 0.25000002980.2500000298 134217728 0 0@ -26154,7 +26154,7
@ trak5x/base-pipe1b } { common/weapclip 67.82371521 56.2803955078 89 0.2500000298 ~~0.2500000298 134217728 0 0 ~~ common/weapclip 198.7098388672 0 0 0.2549646497 0.25 134217728 0 0 - common/weapclip 198.7098388672 0 0 0.2549646497 0.25 134217728 0 0
common/weapclip 198.8033752441 0 0 0.2549646497 0.25 134217728 0 0
common/weapclip 254.2882385254 215.4901428223 97 0.2500000298~~0.2500000298 134217728 0 0
common/weapclip 198.7098388672 0 0 0.2549646497 0.25 134217728 0 0
@ -27178,7 +27178,7
@ exx/floor-wrn01-blue narmorx/base-concrete05 512 0 0 0.25 0.25 134217728 0 0 } {narmorx/base-concrete05 542.048828125 197.4633789062 00.25 0.25 134217728 0 0 - narmorx/base-concrete05 542.048828125 197.4633789063 0~~0.25 0.25 134217728 0 0
narmorx/base-concrete05 388 0 0
0.25 0.25 134217728 0 0 narmorx/base-concrete05 260 0 0 0.25 0.25 134217728 0 0 narmorx/base-concrete05 564 884 90 0.250.25 134217728 0 0@ -27258,7 +27258,7
@ exx/floor-wrn01-blue narmorx/base-concrete05_blue 712 0 0 0.25 0.25 134217728 0 0 } {narmorx/base-concrete05 202.048828125 197.4633789062 00.25 0.25 134217728 0 0 - narmorx/base-concrete05 202.048828125 197.4633789063 0~~0.25 0.25 134217728 0 0
narmorx/base-concrete05 48 0 0
0.25 0.25 134217728 0 0 narmorx/base-concrete05 600 0 0 0.25 0.25 134217728 0 0 narmorx/base-concrete05 904 200 90 0.250.25 134217728 0 0@ -36476,11 +36476,6
@ effects_healpod/healpod1_d “origin” “2200.000000536.000000 128.000000” } { ~~“classname” “info_autoscreenshot” ~~“origin” “~~2047.183960 1567.862915 552.647461" ~~”angles" “27.764854 42.006069 0” ~~} ~~{ “classname” “onslaught_generator” “origin” “784.000000 984.000000 264.000000” “team” “14”@ -36510,3 +36505,18
@ effects_healpod/healpod1_d “origin” “~~680.000000 2448.000000 312.000000" "angle" "~~179.999985” } *{ *“classname” “info_autoscreenshot” *“origin” “2149.44165 1120.17798 151.049408" *"angles" "8.84399414 56.6894531 0" *} *{ *"classname" "info_autoscreenshot" *"origin" "851.75 –140.53656” *“angles” "0.52734375 ~~149.002075 0" *} diff —git a/maps/runningmanctf.map.options b/maps/runningmanctf.map.options index 8cfc971..862807c 100644 — a/maps/runningmanctf.map.options *+ b/maps/runningmanctf.map.options329.044281 695.326721170.110733" *"angles" "4.22424316 140.377808 0" *} *{ *"classname" "info_autoscreenshot" *"origin" "477.651245@ -3,4 +3,4
@ ~~vis + ~~minimap ~~nosRGB ~~Version: 5 *Version: 7 diff —git a/maps/runningmanctf.mapinfo b/maps/runningmanctf.mapinfo index ecddc47..c98eb52 100644 — a/maps/runningmanctf.mapinfo **+ b/maps/runningmanctf.mapinfo@ -1,11 +1,12
@ title Running Man CTF description Medium-sized, fast enclosed map supporting multiple gamemodes. -author Paul Evers, FruitieX *author FruitieX, Cortez, Paul Evers, Debugger cdtrack 6 has weapons gametype ctf gametype ca gametype ons gametype dom ~~gametype freezetag *gametype ft +gametype kh clientsettemp_for_type all r_water 1 diff —git a/maps/runningmanctf.tga b/maps/runningmanctf.tga new file mode 100644 index 0000000..30021d8 Binary files /dev/null and b/maps/runningmanctf.tga differ