Patches #1645

Merge in xonotic/xonotic-maps.pk3dir.git: matthiaskrgr/lightspeed

Added by git-manager about 1 year ago. Updated 11 months ago.

Status:ClosedStart date:06/08/2013
Priority:NormalDue date:
Assignee:Samual% Done:

100%

Category:-
Target version:Xonotic - 0.8

Description

Purpose of the branch:

remove a red and a blue dot from one frame of the animation of one of the screens on lightspeed.

  1 binary files changed 161238 b (157 kb) -> 161203 b (157 kb) => [-35 b (-35 b)]

Repository: xonotic/xonotic-maps.pk3dir.git
Commit: fcf118a65644c1d6582dfe5572069be13fc3e538
Branch: matthiaskrgr/lightspeed

Merge commands:

cd data/xonotic-maps.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff 'fcf118a65644c1d6582dfe5572069be13fc3e538'..'origin/matthiaskrgr/lightspeed'

# 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/matthiaskrgr/lightspeed'

# 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 'matthiaskrgr/lightspeed'

Diffstat:

 .../map_lightspeed/screens/lightspeedscrn5.tga     |  Bin 161238 -> 161203 bytes
 1 files changed, 0 insertions(+), 0 deletions(-)

Revision log:

commit fcf118a65644c1d6582dfe5572069be13fc3e538
Author: Matthias Krüger <matthias.krueger@famsik.de>
Commit: Matthias Krüger <matthias.krueger@famsik.de>

    map: lightspeed: remove red/blue dot from screen animation frame.

User agreed to the GPLv2+.

Diff:

diff --git a/textures/map_lightspeed/screens/lightspeedscrn5.tga b/textures/map_lightspeed/screens/lightspeedscrn5.tga
index fcae381..42aef3f 100644
Binary files a/textures/map_lightspeed/screens/lightspeedscrn5.tga and b/textures/map_lightspeed/screens/lightspeedscrn5.tga differ

History

#1 Updated by matthiaskrgr about 1 year ago

  • Assignee set to Samual
  • Target version set to 0.8

#2 Updated by matthiaskrgr 11 months ago

  • Status changed from New to Closed
  • % Done changed from 0 to 100

Also available in: Atom PDF