Merge in xonotic/xonotic-maps.pk3dir.git: divVerent/stormkeep-sRGB
git-manager created issue #937 on 2011-12-27T16:37:24Z:
Purpose of the branch:
Please compare the map to the one in master to see if there are any visual issues. I find this version actually better to play, and still looking good.
If you find anything weird, please report.
Repository: xonotic/xonotic-maps.pk3dir.git Commit: 12820618 Branch: divVerent/stormkeep-sRGB
Merge commands:
cd data/xonotic-maps.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '12820618d9bff9f9d38f24596d3b5d9a49c53999'..'origin/divVerent/stormkeep-sRGB'
# 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/divVerent/stormkeep-sRGB'
# 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 'divVerent/stormkeep-sRGB'
Diffstat:
maps/stormkeep.map.options | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Revision log:
commit 12820618d9bff9f9d38f24596d3b5d9a49c53999
Author: Rudolf Polzer
Commit: Rudolf Polzer
stormkeep: a little change in light weighting
commit ac0ba07df70bb1307753e0d44ef557094a634412
Author: Rudolf Polzer
Commit: Rudolf Polzer
reduce surfacelight by 25%
commit 13d57ebd200905eca45ee21e2b2624537ff87a0d
Author: Rudolf Polzer
Commit: Rudolf Polzer
turn off all spherical lights to see what they do
commit ab798a7238ebf53023cd83d5546ba47747dd044b
Author: Rudolf Polzer
Commit: Rudolf Polzer
use new option file
commit 45a7899845fd9c58605461411a51510857f21eb8
Merge: 127f128 087d5ca
Author: Rudolf Polzer
Commit: Rudolf Polzer
Merge branch 'master' into divVerent/stormkeep-sRGB
commit 127f1283857e86d4e7d75671b339b3cfbdc486fa
Author: Rudolf Polzer
Commit: Rudolf Polzer
stormkeep: less spherical light
commit 896ea7d83d12ade7eb0da0207ec6285585a5f203
Author: Rudolf Polzer
Commit: Rudolf Polzer
first attempt: just use sRGB, no other change
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/maps/stormkeep.map.options b/maps/stormkeep.map.options
index 7d03205..a98f88f 100644
— a/maps/stormkeep.map.options
*+ b/maps/stormkeep.map.options
@ -1,6 +1,6
@
bsp +
—light +bounce 8 ~~dirtscale 2
light +bounce 8 dirtscale 2sphericalscale 1 spotscale 1.5areascale 0.2 ~~skyscale 1
~~vis
~~minimap
—nosRGB
+-sRGB
Version: 6