Merge in xonotic/xonotic-maps.pk3dir.git: Mirio/red-planet
git-manager created issue #1529 on 2013-04-22T21:08:16Z:
Purpose of the branch:
Map cleaup: set hidden
Repository: xonotic/xonotic-maps.pk3dir.git Commit: 60312aba Branch: Mirio/red-planet
Merge commands:
cd data/xonotic-maps.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '60312aba444127af1194c885d4912559a3ca40e6'..'origin/Mirio/red-planet'
# 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/red-planet'
# 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/red-planet'
Diffstat:
maps/red-planet.map | 14 ++++++++++++--
maps/red-planet.map.options | 2 +-
maps/red-planet.mapinfo | 5 ++---
maps/red-planet.tga | Bin 0 -> 747164 bytes
4 files changed, 15 insertions(+), 6 deletions(-)
Revision log:
commit 60312aba444127af1194c885d4912559a3ca40e6
Author: Mirio
Commit: Mirio
Set hidden, mapinfo, screenshot
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/maps/red-planet.map b/maps/red-planet.map
index 41574fa..a7148ad 100644
— a/maps/red-planet.map
**+ b/maps/red-planet.map
@ -116973,6 +116973,16
@ trak5x/base-pipe1a
}
{
“classname” “info\_autoscreenshot”
~~“origin” “’~~308.8 905.3 317.3’"
~~”angles" “’ 15.9 67.5 0.0’"
*"origin" "709.499756 1161.31604 251.353851"
*"angles" "4.3560791135.082397 0”
*}
*{
*“classname” “info\_autoscreenshot”
*“origin” “4155.74463247.083191 187.458908”
*“angles” “7.92114258 147.299194 0”
*}
*{
*“classname” “info\_autoscreenshot”
+“origin” "~~3008.76221 217.35083 24.4751472"
*“angles” "8.97583008 ~~35.425415 0"
}
diff —git a/maps/red-planet.map.options b/maps/red-planet.map.options
index d940db1..f005cf7 100644
— a/maps/red-planet.map.options
*+ b/maps/red-planet.map.options
@ -3,4 +3,4
@
~~vis +
~~minimap
~~nosRGB
~~Version: 3
*Version: 6
No newline at end of file
diff —git a/maps/red-planet.mapinfo b/maps/red-planet.mapinfo
index a0a5d23..918e923 100644
— a/maps/red-planet.mapinfo
+ b/maps/red-planet.mapinfo
@ -1,11 +1,11
@
title Red Planet
description A large facility on a red dusty planet
author Mircea Kitsune, Cuinnton, FruitieX
~~cdtrack 13
*cdtrack 7
has weapons
*hidden
gametype dm
gametype tdm
~~gametype rune
gametype ctf
gametype ons
gametype lms
@ -14,5 +14,4
@ gametype ca
gametype dom
gametype kh
gametype ft
~~gametype ka
gametype nb
diff —git a/maps/red-planet.tga b/maps/red-planet.tga
new file mode 100644
index 0000000..3949d88
Binary files /dev/null and b/maps/red-planet.tga differ