Merge in xonotic/xonotic-maps.pk3dir.git: Mirio/xoylent
git-manager created issue #1524 on 2013-04-21T22:34:37Z:
Purpose of the branch:
Map cleanup: Updated mapinfo, info_autoscreenshot entities, map picture
Repository: xonotic/xonotic-maps.pk3dir.git Commit: 91b12ab1 Branch: Mirio/xoylent
Merge commands:
cd data/xonotic-maps.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '91b12ab175e657833ee0925718841498e4ce6fe1'..'origin/Mirio/xoylent'
# 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/xoylent'
# 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/xoylent'
Diffstat:
maps/xoylent.map | 50 +++++++++++++++++++++++++++------------------
maps/xoylent.map.options | 2 +-
maps/xoylent.mapinfo | 5 +--
maps/xoylent.tga | Bin 786476 -> 752382 bytes
4 files changed, 33 insertions(+), 24 deletions(-)
Revision log:
commit 91b12ab175e657833ee0925718841498e4ce6fe1
Author: Mirio
Commit: Mirio
Map cleanup, mapinfo, screenshot
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/maps/xoylent.map b/maps/xoylent.map
index 877b881..a2ea9b1 100644
— a/maps/xoylent.map
**+ b/maps/xoylent.map
@ -420,7 +420,7
@ map\_xoylent/panels\_floor
common/caulk 0 0 0 0.125 0.125 134217728 0 0
map\_xoylent/panels\_wall 168 128 0 ~~0.125 0.125 134217728 0 0
common/caulk 0 0 0 0.125 0.125 134217728 0 0
~~ map\_xoylent/border\_big 576 0.0043945312 0 0.083329998 0.0833334923 134217728 0 0
*( 64192 928 ) ( 64200 920 ) ( 64 ~~192 928 ) map\_xoylent/border\_big 576 0.0043945313 0 0.083329998 0.0833334923 134217728 0 0
map\_xoylent/border\_big 0 64 135 0.0883900002 0.0883900002 134217728 0 0
common/caulk 0 0 0 0.125 0.125 134217728 0 0
map\_xoylent/border\_big 704 0 90 0.083329998 0.083329998 134217728 0 0
@ -454,7 +454,7
@ map\_xoylent/panels\_floor
common/caulk 0 0 0 0.125 0.125 134217728 0 0
common/caulk 0 0 0 0.125 0.125 134217728 0 0
common/caulk 0 0 0 0.125 0.125 134217728 0 0
~~( 416 ~~224 864 ) map\_xoylent/border\_big 256 0.0024414062 135 0.0883900002 0.0589256287 134217728 0 0
*map\_xoylent/border\_big 256 0.0024414063 135 0.0883900002 0.0589256287 134217728 0 0
map\_xoylent/panels\_wall 856 640 0 ~~0.09375 0.125 134217728 0 0
common/caulk 0 0 0 0.125 0.125 134217728 0 0
}
@ -462,7 +462,7
@ map\_xoylent/panels\_floor
common/caulk 0 0 0 0.125 0.125 134217728 0 0
common/caulk 0 0 0 0.125 0.125 134217728 0 0
common/caulk 0 0 0 0.125 0.125 134217728 0 0
~~ map\_xoylent/border\_big 256 0.0024414062 135 0.0883900002 0.0589256287 134217728 0 0
- map_xoylent/border_big 256 0.0024414063 135 0.0883900002 0.0589256287 134217728 0 0
map_xoylent/panels_wall 856 128 0~~0.09375 0.125 134217728 0 0
( 384 64 1008 ) ( 392 64 1008 ) ( 384 ~~64 1008 ) common/caulk 0 0 0 0.125 0.125 134217728 0 0
}
@ -596,7 +596,7
@ map_xoylent/panels_floor common/caulk 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 ~~( 192 ~~200 872 ) map_xoylent/border_big 240 0.0024414062 45 0.0883900002 0.0589299984 134217728 0 0 *map_xoylent/border_big 240 0.0024414063 45 0.0883900002 0.0589299984 134217728 0 0 map_xoylent/panels_wall 168 640 0 0.09375 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 }@ -604,7 +604,7
@ map_xoylent/panels_floor common/caulk 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 ~~map_xoylent/border_big 368 0.0024414062 45 0.0883900002 0.0589256026 134217728 0 0 *map_xoylent/border_big 368 0.0024414063 45 0.0883900002 0.0589256026 134217728 0 0 map_xoylent/panels_wall 168 128 0 0.09375 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 }@ -2860,7 +2860,7
@ map_xoylent/border_big } { common/caulk 0 0 0 0.125 0.125 134217728 0 0 ~~map_xoylent/border_big 0 64.0004882812 45 0.0883900002 0.0883900002 134217728 0 0 *map_xoylent/border_big 0 64.0004882813 45 0.0883900002 0.0883900002 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0@ -4823,7 +4823,7
@ map_xoylent/border_big { map_xoylent/panels_floor 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 ~~map_xoylent/border_big 383.9997558594 0.0043945312 0 0.083329998 0.083329998 134217728 0 0 *map_xoylent/border_big 383.9997558594 0.0043945313 0 0.083329998 0.083329998 134217728 0 0 map_xoylent/border_big 0 0 0 0.083329998 0.083329998 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0@ -7902,7 +7902,7
@ map_xoylent/border_big common/caulk 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 ~~map_xoylent/border_big 0 0.0024414062 0 0.083329998 0.083329998 134217728 0 0 *map_xoylent/border_big 0 0.0024414063 0 0.083329998 0.083329998 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0@ -12018,7 +12018,7
@ map_xoylent/border_big map_xoylent/panels_wall 168 640 0 ~~0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 ~~ map_xoylent/border_big 224 0.0043945312 0 0.083329998 0.0833334923 134217728 0 0 - map_xoylent/border_big 224 0.0043945313 0 0.083329998 0.0833334923 134217728 0 0
common/caulk 0 0 0 0.125 0.125 134217728 0 0
map_xoylent/border_big 0 0 90 0.083329998 0.083329998 134217728 0 0
common/caulk 0 0 0 0.125 0.125 134217728 0 0
@ -12253,7 +12253,7
@ map_xoylent/border_big { common/caulk 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 ~~ map_xoylent/border_big 0 0.0024414062 90 0.083329998 0.0833334327 134217728 0 0 - map_xoylent/border_big 0 0.0024414063 90 0.083329998 0.0833334327 134217728 0 0
map_xoylent/panels_floor 0 0 0 0.125 0.125 134217728 0 0
map_xoylent/border_big 0 0 45 0.0883882716 0.0883886516 134217728 0 0
common/caulk 0 0 0 0.125 0.125 134217728 0 0
@ -12340,7 +12340,7
@ map_xoylent/border_big common/caulk 0 0 0 0.125 0.125 134217728 0 0 map_xoylent/border_big 228 64 135 0.0883900002 0.0883900002 134217728 0 0 map_xoylent/panels_floor 0 0 0 0.125 0.125 134217728 0 0 ~~ map_xoylent/border_big 0 0.0395507812 90 0.083329998 0.083329998 134217728 0 0 - map_xoylent/border_big 0 0.0395507813 90 0.083329998 0.083329998 134217728 0 0
common/caulk 0 0 0 0.125 0.125 134217728 0 0
common/caulk 0 0 0 0.125 0.125 134217728 0 0
map_xoylent/border_big 0 0.001953125 0 0.083329998 0.083329998 134217728 0 0
@ -13399,7 +13399,7
@ map_xoylent/border_big { common/caulk 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 ~~ map_xoylent/border_big 0 0.0024414062 90 0.083329998 0.0833334327 134217728 0 0 - map_xoylent/border_big 0 0.0024414063 90 0.083329998 0.0833334327 134217728 0 0
map_xoylent/panels_floor 0 0 0 0.125 0.125 134217728 0 0
map_xoylent/border_big 734 32 135 0.0883900002 0.0883900002 134217728 0 0
common/caulk 0 0 0 0.125 0.125 134217728 0 0
@ -14705,8 +14705,8
@ map_xoylent/panels_trim common/caulk 0 0 0 0.125 0.125 134217728 0 0 map_xoylent/panels_wall 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 ~~ map_xoylent/border_withlight 736 16.0043945312 45 0.0883900002 0.0883884355 134217728 0 0 ~~map_xoylent/border_small 672 16.0043945312 45 0.0883900002 0.0883884355 134217728 0 0 *map_xoylent/border_withlight 736 16.0043945313 45 0.0883900002 0.0883884355 134217728 0 0 - map_xoylent/border_small 672 16.0043945313 45 0.0883900002 0.0883884355 134217728 0 0
}
{
common/caulk 0 0 0 0.125 0.125 134217728 0 0
@ -15784,7 +15784,7
@ map_xoylent/panels_floor } { map_xoylent/panels_trim 768 16 0 0.125 0.125 134217728 0 0 ~~ map_xoylent/border_small 0.017578125 23.9965820312 ~~45 0.1178499982 0.1178499982 134217728 0 0
- map_xoylent/border_small 0.017578125 23.9965820313~~45 0.1178499982 0.1178499982 134217728 0 0
common/caulk 0 0 0 0.125 0.125 134217728 0 0
common/caulk 0 0 0 0.125 0.125 134217728 0 0
map_xoylent/panels_trim 832 0 0 ~~0.125 0.125 134217728 0 0
@ -16548,7 +16548,7
@ map_xoylent/panels_floor map_xoylent/panels_warning 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 ~~ map_xoylent/border_small 32 32.0004882812 45 0.0883900002 0.0883900002 134217728 0 0
- map_xoylent/border_small 32 32.0004882813 45 0.0883900002 0.0883900002 134217728 0 0
common/caulk 0 0 0 0.125 0.125 134217728 0 0
common/caulk 0 0 0 0.125 0.125 134217728 0 0
}
@ -16941,7 +16941,7
@ map_xoylent/panels_floor common/caulk 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 ~~( ~~288 64 632 ) map_xoylent/border_big 0 95.9985351562 90 0.083329998 0.083329998 134217728 0 0 *map_xoylent/border_big 0 95.9985351563 90 0.083329998 0.083329998 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 }@ -20870,7 +20870,7
@ exx/wall-panels08b common/caulk 0 0 0 0.125 0.125 134217728 0 0 exx/base-metal04 0 0 0 0.125 0.125 134217728 0 0 exx/base-metal04 0 0 0 0.125 0.125 134217728 0 0map_xoylent/light-u201-surfacelight0 42.6665039062 ~~90 0.125 0.1875 134217728 0 0 *map_xoylent/light-u201-surfacelight0 42.666503906390 0.125 0.1875 134217728 0 0 common/caulk 0 0 0 0.125 0.125 134217728 0 0 } {@ -29049,6 +29049,16
@ exx/trim-baseboard } { “classname” “info_autoscreenshot” ~~“origin” “‘1715.1 535.4 943.4’” ~~“angles” “’ 21.8136.6 0.0’" *"origin" "1518.79773 619.401733 1073.21436" *"angles" "20.725708129.072876 0” *} *{ *“classname” “info_autoscreenshot” *“origin” “1428.83386 ~~924.846436 287.496796" *"angles" "16.6333008 150.540161 0" *} *{ *"classname" "info_autoscreenshot" +"origin" "701.056213 97.5969925 806.1427” *“angles” "17.160644542.4456787 0" } diff —git a/maps/xoylent.map.options b/maps/xoylent.map.options index 54ad7e8..3233ef1 100644 — a/maps/xoylent.map.options *+ b/maps/xoylent.map.options@ -3,4 +3,4
@ ~~vis + ~~minimap ~~nosRGB ~~Version: 2 *Version: 4 No newline at end of file diff —git a/maps/xoylent.mapinfo b/maps/xoylent.mapinfo index 710f88b..cabb5ec 100644 — a/maps/xoylent.mapinfo *++ b/maps/xoylent.mapinfo@ -1,6 +1,7
@ title Xoylent ~~description A remake of soylent. *description A remake of Soylent author sev, Strahlemann *cdtrack 6 has weapons gametype dm gametype lms@ -8,6 +9,4
@ gametype arena gametype tdm gametype ca gametype ft ~~gametype rune gametype ka ~~cdtrack 7 diff —git a/maps/xoylent.tga b/maps/xoylent.tga index f1bd2e4..cf95503 100644 Binary files a/maps/xoylent.tga and b/maps/xoylent.tga differ