Merge in xonotic/mediasource.git: mirceakitsune/new_loading_screens
git-manager created issue #601 on 2011-08-25T09:17:13Z:
Purpose of the branch:
My latest changes to the loading screens. Includes new effects and visual improvements, fixes for white edges (characters looking Photoshopped), and tips now use the Xolonium font at a readable size.
Repository: xonotic/mediasource.git Commit: 22fe59f25228e3bd16a22781212ef6258074b2b8 Branch: mirceakitsune/new_loading_screens
Merge commands:
cd mediasource
git checkout master
git reset --hard origin/master
git pull && git diff '22fe59f25228e3bd16a22781212ef6258074b2b8'..'origin/mirceakitsune/new_loading_screens'
# 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/new_loading_screens'
# 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/new_loading_screens'
Diffstat:
gfx/loading_backgrounds.psd | Bin 101584879 -> 71808344 bytes
1 files changed, 0 insertions(+), 0 deletions(-)
Revision log:
commit 22fe59f25228e3bd16a22781212ef6258074b2b8
Author: MirceaKitsune
Commit: MirceaKitsune
Increase the font size of tips from 10 to 14, as requested by divVerent and Samual. Probability to rest in peace leveled up!
commit d80c36131f089c09445a407b9dd2764e7233ab5e
Author: MirceaKitsune
Commit: MirceaKitsune
Tweak some glow effects again
commit cae5aeb28f854526f1a451d3f016beab462df088
Author: MirceaKitsune
Commit: MirceaKitsune
Add a screen and grain effect to the loading screens, and do a few other tweaks
commit 577c88506aaed362431e902c31ee05a31ddedb93
Author: MirceaKitsune
Commit: MirceaKitsune
Source for the latest loading screens.
User agreed to the GPLv2+.
Diff:
diff --git a/gfx/loading_backgrounds.psd b/gfx/loading_backgrounds.psd
index bc4dd91..8369395 100644
Binary files a/gfx/loading_backgrounds.psd and b/gfx/loading_backgrounds.psd differ