summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--crawl-ref/CREDITS.txt49
-rw-r--r--crawl-ref/INSTALL.txt3
-rw-r--r--crawl-ref/docs/aptitudes.txt2
-rw-r--r--crawl-ref/docs/patch_guide.txt4
-rw-r--r--crawl-ref/source/dat/database/FAQ.txt2
-rw-r--r--crawl-ref/source/spl-cast.cc5
6 files changed, 37 insertions, 28 deletions
diff --git a/crawl-ref/CREDITS.txt b/crawl-ref/CREDITS.txt
index 225e0e6d19..75a794d976 100644
--- a/crawl-ref/CREDITS.txt
+++ b/crawl-ref/CREDITS.txt
@@ -15,28 +15,29 @@ Enne Walker) would like to thank:
We'd also like to thank members of the Dungeon Crawl community who have
contributed to Dungeon Crawl Stone Soup:
-Warwick Allison R. Dan Henry Dylan O'Donnell
-Juha Arpiainen Benoit Hudson Stefan O'Rear
-Roy Axenov Iainuki Yuuma Oohara
-Max Bane Ilyak Erik Piper
-Bill Beher Mitsuhiro Itakura Lemuel Pitkin
-Alexander Beisig Eino Keskitalo Derek Ray
-Erik Inge Bolsø Jarmo Kielosto Remsleep
-Peter Borgmann Kornel Kisielewicz David Rose
-Adam Borowski Vambola Kotkas Sebastian Salman
-Trent W. Buck Vsevolod Kozlov Brett Scarborough
-Terje Bø Ryan Kusnery Darshan Shaligram
-Aaron Curtis Jukka Kuusisto Robert Shimmin
-Denzi Maciej Lapinski Sigurd
-Rachel Elizabeth Dillon Jordan Lewis Edgar Simo
-Mike Drinen Icy Lich Solf
-Kieron Dunbar Jesse Luehrs Johan Strandell
-Christopher Evenstar Markus Maier Roman Sêk
-Ben Goetter Arien Malec Marc H. Thoben
-Rob Grant Shawn M Moore Matt Titus
-John Greenberg Eva Myers Robert Vollmert
-GreyKnight Wille Mäntylä Steven Wheeler
-Shayne Halvorson Onia Ninara Jeremey Wilson
-Ciaran Hamilton Erkki Nurmi Yelve Yakut
-Chris Hamons nyra Zooko
+Warwick Allison Benoit Hudson Stefan O'Rear
+Juha Arpiainen Iainuki Yuuma Oohara
+Roy Axenov Ilyak Erik Piper
+Max Bane Mitsuhiro Itakura Lemuel Pitkin
+Bill Beher Eino Keskitalo Derek Ray
+Alexander Beisig Jarmo Kielosto Remsleep
+Erik Inge Bolsø Kornel Kisielewicz David Rose
+Peter Borgmann Vambola Kotkas Sebastian Salman
+Adam Borowski Vsevolod Kozlov Brett Scarborough
+Trent W. Buck Ryan Kusnery Darshan Shaligram
+Terje Bø Jukka Kuusisto Robert Shimmin
+Aaron Curtis Maciej Lapinski Sigurd
+Denzi Jordan Lewis Edgar Simo
+Rachel Elizabeth Dillon Icy Lich Solf
+Mike Drinen Jesse Luehrs Johan Strandell
+Kieron Dunbar Markus Maier Roman Sêk
+Christopher Evenstar Arien Malec Marc H. Thoben
+Ben Goetter Shawn M Moore Matt Titus
+Rob Grant Eva Myers Robert Vollmert
+John Greenberg Wille Mäntylä Steven Wheeler
+GreyKnight Onia Ninara Jeremey Wilson
+Shayne Halvorson Erkki Nurmi Yelve Yakut
+Ciaran Hamilton Mattias Nyberg Zooko
+Chris Hamons nyra
+R. Dan Henry Dylan O'Donnell
diff --git a/crawl-ref/INSTALL.txt b/crawl-ref/INSTALL.txt
index bc558f1e22..7e085c7c92 100644
--- a/crawl-ref/INSTALL.txt
+++ b/crawl-ref/INSTALL.txt
@@ -34,6 +34,7 @@ If, however, you're having trouble getting a precompiled binary to run:
* Download Stone Soup 0.5.x Tiles binaries for OS X.
* Extract to your Desktop.
* Download Fink 0.9.0.
+ (http://www.finkproject.org/download/index.php?phpLang=en)
* Mount the Fink image.
* Run the Fink installer from the image.
* It will ask for your administrator password. Type it and hit Enter.
@@ -66,7 +67,7 @@ If, however, you're having trouble getting a precompiled binary to run:
The missing PNG error occurs if you try and run the tiles version by
double clicking on it. You actually need to run X11 -> open a terminal
- -> go to the crawl directory -> ./crawl_tiles"
+ -> go to the crawl directory -> ./crawl_tiles
If you still can't get Crawl to run, you can ask for further help on
diff --git a/crawl-ref/docs/aptitudes.txt b/crawl-ref/docs/aptitudes.txt
index 20e08a1c35..2751ae4c02 100644
--- a/crawl-ref/docs/aptitudes.txt
+++ b/crawl-ref/docs/aptitudes.txt
@@ -12,7 +12,7 @@ If you consider figuring out such things yourself to be fun, stop reading
now. Otherwise, just go ahead. The lower a value, the better the aptitude.
100 is the Human standard. Please note that many things affect how quick a
character will actually learn a skill. Thus the numbers below are good
-enough for comparisons among specis, but not necessarily among skills.
+enough for comparisons among species, but not necessarily among skills.
The abbreviations used for the skills are:
diff --git a/crawl-ref/docs/patch_guide.txt b/crawl-ref/docs/patch_guide.txt
index 34679dff84..2ecc4fab2e 100644
--- a/crawl-ref/docs/patch_guide.txt
+++ b/crawl-ref/docs/patch_guide.txt
@@ -125,9 +125,9 @@ out, so I grep the source (*.h and *.cc) for all occurences and have a look
at all files this turns up. And so on.
Evaluating and prioritising the findings takes some experience with the source
-code but even if you have no idea what the files are likely to contain using
+code but even if you have no idea what the files are likely to contain, using
grep still greatly reduces the number of files you have to look at. To find
-the code you're interested in search the files for the same keyword you used
+the code you're interested in, search the files for the same keyword you used
for grepping.
Good luck with your patch! If you have any questions, don't hesitate to ask.
diff --git a/crawl-ref/source/dat/database/FAQ.txt b/crawl-ref/source/dat/database/FAQ.txt
index d4b9771050..40ada1f3e7 100644
--- a/crawl-ref/source/dat/database/FAQ.txt
+++ b/crawl-ref/source/dat/database/FAQ.txt
@@ -131,6 +131,7 @@ type you are already highly skilled with to another one that you have no
skill in is a waste of time. The brands may greatly differ in damage output
but you can get a good idea by bashing a few comparatively harmless
monsters with each and comparing the results.
+
Of the enchantments, the second value (damage) is usually more important
than the first (accuracy) unless you hardly ever manage to hit with a
weapon.
@@ -384,6 +385,7 @@ the next version) online on http://crawl.develz.org, or you can download
Windows binaries from the same site. Note that trunk may be buggy, and that
many changes will invalidate your saved games. If that doesn't bother you,
go ahead and play!
+
Be sure to leave some feedback/suggestions/bug reports on the SourceForge
trackers. When doing so please mention the version (r?????) you're
currently playing in case the bug's already been fixed or the feature
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 1ea11adf47..f9c865450d 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -207,11 +207,16 @@ static bool _spell_no_hostile_in_range(spell_type spell, int minRange)
case SPELL_PROJECTED_NOISE:
case SPELL_CONJURE_FLAME:
case SPELL_DIG:
+
+ // Airstrike has LOS_RANGE and can go through glass walls.
+ case SPELL_AIRSTRIKE:
+
// These bounce and may be aimed elsewhere to bounce at monsters
// outside range (I guess).
case SPELL_SHOCK:
case SPELL_LIGHTNING_BOLT:
return (false);
+
case SPELL_EVAPORATE:
case SPELL_MEPHITIC_CLOUD:
case SPELL_FIREBALL: