Patches #1256

Merge in xonotic/xonotic-maps.pk3dir.git: morphed/pillar

Added by git-manager almost 2 years ago. Updated about 1 year ago.

Status:ResolvedStart date:07/03/2012
Priority:NormalDue date:
Assignee:tZork% Done:

100%

Category:-
Target version:-

Description

Purpose of the branch:

adds pillar to the game :P

Repository: xonotic/xonotic-maps.pk3dir.git
Commit: 98bf0d2ac8432fe77bf942d73c29be26532126da
Branch: morphed/pillar

Merge commands:

cd data/xonotic-maps.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '98bf0d2ac8432fe77bf942d73c29be26532126da'..'origin/morphed/pillar'

# 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/morphed/pillar'

# 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 'morphed/pillar'

Diffstat:

 models/pillars/mpillar.tga                        |  Bin 0 -> 3145772 bytes
 models/pillars/mpillar_gloss.tga                  |  Bin 0 -> 3145772 bytes
 models/pillars/mpillar_glow.tga                   |  Bin 0 -> 3145772 bytes
 models/pillars/mpillar_shirt.tga                  |  Bin 0 -> 3145772 bytes
 models/pillars/mpillar_use_colormap_inradiant.md3 |  Bin 0 -> 132900 bytes
 5 files changed, 0 insertions(+), 0 deletions(-)

Revision log:

commit 98bf0d2ac8432fe77bf942d73c29be26532126da
Author: Morphed <Morphed@o2.pl>
Commit: Morphed <Morphed@o2.pl>

    its tall and can support things

User agreed to the GPLv2+.

Diff:

diff --git a/models/pillars/mpillar.tga b/models/pillars/mpillar.tga
new file mode 100644
index 0000000..297c915
Binary files /dev/null and b/models/pillars/mpillar.tga differ
diff --git a/models/pillars/mpillar_gloss.tga b/models/pillars/mpillar_gloss.tga
new file mode 100644
index 0000000..ae20021
Binary files /dev/null and b/models/pillars/mpillar_gloss.tga differ
diff --git a/models/pillars/mpillar_glow.tga b/models/pillars/mpillar_glow.tga
new file mode 100644
index 0000000..bda6f47
Binary files /dev/null and b/models/pillars/mpillar_glow.tga differ
diff --git a/models/pillars/mpillar_shirt.tga b/models/pillars/mpillar_shirt.tga
new file mode 100644
index 0000000..33f489a
Binary files /dev/null and b/models/pillars/mpillar_shirt.tga differ
diff --git a/models/pillars/mpillar_use_colormap_inradiant.md3 b/models/pillars/mpillar_use_colormap_inradiant.md3
new file mode 100644
index 0000000..fcd5794
Binary files /dev/null and b/models/pillars/mpillar_use_colormap_inradiant.md3 differ

Associated revisions

Revision d38c1f71
Added by divVerent about 1 year ago

Merge remote-tracking branch 'origin/morphed/pillar', closes #1256

History

#1 Updated by tZork over 1 year ago

  • Status changed from New to In Progress
  • Assignee set to tZork

Will merge just before next release (so maps that merge this branch still get the data until then)

#2 Updated by divVerent about 1 year ago

  • Status changed from In Progress to Resolved
  • % Done changed from 0 to 100

Applied in changeset xonotic:xonotic-maps|commit:d38c1f7121d3bd768216a8fe9e163a54e9cb3b9b.

Also available in: Atom PDF