Patches #937

Merge in xonotic/xonotic-maps.pk3dir.git: divVerent/stormkeep-sRGB

Added by git-manager over 2 years ago. Updated over 2 years ago.

Status:RejectedStart date:12/27/2011
Priority:HighDue date:
Assignee:-% Done:


Target version:Xonotic - 1.0


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: 12820618d9bff9f9d38f24596d3b5d9a49c53999
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'


 maps/ |    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 --git a/maps/ b/maps/
index 7d03205..a98f88f 100644
--- a/maps/
+++ b/maps/
@@ -1,6 +1,6 @@
 -bsp +
--light + -bounce 8 -dirtscale 2
+-light + -bounce 8 -dirtscale 2 -sphericalscale 1 -spotscale 1.5 -areascale 0.2 -skyscale 1
 -vis +
 -minimap +
 Version: 6


#1 Updated by merlijn over 2 years ago

Looks fine to me, however some parts still have too much light (they also did previously), most noticeably the crylink and also the megahealth.

Other than that it looks to me like most areas have gotten slightly more dark, except for the hallway underneath the Nex - which has gotten more light. I actually quite liked this hallway to be slightly dark.

#2 Updated by divVerent over 2 years ago

That hallway probably shouldn't be too hard to fix, and I'll look into the crylink fix. So apart from that it's okay to merge?

#3 Updated by divVerent over 2 years ago

The hallways's light entities are now halved, let's see what that will do.

As for the crylink and megahealth, no idea yet, there are no light entities nearby. It's all surfacelight.

#4 Updated by merlijn over 2 years ago

Already looks better to me now, but we should probably get some more opinions here.

The crylink isn't a big issue, but the model just has a lot of shiny areas.

#5 Updated by merlijn over 2 years ago

  • Assignee set to Samual
  • Priority changed from Normal to High
  • Target version set to 0.6

We should judge whether or not this version should be included for 0.6

#6 Updated by Samual over 2 years ago

  • Assignee deleted (Samual)
  • Target version changed from 0.6 to 1.0

I've stated my remarks on IRC, but in summary:

I do not like this at all, especially in comparison to the map with the previous lighting method. It needs to be re-lit or at least tweaked for sRGB lighting to match just as well, and thus it cannot work for 0.6 in my opinion.

Really there's not enough time anymore, so setting target to 1.0.

#7 Updated by divVerent over 2 years ago

  • Status changed from New to Rejected

Considering this rejected then. May rather need a full relighting.

Also available in: Atom PDF