Merge in xonotic/mediasource.git: mirceakitsune/textures_screens_commercials
git-manager created issue #1465 on 2013-03-27T15:25:56Z:
Purpose of the branch:
Source of http://dev.xonotic.org/issues/1464
I added some new textures to my screens package, containing two "TV stations" (news and commercials) with Xonotic related stuff. Each station cycles between 5 images and the textures can be placed on large screens on maps to make the environment more fun and exciting. Screenshots will come soon when the map I initially created them for will be available.
Repository: xonotic/mediasource.git Commit: adbadd13 Branch: mirceakitsune/textures_screens_commercials
Merge commands:
cd mediasource
git checkout master
git reset --hard origin/master
git pull && git diff 'adbadd138f723e74446e4e3ad81b9fb8b38bb0d2'..'origin/mirceakitsune/textures_screens_commercials'
# 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/textures_screens_commercials'
# 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/textures_screens_commercials'
Diffstat:
.../screens/screen_commercials_news_source.xcf | Bin 0 -> 99199435 bytes
1 files changed, 0 insertions(+), 0 deletions(-)
Revision log:
commit adbadd138f723e74446e4e3ad81b9fb8b38bb0d2
Author: MirceaKitsune
Commit: MirceaKitsune
Some additions to my screens texture package. It includes a Commercials and News TV station, each with 5 looping images. To be placed on maps as large television screens.
User agreed to the GPLv2+.
Diff:
diff --git a/textures/screens/screen_commercials_news_source.xcf b/textures/screens/screen_commercials_news_source.xcf
new file mode 100644
index 0000000..651e9ba
Binary files /dev/null and b/textures/screens/screen_commercials_news_source.xcf differ