[crawl-ref-commits] jump_attack branch updated: 0.14-a0-74-gb3c2fba

[<gi...@cr...>]

  discards  a15072a1bb4c364ab85ead7209c436a131dae4f0 (commit)
  discards  950da1328a51923285062392227e43fef8ade908 (commit)
  discards  1404ebc605d8ca73898552a64c16e22fdde06945 (commit)
  discards  39fb3a86bcd2797f97784fef75a17c2676c5d3fd (commit)
  discards  5b3de13cd836ceded71dbb484e4b50831300ff7f (commit)
       via  b3c2fbaeaa34fc84201300581eafb81c1a83fbd9 (commit)
       via  fac964c93594dd49131d141778b5790f7c97afb3 (commit)
       via  08d2bf78a294ed497e582682f6d84ee41dd90525 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (a15072a1bb4c364ab85ead7209c436a131dae4f0)
            \
             N -- N -- N (b3c2fbaeaa34fc84201300581eafb81c1a83fbd9)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

-----------------------------------------------------------------------
commit b3c2fbaeaa34fc84201300581eafb81c1a83fbd9
Author: gammafunk <gam...@gm...>
Date:   Sun Sep 29 21:34:14 2013 -0500

    Fix conduct prompting for jump attacks with elec/devastator.
    
    Warnings were not being generated for non-adjacent jump attacks and some
    double-prompting occured for adjacent ones.

commit fac964c93594dd49131d141778b5790f7c97afb3
Author: gammafunk <gam...@gm...>
Date:   Sun Sep 29 20:00:11 2013 -0500

    Simplify conduct checks and fix prompting with elec/devastator for jump-attack
    
    Instead of trying to differentiate sanctuary vs. other conduct issues, just
    count them equally as a conduct violation, which seems the intention of
    bad_attack() anyways.  Elec attacks for targets in water and devastator also
    give conduct prompts now with no double-prompting.

commit 08d2bf78a294ed497e582682f6d84ee41dd90525
Author: gammafunk <gam...@gm...>
Date:   Thu Sep 26 19:41:53 2013 -0500

    Allow jump attack to target an empty square
    
    The player can target an in-range empty square for jump attack.  If it turns out
    that the square is empty, the jump-attack fails and the player rebounds to their
    original position, losing the turn.

-----------------------------------------------------------------------

Summary of changes:
 crawl-ref/source/contrib/freetype  |    2 +-
 crawl-ref/source/contrib/libpng    |    2 +-
 crawl-ref/source/contrib/lua       |    2 +-
 crawl-ref/source/contrib/pcre      |    2 +-
 crawl-ref/source/contrib/sdl       |    2 +-
 crawl-ref/source/contrib/sdl-image |    2 +-
 crawl-ref/source/contrib/sqlite    |    2 +-
 crawl-ref/source/contrib/zlib      |    2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/crawl-ref/source/contrib/freetype b/crawl-ref/source/contrib/freetype
index c5ac3ce..25e731c 160000
--- a/crawl-ref/source/contrib/freetype
+++ b/crawl-ref/source/contrib/freetype
@@ -1 +1 @@
-Subproject commit c5ac3ceaae693324aa94e6d1c69117a64470272a
+Subproject commit 25e731cbdfc681e099bba533c7d063493db40b7e
diff --git a/crawl-ref/source/contrib/libpng b/crawl-ref/source/contrib/libpng
index f7b8781..15700e6 160000
--- a/crawl-ref/source/contrib/libpng
+++ b/crawl-ref/source/contrib/libpng
@@ -1 +1 @@
-Subproject commit f7b8781caab8ded986268be1b515e0fc0f43f5ed
+Subproject commit 15700e6be7907bb0e703a38bb49fb0f2a585ff7f
diff --git a/crawl-ref/source/contrib/lua b/crawl-ref/source/contrib/lua
index ab9ab99..407274a 160000
--- a/crawl-ref/source/contrib/lua
+++ b/crawl-ref/source/contrib/lua
@@ -1 +1 @@
-Subproject commit ab9ab996a0d138b35ccdc57308cd79661e86caca
+Subproject commit 407274a25de40653457bdb42e7bfc4dc63296d2e
diff --git a/crawl-ref/source/contrib/pcre b/crawl-ref/source/contrib/pcre
index c0cd354..cb88052 160000
--- a/crawl-ref/source/contrib/pcre
+++ b/crawl-ref/source/contrib/pcre
@@ -1 +1 @@
-Subproject commit c0cd3541a00c6d52f6c3a6adf09a7eb0b49a943f
+Subproject commit cb88052a7bec9b1b6dc073240bbd9b21bdfec1d9
diff --git a/crawl-ref/source/contrib/sdl b/crawl-ref/source/contrib/sdl
index 822a498..91273ad 160000
--- a/crawl-ref/source/contrib/sdl
+++ b/crawl-ref/source/contrib/sdl
@@ -1 +1 @@
-Subproject commit 822a49888f4a4060594e272640faac462953ce1e
+Subproject commit 91273adcdc04ed63f0e074c7577c3e6d9c548aa2
diff --git a/crawl-ref/source/contrib/sdl-image b/crawl-ref/source/contrib/sdl-image
index 87742fb..dad022b 160000
--- a/crawl-ref/source/contrib/sdl-image
+++ b/crawl-ref/source/contrib/sdl-image
@@ -1 +1 @@
-Subproject commit 87742fb4b89112ec1303764558d08b4dcee3797a
+Subproject commit dad022ba67caf79688bad7ae8e76daa910d9bf2a
diff --git a/crawl-ref/source/contrib/sqlite b/crawl-ref/source/contrib/sqlite
index 61f3f02..a531968 160000
--- a/crawl-ref/source/contrib/sqlite
+++ b/crawl-ref/source/contrib/sqlite
@@ -1 +1 @@
-Subproject commit 61f3f02f2cc35d9a89303f6765c7bf9331345165
+Subproject commit a531968dda20c3614f03b26ce1c439598c04e7d0
diff --git a/crawl-ref/source/contrib/zlib b/crawl-ref/source/contrib/zlib
index e665c9c..5edbfd6 160000
--- a/crawl-ref/source/contrib/zlib
+++ b/crawl-ref/source/contrib/zlib
@@ -1 +1 @@
-Subproject commit e665c9ce1e4c32efa5f6c34b5786f0dd2bb5d628
+Subproject commit 5edbfd64ac2d040f544715c97cc855ae04b171d4


-- 
Dungeon Crawl Stone Soup