Merge in xonotic/xonotic-maps.pk3dir.git: Mirio/nexballarena
git-manager created issue #1523 on 2013-04-21T22:31:11Z:
Purpose of the branch:
Map cleanup: Updated mapinfo, info_autoscreenshot entities, map picture
Repository: xonotic/xonotic-maps.pk3dir.git Commit: 60fe3d28bbb7aa54a64c25c4e7aa1da5f5c1c7a6 Branch: Mirio/nexballarena
Merge commands:
cd data/xonotic-maps.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '60fe3d28bbb7aa54a64c25c4e7aa1da5f5c1c7a6'..'origin/Mirio/nexballarena'
# 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/nexballarena'
# 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/nexballarena'
Diffstat:
maps/nexballarena.map | 14 ++++++++++++--
maps/nexballarena.map.options | 2 +-
maps/nexballarena.mapinfo | 2 +-
maps/nexballarena.tga | Bin 1025206 -> 724915 bytes
4 files changed, 14 insertions(+), 4 deletions(-)
Revision log:
commit 60fe3d28bbb7aa54a64c25c4e7aa1da5f5c1c7a6
Author: Mirio
Commit: Mirio
Map cleanup, mapinfo, screenshot
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/maps/nexballarena.map b/maps/nexballarena.map
index d809092..af81d59 100644
— a/maps/nexballarena.map
**+ b/maps/nexballarena.map
@ -8417,6 +8417,16
@ ex2x/base-metalmaterial1
}
{
“classname” “info_autoscreenshot”
-“origin” “’~~130.6 631.6 235.6’"
~~”angles" “‘14.0 –78.8 0.0’”
*“origin” “278.328827647.598206 186.370941”
*“angles” “8.58032227 68.3514404 0”
*}
*{
*“classname” “info_autoscreenshot”
*“origin” “137.89096172.133667 61.3503304”
*“angles” “11.0906982 60.5621338 0”
*}
*{
*“classname” “info_autoscreenshot”
*“origin” "~~0.23719725 684.395142 103.676567"
*“angles” “0.5273437588.3300781 0”
}
diff —git a/maps/nexballarena.map.options b/maps/nexballarena.map.options
index 6f2029f..5ad5927 100644
— a/maps/nexballarena.map.options
*+ b/maps/nexballarena.map.options
@ -3,4 +3,4
@
~~vis +
~~minimap
~~nosRGB
-Version: 1
*Version: 3
No newline at end of file
diff —git a/maps/nexballarena.mapinfo b/maps/nexballarena.mapinfo
index dba7916..66d4d1f 100644
— a/maps/nexballarena.mapinfo
**+ b/maps/nexballarena.mapinfo
@ -1,5 +1,5
@
title Nexball Arena
description Small, simple, enclosed arena for finding out who’s the true nexball champion! No obstacles in the way…
-author Revenant, Cortez, tZork, C.Brutail, FruitieX
*author Revenant, Cortez, C.Brutail, tZork, FruitieX
cdtrack 11
gametype nb
diff —git a/maps/nexballarena.tga b/maps/nexballarena.tga
index f6bd23c..d56c845 100644
Binary files a/maps/nexballarena.tga and b/maps/nexballarena.tga differ