Merge in xonotic/xonotic-data.pk3dir.git: mirceakitsune/hitindication_color
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.
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'
crosshairs.cfg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
commit c2b178b2ae915ab6d8a0e737b2623cefefd6d8ef Author: Mircea Kitsune <email@example.com> Commit: Mircea Kitsune <firstname.lastname@example.org> 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 --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
#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.