Merge in xonotic/xonotic-maps.pk3dir.git: Mirio/runningman
git-manager created issue #1526 on 2013-04-21T22:40:52Z:
Purpose of the branch:
Map cleanup: Updated mapinfo, info_autoscreenshot entities, map picture
Repository: xonotic/xonotic-maps.pk3dir.git Commit: 219e5fdd Branch: Mirio/runningman
Merge commands:
cd data/xonotic-maps.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '219e5fddab443e290ca6deb7b8c1c7e6173c0b14'..'origin/Mirio/runningman'
# 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/runningman'
# 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/runningman'
Diffstat:
maps/runningman.map | 156 +++++++++++++++++++++++--------------------
maps/runningman.map.options | 2 +-
maps/runningman.mapinfo | 5 +-
maps/runningman.tga | Bin 0 -> 660209 bytes
4 files changed, 87 insertions(+), 76 deletions(-)
Revision log:
commit 219e5fddab443e290ca6deb7b8c1c7e6173c0b14
Author: Mirio
Commit: Mirio
Map cleanup, screenshot, mapinfo
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/maps/runningman.map b/maps/runningman.map
index ec1d8d1..b453ea0 100644
— a/maps/runningman.map
**+ b/maps/runningman.map
@ -3856,11 +3856,11
@ trak5x/light-light3a-surfacelight
)
)
~~)
*)
)
)
)
~~)
*)
)
)
)
@ -5599,15 +5599,15
@ patchDef2
trak5x/light-light3a-surfacelight
)
~~)
~~ )
~~)
~~ )
~~)
~~ )
~~)
~~ )
- ) *)
- ) *)
- ) *)
- ) *)
- )
)
}
}
@ -5637,15 +5637,15
@ patchDef2 trak5x/light-light3a-surfacelight ) ~~ ) ~~) *) - ) *) ) ) ) ~~) ~~ ) ~~) *)
- )
*)
)
}
}
@ -5685,11 +5685,11
@ trak5x/light-light3a-surfacelight ) ) ~~) *) ) ) ) ~~) *) ) ) )@ -5717,7 +5717,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@ -6181,15 +6181,15
@ patchDef2 trak5x/light-light3a-surfacelight ) ~~) ~~ ) - ) *)
- ) ) ) ) ~~ ) ~~) ~~ )
- ) *)
- )
)
}
}
@ -7034,8 +7034,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 } { patchDef2@ -7293,8 +7293,8
@ decals/scorch02 common/caulk 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 common/caulk 170.6661682129 341.3299865723 0 0.375 0.375 0 0 0common/caulk 170.6661682129 511.9965820312 90 0.3750.375 0 0 0common/caulk 170.6661682129 511.9965820312 90 0.3750.375 0 0 0 - common/caulk 170.6661682129 511.9965820313 90 0.375~~0.375 0 0 0
- common/caulk 170.6661682129 511.9965820313 90 0.375~~0.375 0 0 0
}
{
decals/scorch01 0 0 90 0.125
0.125 0 0 00.25 134217728 0 0 } {@ -7358,59 +7358,59
@ decals/scorch02 narmorx/base-concrete07 512 512 90 0.25exx/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 257.3299865723 341.3299865723 0 0.375 0.375 0 0 0
common/caulk 170.6661682129 341.3299865723 0 0.375 0.375 0 0 0
common/caulk 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
common/caulk 170.6661682129 511.9965820312 90 0.3750.375 0 0 0 - common/caulk 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 *( 568 704 128 ) ( 552 704 128 ) ( 552 576 128 ) 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.375 ~~0.375 0 0 0 *exx/panel-metalbig04 170.6661682129 511.9965820313 90 0.375 ~~0.375 0 0 0 common/caulk 170.6661682129 341.3299865723 0 0.375 0.375 0 0 0 common/caulk 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 ~~ common/caulk 170.6661682129 511.9965820312 90 0.375 –0.375 0 0 0 - common/caulk 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
common/caulk 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 *( 992 0 128 ) ( 960 0 128 ) ( 960128 128 ) exx/panel-metalbig04 170.6661682129 511.9965820313 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 common/caulk 341.3331604004 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 ~~ common/caulk 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 *common/caulk 170.6661682129 511.9965820313 90 0.375 ~~0.375 0 0 0 } { common/caulk 341.3334960938 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 341.3334960938 341.3299865723 0 0.375 0.375 0 0 0 common/caulk 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.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.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 ~~ common/caulk 170.6661682129 511.9965820312 90 0.375 ~~0.375 0 0 0 *common/caulk 170.6661682129 511.9965820313 90 0.375 ~~0.375 0 0 0 } { exx/panel-metal02 0 0 0 0.25 0.25 0 0 0@ -8154,9 +8154,9
@ effects_jumppad/jumppadfx1_a ) ) ) ~~ ) ~~) ~~ ) - ) *)
- )
)
)
}
@ -8168,13 +8168,13
@ effects_jumppad/jumppadfx1_a ) ~~ ) - ) ) ) ) ) ~~ ) ~~) *)
- )
)
)
}
@ -8994,7 +8994,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@ -9003,10 +9003,10
@ trak5x/base-pipe1a } { 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 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 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
}
{
@ -11147,7 +11147,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 0 ~~0.25 0.25 134217728 0 0 *narmorx/base-concrete05 542.048828125 197.4633789063 00.25 0.25 134217728 0 0 narmorx/base-concrete05 388 0 00.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.25 ~~0.25 134217728 0 0@ -11227,7 +11227,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 0 ~~0.25 0.25 134217728 0 0 *narmorx/base-concrete05 202.048828125 197.4633789063 00.25 0.25 134217728 0 0 narmorx/base-concrete05 48 0 00.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 00.25 0.25 0 0 0 } { ~~exx/floor-grate01 213.3332519531 448.0004882812 90 0.1875 0.25 0 0 0 ~~ common/caulk 213.3332519531 448.0004882812 90 0.1875 0.25 0 0 0 ~~common/caulk 213.3332519531 448.0004882812 90 0.1875 0.25 0 0 0 ~~ common/caulk 213.3332519531 448.0004882812 90 0.1875 0.25 0 0 0 ~~common/caulk 213.3332519531 448.0004882812 90 0.1875 0.25 0 0 0 ~~ common/caulk 213.3332519531 448.0004882812 90 0.1875 0.25 0 0 0@ -11843,12 +11843,12
@ exx/base-metal03 common/caulk 128 0 0 - exx/floor-grate01 213.3332519531 448.0004882813 90 0.1875 0.25 0 0 0 *common/caulk 213.3332519531 448.0004882813 90 0.1875 0.25 0 0 0
- common/caulk 213.3332519531 448.0004882813 90 0.1875 0.25 0 0 0 *common/caulk 213.3332519531 448.0004882813 90 0.1875 0.25 0 0 0
- common/caulk 213.3332519531 448.0004882813 90 0.1875 0.25 0 0 0
*common/caulk 213.3332519531 448.0004882813 90 0.1875 0.25 0 0 0
}
{
exx/trim-horz01 0 160 0 0.25 0.25 0 0 0
@ -11862,7 +11862,7
@ exx/base-metal03 exx/trim-vert01 0 320 0 0.25 0.25 0 0 0 exx/trim-vert01 0 320 0 0.25 0.25 0 0 0 exx/base-metal01 127.9999084473 0.0004882813 90 0.1875 ~~0.25 0 0 0 ~~ common/caulk 127.9999084473 128.0004882812 90 0.1875 0.25 0 0 0 - common/caulk 127.9999084473 128.0004882813 90 0.1875 0.25 0 0 0
exx/base-metal01 0 0 0 0.25 0.25 0 0 0
common/caulk 0 0 0 0.25 0.25 0 0 0
}
@ -12537,9 +12537,9
@ trak5x/misc-glass } { exx/floor-grate01 469.3333129883 0 0 0.1875 0.15625 0 0 0 ~~ common/caulk 127.9999084473 128.0004882812 90 0.1875 0.25 0 0 0 - common/caulk 127.9999084473 128.0004882813 90 0.1875 0.25 0 0 0 common/caulk 213.3332214355 0.0004882813 0 0.1875 0.25 0 0 0 ~~ common/caulk 127.9999084473 128.0004882812 90 0.1875 0.25 0 0 0
- common/caulk 127.9999084473 128.0004882813 90 0.1875 0.25 0 0 0
common/caulk 0 0 0 0.25 0.25 0 0 0
common/caulk 0 0 0 0.25 0.25 0 0 0
}
@ -12547,13 +12547,13
@ trak5x/misc-glass exx/trim-vert01 0 320 0 0.25 0.25 0 0 0 exx/base-metal01 127.9999084473 0.0004882813 90 0.1875~~0.25 0 0 0 exx/trim-vert01 0 320 0 0.25 0.25 0 0 0
- common/caulk 127.9999084473 128.0004882812 90 0.1875 0.25 0 0 0
- common/caulk 127.9999084473 128.0004882813 90 0.1875 0.25 0 0 0
exx/base-metal01 0 0 0 0.25 0.25 0 0 0
common/caulk 0 0 0 0.25 0.25 0 0 0
}
{
exx/trim-vert01 0 384 0 0.25 0.25 0 0 0
~~ common/caulk 127.9999084473 128.0004882812 90 0.1875 0.25 0 0 0
*(
88400 176 ) (88400 160 ) (184400 176 ) common/caulk 127.9999084473 128.0004882813 90 0.1875 0.25 0 0 0 (88320 176 ) (184400 160 ) (88400 160 ) exx/trim-vert01 0 384 0 0.25 0.25 0 0 0 (192320 192 ) (192400 176 ) (192400 160 ) exx/base-metal01 127.9999084473 0.0004882813 90 0.18750.25 0 0 0 exx/base-metal01 0 0 0 0.25 0.25 0 0 00.25 0 0 0 -(@ -12562,7 +12562,7
@ trak5x/misc-glass { exx/trim-vert01 0 384 0 0.25 0.25 0 0 0 exx/base-metal01 127.9999084473 0.0004882813 90 0.187588400 176 ) (88400 160 ) (184400 176 ) common/caulk 127.9999084473 128.0004882812 90 0.1875 0.25 0 0 0 *common/caulk 127.9999084473 128.0004882813 90 0.1875 0.25 0 0 0 exx/trim-vert01 0 384 0 0.25 0.25 0 0 0 exx/base-metal01 0 0 0 0.25 0.25 0 0 0 common/caulk 0 0 0 0.25 0.25 0 0 0@ -16341,12 +16341,22
@ exx/panel-q201 “angle” “90.000000” } { ~~“classname” “info_autoscreenshot” ~~“origin” “~~720.7 174.3 247.9" ~~”angles" “21.8 ~~53.1 0.0" ~~} ~~{ "classname" "item_health_mega" "origin" "776.000000 896.000000 256.000000" "angle" "~~90.000000” } *{ *“classname” “info_autoscreenshot” *“origin” “772.938843 142.32608 253.633636" *"angles" "8.18481445994.742371 –81.471077” *“angles” “8.84399414 134.664917 0” *} diff —git a/maps/runningman.map.options b/maps/runningman.map.options index 8e7f706..db8b365 100644 — a/maps/runningman.map.options *+ b/maps/runningman.map.options39.710083 0" *} *{ *"classname" "info_autoscreenshot" *"origin" "910.84137237.513443 256.951813" *"angles" "13.8592529 136.774292 0" *} *{ *"classname" "info_autoscreenshot" *"origin" "459.253052@ -3,4 +3,4
@ ~~vis + ~~minimap ~~nosRGB ~~Version: 2 *Version: 4 diff —git a/maps/runningman.mapinfo b/maps/runningman.mapinfo index f9e5cd4..c6b2482 100644 — a/maps/runningman.mapinfo **+ b/maps/runningman.mapinfo@ -1,6 +1,6
@ title Running Man ~~description Medium-sized, fast enclosed map. ~~author Paul Evers, FruitieX *description Medium-sized, fast enclosed map *author FruitieX, Cortez, Paul Evers, Debugger cdtrack 6 has weapons gametype dm@ -8,4 +8,5
@ gametype lms gametype arena gametype kh gametype ka +gametype tdm clientsettemp_for_type all r_water 1 diff —git a/maps/runningman.tga b/maps/runningman.tga new file mode 100644 index 0000000..848b966 Binary files /dev/null and b/maps/runningman.tga differ