Merge in xonotic/xonotic-maps.pk3dir.git: Mirio/leave_em_behind
git-manager created issue #1527 on 2013-04-21T22:42:41Z:
Purpose of the branch:
Map cleanup: Updated mapinfo, info_autoscreenshot entities, map picture
Repository: xonotic/xonotic-maps.pk3dir.git Commit: 396b37d9 Branch: Mirio/leave_em_behind
Merge commands:
cd data/xonotic-maps.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '396b37d970c038a221ef6a889fa79e6e2c8ef353'..'origin/Mirio/leave_em_behind'
# 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/leave_em_behind'
# 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/leave_em_behind'
Diffstat:
maps/leave_em_behind.map | 99 ++++++++++++++++++++++----------------
maps/leave_em_behind.map.options | 2 +-
maps/leave_em_behind.mapinfo | 5 +-
maps/leave_em_behind.tga | Bin 0 -> 747183 bytes
4 files changed, 61 insertions(+), 45 deletions(-)
Revision log:
commit 396b37d970c038a221ef6a889fa79e6e2c8ef353
Author: Mirio
Commit: Mirio
Map cleanup, mapinfo, screenshot
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/maps/leave_em_behind.map b/maps/leave_em_behind.map
index 1fa55a0..8012a6e 100644
— a/maps/leave_em_behind.map
**+ b/maps/leave_em_behind.map
@ -280,7 +280,7
@
common/caulk 0 0 0 0.5 0.5 0 0 0
}
{
~~exx/wall-bplate06 170.6665039062 146.2857666016 0 0.1875 0.4374999702 0 0 0
*exx/wall-bplate06 170.6665039063 146.2857666016 0 0.1875 0.4374999702 0 0 0
common/caulk 0 0 0 ~~0.5 0.5 0 0 0
common/caulk 0 0 0 0.5 0.5 0 0 0
common/caulk 0 0 0 0.5 0.5 0 0 0
@ -418,7 +418,7
@
common/caulk 0 0 0 0.5 0.5 0 0 0
}
{
~~ exx/wall-bplate06 170.6665039062 146.2857666016 0 0.1875 0.4374999702 0 0 0
- exx/wall-bplate06 170.6665039063 146.2857666016 0 0.1875 0.4374999702 0 0 0
common/caulk 0 0 0 0.5 0.5 0 0 0
common/caulk 0 0 0 0.5 0.5 0 0 0
common/caulk 0 0 0 0.5 0.5 0 0 0
@ -494,7 +494,7
@ common/caulk 0 64 0 0.5 0.5 0 0 0 } { ~~ exx/wall-metalb01 409.6000976562 146.2857055664 0 0.3125 0.4374999702 0 0 0 *(1536608 288 ) (1536448 288 ) (1536448 64 ) exx/wall-metalb01 409.6000976563 146.2857055664 0 0.3125 0.4374999702 0 0 0 (1536608 64 ) (1536448 64 ) (1568448 64 ) common/caulk 0 0 0 0.5 0.5 0 0 0 (1536608 288 ) (1568448 288 ) (1536448 288 ) exx/floor-clang01 512 0 180 0.25 0.25 0 0 0 (1568448 64 ) (1536448 288 ) (1568448 288 ) common/caulk 0 0 0 0.5 0.5 0 0 0@ -1334,7 +1334,7
@ trak5x/base-pipe1d } { ( 208 ~~208 576 ) common/caulk 64.8041229248 255.1960144043 90 0.2500000298 0.2500000298 134217728 0 0 ~~( 208208 576 ) exx/wall-metalb01 256.0000305176 170.6665039062135 0.265165031 0.1325825155 134217728 0 0 *exx/wall-metalb01 256.0000305176 170.6665039063 ~~135 0.265165031 0.1325825155 134217728 0 0 common/caulk 0 0 0 0.25 0.25 134217728 0 0 common/caulk 0 0 0 0.25 0.25 134217728 0 0 }@ -1350,14 +1350,14
@ trak5x/base-pipe1d common/caulk 0 0 0 0.25 0.25 134217728 0 0 common/caulk 0 0 0 0.25 0.25 134217728 0 0 common/caulk 0 0 0 0.25 0.25 134217728 0 0 ~~ exx/wall-metalb01 469.3333740234 170.6665039062 90 0.375 0.1875 134217728 0 0 *( 928 64 640 ) ( 1024 64 576 ) ( 92864 640 ) exx/wall-metalb01 469.3333740234 170.6665039063 90 0.375 0.1875 134217728 0 0 } { common/caulk 0 0 0 0.25 0.25 134217728 0 0 common/caulk 00 0 0.25 0.25 134217728 0 0 ( 928 ~~816 576 ) common/caulk 0 0 0 0.25 0.25 134217728 0 0 common/caulk 0 0 0 0.25 0.25 134217728 0 0 ~~( 928 ~~192 640 ) exx/wall-metalb01 128 170.6665039062 90 0.375 0.1875 134217728 0 0 *exx/wall-metalb01 128 170.6665039063 90 0.375 0.1875 134217728 0 0 } { common/caulk 0 0 0 ~~0.25 0.25 134217728 0 0@ -1861,7 +1861,7
@ trak5x/base-pipe1d common/caulk 0 96 180 0.25 0.25 0 0 0 } { ~~ exx/floor-tile03 216.6665039062 213.3333129883 180 0.1860000044 0.3100000024 0 0 0 - exx/floor-tile03 216.6665039063 213.3333129883 180 0.1860000044 0.3100000024 0 0 0
common/caulk 128 224 0~~0.25 0.25 0 0 0
( 960
1432 344 ) common/caulk 0 96 180 0.25 0.25 0 0 0 exx/trim-horz01 128 96 180 0.25 0.25 0 0 00 0.375 0.1875 134217728 0 0 } {@ -5095,7 +5095,7
@ trak5x/base-pipe1d exx/wall-metalb01 131.3334350586 511.9993286133common/caulk 64.8040771484 191.19580078120 0.2500000298 ~~0.2500000298 134217728 0 0 *common/caulk 64.8040771484 191.19580078130 0.25000002980.2500000298 134217728 0 0 common/caulk 41.5676879883 0 0 0.5000000596 0.25 134217728 0 0 common/caulk 27.5677490234 0 00.5000000596 0.25 134217728 0 0 exx/wall-metalb01 0.0002441406 341.332885742290 0.375 ~~0.1875 134217728 0 0@ -6186,18 +6186,18
@ trak5x/base-pipe1a } { exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 ~~ exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 ~~common/caulk 144 89.4105224609 90 0.5 0.5392673612 134217728 0 0 ~~ common/caulk 78.7290802002 112 0 0.5392673612 0.5 134217728 0 0common/caulk 90.6157684326 113.385345459 21.9999980927 0.50.5 134217728 0 0 - exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 *common/caulk 144 89.4105224609 90 0.5 0.5392673612 134217728 0 0
- common/caulk 78.7290802002 112 0 0.5392673612 0.5 134217728 0 0 *common/caulk 90.6157684326 113.385345459 21.9999980927 0.5 ~~0.5 134217728 0 0 common/caulk 144 89.4105224609 90 0.5 0.5392673612 134217728 0 0 } { common/caulk 66.5418395996 224 180 0.2696336806 0.25 134217728 0 0 ~~ common/caulk 106.768447876 98.770690918 ~~158 0.25 0.25 134217728 0 0 ~~ exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 ~~exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 ~~ exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0
- common/caulk 106.768447876 98.770690918~~158 0.25 0.25 134217728 0 0
*exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0
*( 578.5297851563 ~~1104.3889465332 328 ) exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0
*exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0
exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0
}
{
@ -6218,11 +6218,11
@ trak5x/base-pipe1a } { exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 ~~exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 *exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0 common/caulk 144 89.4105224609 90 0.5 0.5392673612 134217728 0 0 ~~common/caulk 46.7290802002 112 0 0.5392673612 0.5 134217728 0 0 ~~ common/caulk 58.6157684326 113.385345459 21.9999980927 0.5 ~~0.5 134217728 0 0 ~~ common/caulk 144 89.4105224609 90 0.5 0.5392673612 134217728 0 0 - common/caulk 46.7290802002 112 0 0.5392673612 0.5 134217728 0 0
*common/caulk 58.6157684326 113.385345459 21.9999980927 0.5 ~~0.5 134217728 0 0
*common/caulk 144 89.4105224609 90 0.5 0.5392673612 134217728 0 0
}
{
exx/base-metal04 144 89.4105224609 90 0.25 0.25 134217728 0 0
@ -6405,20 +6405,20
@ trak5x/base-pipe1a common/caulk 0 0 0 0.25 0.25 134217728 0 0 } {common/caulk 64.8041992188 255.195800781290 0.2500000298 0.2500000298 134217728 0 0 - common/caulk 64.8041992188 255.1958007813~~90 0.2500000298 0.2500000298 134217728 0 0
exx/wall-metalb01 255.9999389648 170.6667480469 45 0.265165031 0.1325825155 134217728 0 0
common/caulk 0 0 0
0.25 0.25 134217728 0 0 common/caulk0 0 0 ~~0.25 0.25 134217728 0 0 } { ~~ common/caulk 64.8041992188 255.1958007812 ~~90 0.2500000298 0.2500000298 134217728 0 0 *common/caulk 64.8041992188 255.195800781390 0.2500000298 0.2500000298 134217728 0 0 common/caulk 41.5678710938 0 00.5000000596 0.25 134217728 0 0 common/caulk 123.5673828125 0 0 0.5000000596 0.25 134217728 0 0 exx/wall-metalb01 469.3336486816 341.33364868160 0.375 0.1875 134217728 0 0 common/caulk 0 0 00.25 0.25 134217728 0 0 } {common/caulk 61.8036499023 255.195800781290 0.2500000298 ~~0.2500000298 134217728 0 0 *common/caulk 61.8036499023 255.195800781390 0.25000002980.2500000298 134217728 0 0 common/caulk 38.5670776367 0 00.5000000596 0.25 134217728 0 0 common/caulk 120.5678710938 0 00.5000000596 0.25 134217728 0 0 exx/wall-metalb01 466.3338623047 170.6658935547 00.375 0.1875 134217728 0 00.25 0.25 134217728 0 0 } { ~~common/caulk 189.8045654297 255.1958007812 90 0.2500000298 0.2500000298 134217728 0 0 *common/caulk 189.8045654297 255.1958007813 90 0.2500000298 0.2500000298 134217728 0 0 exx/wall-metalb01 167.6665649414 341.3331298828 ~~135 0.265165031 0.1325825155 134217728 0 0 common/caulk 125 0 0 0.25 0.25 134217728 0 0 common/caulk 253 0 0 0.25 0.25 134217728 0 0 } { ~~ common/caulk 189.8045654297 255.1958007812 90 0.2500000298 0.2500000298 134217728 0 0@ -6445,13 +6445,13
@ trak5x/base-pipe1a common/caulk 253 0 0 - common/caulk 189.8045654297 255.1958007813 90 0.2500000298 0.2500000298 134217728 0 0
common/caulk 230.5680541992 0 0 0.5000000596 0.25 134217728 0 0
common/caulk 120.5673828125 0 0~~0.5000000596 0.25 134217728 0 0
exx/wall-metalb01 466.3336791992 0.0003662109 180 0.375 0.1875 134217728 0 0
@ -8647,7 +8647,7
@ effects_jumppad/jumppadfx1_c exx/wall-metalb01 384.0001220703 0.0004882812 0 0.375 ~~0.1875 134217728 0 0 } { ~~ common/caulk 61.8040771484 255.195800781290 0.25000002980.2500000298 134217728 0 0 - common/caulk 61.8040771484 255.1958007813~~90 0.2500000298
0.2500000298 134217728 0 0 common/caulk 38.5673217773 0 00.5000000596 0.25 134217728 0 0 common/caulk 120.5678710938 0 00.5000000596 0.25 134217728 0 0 exx/wall-metalb01 466.3338623047 170.6657714844 00.375 0.1875 134217728 0 0@ -10239,7 +10239,7
@ exx/trim-simple01 } { common/caulk 96 1300 0.50.5 0 0 0exx/light-panel01-surfacelight 72.0004882812 387.99984741210 0.3100000024 0.2800000012 0 0 0 - exx/light-panel01-surfacelight 72.0004882813 387.9998474121~~0 0.3100000024 0.2800000012 0 0 0
common/caulk 96 130
0 0.50.5 0 0 0 common/caulk 66 160 0.50.5 0 0 0 common/caulk 16 1690 0.50.5 0 0 0@ -11214,7 +11214,7
@ exx/trim-simple01 exx/trim-vert01 0 475.4280395508 90 0.125 ~~0.1093749925 134217728 0 0 } { ~~ exx/trim-horz01 391.5297851562 31.9995727539 135 0.0939126164 0.0883883536 134217728 0 0 - exx/trim-horz01 391.5297851563 31.9995727539 135 0.0939126164 0.0883883536 134217728 0 0
exx/panel-q201b 0 341.3334960938 0 0.125 0.1875 134217728 0 0
exx/trim-simple01 64 0 0~~0.25 0.25 134217728 0 0
exx/trim-horz01 0 32 90 0.0625 0.125 134217728 0 0
@ -11276,7 +11276,7
@ exx/trim-simple01 exx/trim-vert01 0 255.9993286133 90 0.125 ~~0.1093749925 134217728 0 0 } { ~~ exx/trim-horz01 391.5297851562 31.9995727539 135 0.0939126164 0.0883883536 134217728 0 0 - exx/trim-horz01 391.5297851563 31.9995727539 135 0.0939126164 0.0883883536 134217728 0 0
exx/panel-q201b 0 341.3334960938 0 0.125 0.1875 134217728 0 0
exx/trim-simple01 64 0 0~~0.25 0.25 134217728 0 0
(
460 1292 596 ) exx/trim-horz01 0 32 90 0.0625 0.125 134217728 0 00.1093749925 134217728 0 0 } { ~~exx/trim-horz01 391.5297851562 31.9985961914 135 0.0939126164 0.0883883536 134217728 0 0 *exx/trim-horz01 391.5297851563 31.9985961914 135 0.0939126164 0.0883883536 134217728 0 0 exx/panel-q201b 0 341.3334960938 0 0.125 0.1875 134217728 0 0 exx/trim-simple01 128 0 0@ -12439,7 +12439,7
@ exx/trim-simple01 exx/trim-vert01 0 36.5709228516 90 0.1250.25 0.25 134217728 0 0 exx/trim-horz01 0 0 90 0.0625 0.125 134217728 0 00.125 0.1093749925 134217728 0 0 common/caulk 160 192 0 ~~0.25 0.25 134217728 0 0 ~~ exx/trim-vert01 32 256.0004882812 90 0.125 0.1093749925 134217728 0 0@ -14104,7 +14104,7
@ exx/trim-psimple04 exx/trim-simple01 192 0 0 0.25 0.25 134217728 0 0 exx/trim-vert01 0 256 0 - exx/trim-vert01 32 256.0004882813 90 0.125 0.1093749925 134217728 0 0
}
{
exx/trim-horz01 180.7058105469 31.9987792969 45 0.0939126164~~0.0883883536 134217728 0 0
@ -14257,7 +14257,7
@ exx/trim-psimple04 (128880 640 ) (128816 384 ) (128880 384 ) exx/trim-simple01 192 0 0 0.25 0.25 134217728 0 0 (108592 596 ) (140592 564 ) (108720 596 ) exx/trim-vert01 0 182.857421875 00.125 0.1093749925 134217728 0 0 common/caulk 160 192 00.25 0.25 134217728 0 0 ~~exx/trim-vert01 32 329.1430664062 90 0.125 0.1093749925 134217728 0 0 *exx/trim-vert01 32 329.1430664063 90 0.125 0.1093749925 134217728 0 0 } { exx/trim-horz01 180.7058105469 31.9987792969 45 0.0939126164 ~~0.0883883536 134217728 0 0@ -14420,7 +14420,7
@ exx/trim-psimple04 { “classname” “func_group” { ~~ exx/trim-horz01 391.5297851562 31.9995727539 135 0.0939126164 0.0883883536 134217728 0 0 - exx/trim-horz01 391.5297851563 31.9995727539 135 0.0939126164 0.0883883536 134217728 0 0
exx/panel-q201b 0 341.3334960938 0 0.125 0.1875 134217728 0 0
exx/trim-simple01 64 0 0~~0.25 0.25 134217728 0 0
(
204 1292 596 ) exx/trim-horz01 0 32 90 0.0625 0.125 134217728 0 00 341.3334960938 0 ~~0.125 0.1875 134217728 0 0 ~~( 620@ -15317,7 +15317,7
@ exx/panel-q201 } { exx/panel-q201b1308 392 ) exx/trim-horz01 120.470703125 31.9985351562135 0.0939126164 ~~0.0883883536 134217728 0 0 *exx/trim-horz01 120.470703125 31.9985351563135 0.09391261640.0883883536 134217728 0 0 exx/trim-simple01 64 0 0 0.25 0.25 134217728 0 0 exx/trim-horz010 3290 0.0625 0.125 134217728 0 0 common/caulk 192 3290 0.25 0.25 134217728 0 00.125 0.1875 134217728 0 0@ -15379,7 +15379,7
@ exx/panel-q201 } { exx/panel-q201b 0 341.3334960938 0exx/trim-horz01 120.470703125 31.9985351562135 0.0939126164 ~~0.0883883536 134217728 0 0 *exx/trim-horz01 120.470703125 31.9985351563135 0.09391261640.0883883536 134217728 0 0 exx/trim-simple01 64 0 0 0.25 0.25 134217728 0 0 exx/trim-horz01 0090 0.0625 0.125 134217728 0 0 common/caulk 192 32 ~~90 0.25 0.25 134217728 0 0@ -15601,14 +15601,14
@ exx/panel-q201 common/caulk 0 85.3334960938 0 0.125 0.1875 134217728 0 0 common/caulk 0 106.6668395996 0 0.125 0.1875 134217728 0 0 common/caulk 64 0 0 0.25 0.25 134217728 0 0 ~~ exx/trim-vert01 0 402.2856445312 0 0.125 0.1093749925 134217728 0 0 ~~exx/trim-vert01 0 402.2856445312 0 0.125 0.1093749925 134217728 0 0 *exx/trim-vert01 0 402.2856445313 0 0.125 0.1093749925 134217728 0 0 - exx/trim-vert01 0 402.2856445313 0 0.125 0.1093749925 134217728 0 0 } { common/nodraw 0 85.3334960938 0 0.125 0.1875 134217728 0 0 common/nodraw 0 106.6668395996 0 0.125 0.1875 134217728 0 0 common/nodraw 192 112 0 0.25 0.25 134217728 0 0 ~~ exx/floor-grate01 85.33203125 402.2856445312 0 0.046875 0.1093749925 134217728 0 0
- exx/floor-grate01 85.33203125 402.2856445313 0 0.046875 0.1093749925 134217728 0 0
common/nodraw 16 192 0 0.25 0.25 134217728 0 0
common/nodraw 0 192 0 0.25 0.25 134217728 0 0
}
@ -15624,7 +15624,7
@ exx/panel-q201 common/caulk 32 106.6668395996 0 0.125 0.1875 134217728 0 0 common/caulk 32 128.0001831055 0 0.125 0.1875 134217728 0 0 exx/trim-simple01 192 0 0 0.25 0.25 134217728 0 0 ~~ exx/trim-vert01 0 402.2856445312 0 0.125 0.1093749925 134217728 0 0 - exx/trim-vert01 0 402.2856445313 0 0.125 0.1093749925 134217728 0 0
common/caulk 32 192 0 0.25 0.25 134217728 0 0
exx/trim-vert01 0 109.71484375 90 0.125 0.1093749925 134217728 0 0
}
@ -15805,11 +15805,11
@ exx/panel-q201 exx/trim-simple01 64 0 0 0.25 0.25 134217728 0 0 exx/trim-vert01 0 475.4291992188~~90 0.125 0.1093749925 134217728 0 0 ( 3361308 584 ) common/caulk 32 6490 0.25 0.25 134217728 0 0 ~~exx/trim-vert01 0 36.5708007812 90 0.125 0.1093749925 134217728 0 0 *exx/trim-vert01 0 36.5708007813 90 0.125 0.1093749925 134217728 0 0 } { exx/panel-q201b 0 341.3334960938 0 ~~0.125 0.1875 134217728 0 0 ~~ exx/trim-horz01 120.470703125 31.9985351562135 0.09391261640.0883883536 134217728 0 0 - exx/trim-horz01 120.470703125 31.9985351563~~135 0.0939126164
0.0883883536 134217728 0 0 exx/trim-simple01 64 0 0 0.25 0.25 134217728 0 0 exx/trim-horz01 0090 0.0625 0.125 134217728 0 0 common/caulk 192 3290 0.25 0.25 134217728 0 0@ -16130,7 +16130,7
@ exx/panel-q201 (1104 1316 580 ) exx/trim-vert01 0 182.8567504883 90 0.1250.1093749925 134217728 0 0 } { -( –820 1372 644 ) ( –820 1308 644 ) ( –820 1372 388 ) exx/trim-horz01 391.5297851562 31.9985961914 135 0.0939126164 0.0883883536 134217728 0 0 *exx/trim-horz01 391.5297851563 31.9985961914 135 0.0939126164 0.0883883536 134217728 0 0 exx/panel-q201b 0 341.3334960938 0 0.125 0.1875 134217728 0 0 exx/trim-simple01 64 0 0 ~~0.25 0.25 134217728 0 0 exx/trim-horz01 0 32 90 0.0625 0.125 134217728 0 0@ -16771,3 +16771,18
@ exx/panel-q201 “light” “50” “_color” “1 0.966583 0” } *{ *“classname” “info_autoscreenshot” *“origin” “1053.79858864.819092 404.306274” *“angles” “26.5319824 119.042358 0” *} *{ *“classname” “info_autoscreenshot” *“origin” “329.972778 84.0413361 348.621948" *"angles" "20.3302002 –26.1584473 0" *} *{ *"classname" "info_autoscreenshot" *"origin" "1144.4397 705.982605 293.366577" *"angles" "10.689697356.651001 0” *} diff —git a/maps/leave_em_behind.map.options b/maps/leave_em_behind.map.options index c1358d1..f1bf7c3 100644 — a/maps/leave_em_behind.map.options *+ b/maps/leave_em_behind.map.options@ -3,4 +3,4
@ ~~vis + ~~minimap ~~nosRGB ~~Version: 4 *Version: 6 diff —git a/maps/leave_em_behind.mapinfo b/maps/leave_em_behind.mapinfo index c0aa1a1..178b100 100644 — a/maps/leave_em_behind.mapinfo **+ b/maps/leave_em_behind.mapinfo@ -1,11 +1,12
@ title Leave’em behind -description A very small race map. *description A very small race map author C.Brutail, Cortez ~~cdtrack 10 *cdtrack 11 settemp_for_type all g_start_weapon_shotgun 0 //settemp_for_type all g_start_weapon_laser 0 // uncomment this if you added weapon pickups: has weapons gametype rc timelimit=10 qualifying_timelimit=5 +gametype cts // optional: fog density red green blue alpha mindist maxdist // optional: settemp_for_type (all|gametypename) cvarname value // optional: clientsettemp_for_type (all|gametypename) cvarname value diff —git a/maps/leave_em_behind.tga b/maps/leave_em_behind.tga new file mode 100644 index 0000000..1598505 Binary files /dev/null and b/maps/leave_em_behind.tga differ