Patches #2003

xonotic-maps.pk3dir:Mirio/map_updates: an XXL merge request: SilentSiege: Fix bugs 1679, 1705, 1708 (texture alignment, bot waypoints...

Added by git-manager 2 months ago. Updated 2 months ago.

Status:NewStart date:06/23/2014
Priority:NormalDue date:
Assignee:divVerent% Done:

0%

Category:-
Target version:Xonotic - 0.8

Description

SilentSiege: Fix bugs 1679, 1705, 1708 (texture alignment, bot waypoints, clips)
Nexballarena: Fix bug 1914 (tiny z-fight)
RunningManCTF: Fix bug 1807 (ONS support broken)
Darkzone: Add feature 1856 (more gamemode support like FT, KH)
Fuse: Fix bug 1990 (texture + clip)

Fix bug 1242 "Grappling hook still attached after func_breakable has been destroyed" , only all maps having those (now they are consistent everywhere).

Repository: xonotic/xonotic-maps.pk3dir.git
Commit: 122b6ac4d5063046f4c0b5e2931fe39e3b0ee249
Branch: Mirio/map_updates

Merge commands:

cd data/xonotic-maps.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '122b6ac4d5063046f4c0b5e2931fe39e3b0ee249'..'origin/Mirio/map_updates'

# 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 --edit --log --no-ff 'origin/Mirio/map_updates'

# 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 'Mirio/map_updates'

Diffstat:

 maps/courtfun.map              |  204 +-
 maps/courtfun.map.options      |    2 +-
 maps/dance.map                 | 1268 +++++---
 maps/dance.map.options         |    2 +-
 maps/darkzone.map              |  192 --
 maps/darkzone.map.options      |    2 +-
 maps/darkzone.mapinfo          |    5 +
 maps/drain.map                 |  322 +--
 maps/drain.map.options         |    2 +-
 maps/fuse.map                  |   65 +-
 maps/fuse.map.options          |    2 +-
 maps/nexballarena.map          |    4 +-
 maps/nexballarena.map.options  |    2 +-
 maps/oilrig.map                |  513 ++--
 maps/oilrig.map.options        |    2 +-
 maps/runningman.map            |   72 +-
 maps/runningman.map.options    |    2 +-
 maps/runningmanctf.map         |  640 ++---
 maps/runningmanctf.map.options |    2 +-
 maps/silentsiege.map           | 6412 +++++++++++++++++-----------------------
 maps/silentsiege.map.options   |    2 +-
 maps/silentsiege.mapinfo       |   11 +-
 maps/solarium.map              |  258 +--
 maps/solarium.map.options      |    2 +-
 24 files changed, 4323 insertions(+), 5665 deletions(-)

Revision log:

commit 122b6ac4d5063046f4c0b5e2931fe39e3b0ee249
Author: Mirio <opivy@hotmail.de>
Commit: Mirio <opivy@hotmail.de>

    Fix the leak

commit 7de23859ded5caf4caa3d2770e097cdd10ed807d
Author: Mirio <opivy@hotmail.de>
Commit: Mirio <opivy@hotmail.de>

    Fix Bugs #1679, #1705, #1708

commit 51e5b870336751f76ea2bbb43a24ef94808044d6
Author: Mirio <opivy@hotmail.de>
Commit: Mirio <opivy@hotmail.de>

    Fix Bug #1242 and make all barells consistent for Courtfun, Dance, Darkzone, Drain, Oilrig, Runningman, Runningmanctf and Solarium

commit 3918797f0fdcbe345651599a633d781e4043b192
Author: Mirio <opivy@hotmail.de>
Commit: Mirio <opivy@hotmail.de>

    Add Feature #1856

commit 79eb719058507fbaf42ce231719f0035829574bc
Merge: 8495e5d 9a2422e
Author: Mirio <opivy@hotmail.de>
Commit: Mirio <opivy@hotmail.de>

    Merge branch 'master' into mirio/map_updates

commit 8495e5d72586e952d8d7c7feda95893806e891e6
Author: Mirio <opivy@hotmail.de>
Commit: Mirio <opivy@hotmail.de>

    Fix Bug #1807

commit 6ff886ee1fda0ba42ba9fc57a4d7225e9f9cd51a
Author: Mirio <opivy@hotmail.de>
Commit: Mirio <opivy@hotmail.de>

    Fix Bug #1990

commit 360ac037cbab5403f68137a7ccfe923590441db9
Author: Mirio <opivy@hotmail.de>
Commit: Mirio <opivy@hotmail.de>

    Fix Bug #1914

User agreed to the license.

Diff:

*** DIFF TOO LARGE, PLEASE CHECK YOURSELF ***

History

#1 Updated by Mirio 2 months ago

  • Assignee set to divVerent
  • Target version set to 0.8

Also available in: Atom PDF