Patches #1144

Merge in xonotic/xonotic-data.pk3dir.git: mirceakitsune/hitindication_color

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

Status:ResolvedStart date:04/03/2012
Priority:NormalDue date:
Assignee:-% Done:

100%

Category:-
Target version:-

Description

Purpose of the branch:

Changes the color of crosshair hitindication. Instead of making the crosshair red when hitting someone, brighten the color up to white. This is better because it's color neutral (red made no sense) and also looks a lot prettier as the crosshair animates. Please test if needed.

Repository: xonotic/xonotic-data.pk3dir.git
Commit: c2b178b2ae915ab6d8a0e737b2623cefefd6d8ef
Branch: mirceakitsune/hitindication_color

Merge commands:

cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff 'c2b178b2ae915ab6d8a0e737b2623cefefd6d8ef'..'origin/mirceakitsune/hitindication_color'

# 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/mirceakitsune/hitindication_color'

# 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 'mirceakitsune/hitindication_color'

Diffstat:

 crosshairs.cfg |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Revision log:

commit c2b178b2ae915ab6d8a0e737b2623cefefd6d8ef
Author: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Commit: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>

    A very minor change to the crosshair hitindication feature. Instead of making the crosshair red when hitting someone, brighten its color up. The reason for this is that I find a color neutral version better, and this also looks a lot prettier when the crosshair animates. Please test

User agreed to the GPLv2+.

Diff:

diff --git a/crosshairs.cfg b/crosshairs.cfg
index 7385853..78176b1 100644
--- a/crosshairs.cfg
+++ b/crosshairs.cfg
@@ -26,7 +26,7 @@ seta crosshair_pickup_speed 4

 // hit indication animation settings
 seta crosshair_hitindication 0.5
-seta crosshair_hitindication_color "10 -10 -10" 
+seta crosshair_hitindication_color "10 10 10" 
 seta crosshair_hitindication_speed 5

 // hit testing/tracing for special effects for the crosshair

History

#1 Updated by divVerent over 2 years ago

Vote on this?

Personally I couldn't care less. But I agree that choice of red is a bit weird, especially as many already use red crosshair and then wouldn't see this.

#2 Updated by MirceaKitsune over 2 years ago

I think a small tweak like this should be easy to decide on. Please post some feedback!

Again, I believe this is better because it's a neutral color. No crosshair is usually pure white by default (maybe just gray, not sure about 100 health coloring). Red is used for both low health and the Grenade Launcher with per-weapon coloring. White also looks much nicer because it appears like the crosshair flashes / becomes brighter, which is a lot more visible too.

#3 Updated by terencehill over 2 years ago

I suggest to use white when the crosshair color is dinamic (per weapon, health-based), otherwise red.

#4 Updated by merlijn about 2 years ago

  • Status changed from New to Resolved

Merged this change - thanks!

Also available in: Atom PDF