Merge in xonotic/xonotic-maps.pk3dir.git: Mirio/solarium
Mirio created issue #1547 on 2013-05-05T10:43:12Z:
Purpose of the branch:
Map cleanup
Repository: xonotic/xonotic-maps.pk3dir.git Commit: 462624f2 Branch: Mirio/solarium
Merge commands:
cd data/xonotic-maps.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '462624f28115a45868bd1fa45c9a4203efdca121'..'origin/Mirio/solarium'
# 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/solarium'
# 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/solarium'
Diffstat:
maps/solarium.map | 769 ++++++++++++++++++++++++++++++-----------
maps/solarium.map.options | 2 +-
maps/solarium.mapinfo | 9 +-
maps/solarium.tga | Bin 1000044 -> 748036 bytes
maps/solarium.waypoints | 21 +-
maps/solarium.waypoints.cache | 746 ++-------------------------------------
6 files changed, 615 insertions(+), 932 deletions(-)
Revision log:
commit 462624f28115a45868bd1fa45c9a4203efdca121
Author: Mirio
Commit: Mirio
Barrels go boom
commit f24c779e7efdea2ef08ea825fc41ef4f8530e7d9
Author: Mirio
Commit: Mirio
Barrels go boom
commit db9c5bda5353baddc9e46e21046f0cb29eb4c7c9
Author: Mirio
Commit: Mirio
Map cleanup, mapinfo, screenshot, waypoints
User agreed to the GPLv2*.
Diff:
<pre>
diff —git a/maps/solarium.map b/maps/solarium.map
index 1ecff8d..f0eb20b 100644
— a/maps/solarium.map
**+ b/maps/solarium.map
@ -1152,8 +1152,8
@ terrain01x/ground-drylake01
)
~~)
~~ )
*( ( 1818.301025390690.111579895 ~~58.5454559326 0.5317286253 0 ) )
*)
)
)
)
@ -1995,10 +1995,10
@ terrain01x/ground-drylake01
)
)
~~)
~~ )
~~)
~~ )
- ) *)
- )
*)
)
)
}
@ -2024,12 +2024,12
@ terrain01x/rock-mars01 ) ~~) ~~ ) ~~) ~~ ) - ) *)
- )
*)
)
~~)
*)
)
}
}
@ -2379,12 +2379,12
@ terrain01x/rock-mars01 trak6x/trim-trim3b 0 0 0 0.25 0.25 0 0 0 } { ~~trak6x/light-light1-surfacelight 219.4282226562 0 0 0.1750000119 0.0625 0 0 0 *trak6x/light-light1-surfacelight 219.4282226563 0 0 0.1750000119 0.0625 0 0 0 trak6x/light-light1-surfacelight 0 0 0 0.2031249851 0.0625 0 0 0 common/caulk 0 0 0 0.25 0.25 0 0 0 trak6x/light-light1-surfacelight 196.9233398438 0 0 0.2031249851 0.0625 0 0 0 trak6x/light-light1-surfacelight 0 0 0 0.125 0.0625 0 0 0 ~~trak6x/light-light1-surfacelight 320.0004882812 0 0 0.125 0.0625 0 0 0 *trak6x/light-light1-surfacelight 320.0004882813 0 0 0.125 0.0625 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 }@ -2441,7 +2441,7
@ terrain01x/rock-mars01 { common/caulk 0 0 0 0.25 0.25 0 0 0 common/caulk 0 0 0 0.25 0.25 0 0 0 ~~trak5x/trim-trim1a 42.6665039062 219.427734375 0 0.1875 0.174999997 0 0 0 *trak5x/trim-trim1a 42.6665039063 219.427734375 0 0.1875 0.174999997 0 0 0 common/caulk 0 0 0 0.25 0.25 0 0 0 exomorphx/wall-metal_panel04 0 992 0 0.25 0.25 0 0 0 trak6x/wall-wall6 0 0 0 0.25 0.25 0 0 0@ -2826,7 +2826,7
@ terrain01x/rock-mars01 trak6x/light-light1-surfacelight 139.63671875 0 0 0.0859375 0.0625 0 0 0 trak6x/light-light1-surfacelight 175.54296875 0 0 0.2734375 0.0625 0 0 0 trak6x/light-light1-surfacelight 384 0 0 0.1875 0.0625 0 0 0 ~~trak6x/light-light1-surfacelight 433.2309570312 0 0 0.2031249851 0.0625 0 0 0 *trak6x/light-light1-surfacelight 433.2309570313 0 0 0.2031249851 0.0625 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 }@ -2919,7 +2919,7
@ terrain01x/rock-mars01 } { common/caulk 0 0 0 0.25 0.25 0 0 0 ~~trak6x/light-light1-surfacelight 393.8461914062 384 0 0.40625 0.0625 0 0 0 *trak6x/light-light1-surfacelight 393.8461914063 384 0 0.40625 0.0625 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 common/caulk 0 0 0 0.25 0.25 0 0 0@ -3414,15 +3414,15
@ patchDef2 trak5x/base-base1a ) ~~) *) - ) ) ) ) ) ) ~~ ) ~~) *)
- )
)
}
}
@ -3450,15 +3450,15
@ patchDef2 trak5x/base-base1a ) ~~ ) - ) *) ) ) ) ) ) ~~) ~~ )
- )
*)
)
}
}
@ -4015,14 +4015,14
@ terrain01x/ground-drylake01 trak6x/light-light1-surfacelight 325.818359375 0 0 0.171875 0.0625 0 0 0 trak6x/light-light1-surfacelight 263.314453125 0 0 0.1822916567 0.0625 0 0 0 common/caulk 384 0 0 0.1875 0.0625 0 0 0 ~~trak6x/light-light1-surfacelight 433.2309570312 0 0 0.2031249851 0.0625 0 0 0 *trak6x/light-light1-surfacelight 433.2309570313 0 0 0.2031249851 0.0625 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 } { trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0 trak6x/light-light1-surfacelight 0 0 0 0.1875 0.0625 0 0 0 ~~common/caulk 372.3637695312 0 0 0.4583333433 0.0625 0 0 0 *common/caulk 372.3637695313 0 0 0.4583333433 0.0625 0 0 0 phillipk2x/base-pk02_generic01b 0 0 0 0.25 0.25 0 0 0 trak6x/light-light1-surfacelight 0 0 0 0.125 0.0625 0 0 0 trak5x/base-base1a 0 0 0 0.25 0.25 0 0 0@ -4490,11 +4490,11
@ trak5x/base-base1a ) ~~) *) ) ) ) ~~)
- )
)
)
)
@ -4512,9 +4512,9
@ trak5x/base-base1a ) ) ) ~~ ) ~~) ~~ )
- ) *)
- )
)
)
}
@ -4603,7 +4603,7
@ trak5x/base-base1a ) ) ) ~~ ) - )
)
)
)
@ -4621,7 +4621,7
@ trak5x/base-base1a ) ) ) ~~ ) - )
)
)
)
@ -4634,11 +4634,11
@ trak5x/base-base1a ) ~~ ) - ) ) ) ) ~~ )
- )
)
)
)
@ -4656,9 +4656,9
@ trak5x/base-base1a ) ) ) ~~ ) ~~) ~~ ) - ) *)
- )
)
)
}
@ -4674,9 +4674,9
@ trak5x/base-base1a ) ) ) ~~ ) ~~) ~~ ) - ) *)
- )
)
)
}
@ -4692,9 +4692,9
@ trak5x/base-base1a ) ) ) ~~ ) ~~) ~~ ) - ) *)
- )
)
)
}
@ -4710,9 +4710,9
@ trak5x/base-base1a ) ) ) ~~ ) ~~) ~~ ) - ) *)
- )
)
)
}
@ -4728,9 +4728,9
@ trak5x/base-base1a ) ) ) ~~ ) ~~) ~~ ) - ) *)
- )
)
)
}
@ -4833,13 +4833,13
@ patchDef2 terrain01x/rock-mars01 ) *) ) ~~) ~~ ) ~~) ~~ ) ~~) *) - ) *)
- )
*)
)
}
}
@ -4849,12 +4849,12
@ patchDef2 terrain01x/rock-mars01 ) - ) ) ) ) ) ~~ )
- )
)
)
}
@ -5012,9 +5012,9
@ terrain01x/rock-mars01 trak6x/trim-trim3b 0 0 0 0.25 0.25 0 0 0 } { ~~(824936 384 ) (1088936 384 ) (824936 152 ) trak6x/light-light1-surfacelight 146.2856445312 0 0 0.2916666567 0.0625 0 0 0 *trak6x/light-light1-surfacelight 146.2856445313 0 0 0.2916666567 0.0625 0 0 0 common/caulk 128 0 0 0.25 0.25 0 0 0 ~~trak6x/light-light1-surfacelight 73.1430664062 0 0 0.174999997 0.0625 0 0 0 *trak6x/light-light1-surfacelight 73.1430664063 0 0 0.174999997 0.0625 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 trak6x/light-light1-surfacelight 365.71484375 0 0 0.1093749925 0.0625 0 0 0@ -8826,12 +8826,12
@ patchDef2 terrain01x/rock-mars01 ) ~~) ~~ ) ~~) ~~ ) ~~) *) - ) *)
- ) *)
- )
)
)
}
@ -11647,9 +11647,9
@ trak5x/base-base1a ) ) ) ~~ ) - )
)
~~ )
*( (
949.08813476561445.0883789063 100 0.1875 0 ) (949.08813476561445.0883789063 94 0.1875 ~~0.046875 ) ) ) ) )@ -11663,9 +11663,9
@ trak5x/base-base1a ) ) ~~( (1059.39697265621555.3969726562 88 0.0625 0 ) (1059.39697265621555.3969726562 94 0.0625 ~~0.046875 ) )
- )
)
~~( (
1053.73999023441555.3969726562 88 0.125 0 ) (1053.73999023441555.3969726562 94 0.125 ~~0.046875 ) ) - ) ) ) ( (~~1056.5684814453 –1546.91