summaryrefslogtreecommitdiffstats
path: root/crawl-ref
Commit message (Collapse)AuthorAgeFilesLines
* Xcode: enable SQLite in Xcode builds, fix preprocessor macrosSteven Noonan2009-10-021-18/+22
| | | | | | | | | | | | | | | | | | | | - SQLite wasn't enabled in Xcode, but it worked fine for builds with makefile.unix. Now it's enabled and it works fantastically. - The preprocessor macros for each of the configurations for the Crawl Tiles target were wrong. Now set to inherit from project properties instead, adding only USE_TILE and CLUA_BINDINGS for all targets. - Optimization is enabled in the Development configuration now, as I figure most development will be done only on the native machine architecture, but optimization will be fine unless there's a bizarre bug that requires a complete lack of optimizations (which is what the Debug build is really for anyway). Signed-off-by: Steven Noonan <steven@uplinklabs.net>
* Add spell messages for Airstrike, to avoid "INVALID BEAM" messages.David Lawrence Ramsey2009-10-011-0/+8
|
* tilesdl.cc: fix segfault caused by negative Y-valueSteven Noonan2009-10-011-1/+1
| | | | | | | | | | | | | | | In my case, the cause was a crawlrc with these values: view_max_width=80 view_max_height=70 I did a USE_TILE build, ran it, and the value of crawl_view.msgsz.y became negative, causing a rather nasty segfault later in initialization. I'm pretty sure that using 'std::max' here is not the best solution, but it at least avoids the negative number case. Signed-off-by: Steven Noonan <steven@uplinklabs.net>
* Add minor cosmetic fixes.David Lawrence Ramsey2009-10-011-4/+5
|
* Replace extraneous tabs with spaces.David Lawrence Ramsey2009-10-014-22/+24
|
* food.cc, religion.cc: remove merge conflict markersSteven Noonan2009-10-012-8/+0
| | | | Signed-off-by: Steven Noonan <steven@uplinklabs.net>
* Fix compilation (oops).David Lawrence Ramsey2009-10-012-0/+8
|
* Clean up the Kiku changes a bit.David Lawrence Ramsey2009-10-014-59/+73
|
* Applying Kiku patch by Alex MacDonald (timecircuits). Kiku now has an ↵evktalo2009-10-0210-76/+303
| | | | | | | | invocation to provide corpses, provides (partial) torment resistance, provides torment when butchering while praying, and gifts Necromancy books. As the final gift, the player can choose between blessing the wielded weapon with Pain brand, or Necronomicon. Flavour and help texts haven't been altered yet. Signed-off-by: evktalo <evktalo@users.sourceforge.net>
* Fix debug build where OSX is not #defined.Darshan Shaligram2009-10-011-2/+1
|
* Version -> 0.6Darshan Shaligram2009-10-011-1/+1
|
* Update changelog.David Lawrence Ramsey2009-10-011-0/+1
|
* Allow spectral things to take stairs again, to make Death Channel moreDavid Lawrence Ramsey2009-10-013-7/+9
| | | | useful.
* Disallow zombification of (very) ugly things, as there's no easy way toDavid Lawrence Ramsey2009-10-011-2/+2
| | | | | preserve their attack type in that state, as we do with other zombified monsters.
* Update credits (Mikko)Darshan Shaligram2009-10-011-25/+25
|
* Harden the PRNG for public servers.Mikko Juola2009-10-017-3/+315
| | | | | | Detailed discussion is here: http://www.genodeen.net/index.clua?cwrng Signed-off-by: Darshan Shaligram <dshaligram@users.sourceforge.net>
* Reduce weight of large rocks, from 600 to 400.David Ploog2009-10-011-1/+1
|
* Disallow rotations for most bailey maps. (Zaba)David Ploog2009-10-011-3/+3
|
* Add minor cosmetic fixes.David Lawrence Ramsey2009-09-301-2/+2
|
* Add spacing fix.David Lawrence Ramsey2009-09-301-1/+1
|
* Add wording fix.David Lawrence Ramsey2009-09-301-1/+1
|
* Add minor cosmetic fixes.David Lawrence Ramsey2009-09-302-7/+10
|
* domake.sh: use a better check for BSD make vs GNU makeSteven Noonan2009-09-301-1/+3
| | | | | | | Apparently BSD make returns an error code if you use '--version'. GNU make simply gives the version information and returns 0. Signed-off-by: Steven Noonan <steven@uplinklabs.net>
* Added Sandblast to the list of Vehumet-boosted spells. Tweaked int ↵evktalo2009-09-302-18/+11
| | | | | | spell_range accordingly. (thanks amacleod) Also forgot to thank rob for co-hacking the Vehumet check. Signed-off-by: evktalo <evktalo@users.sourceforge.net>
* Clean up includes a bit.David Lawrence Ramsey2009-09-302-9/+7
|
* Merge branch 'master' of ↵David Lawrence Ramsey2009-09-305-5/+18
|\ | | | | | | ssh://crawl-ref.git.sourceforge.net/gitroot/crawl-ref/crawl-ref
| * Generalize the check for Vehumet supported spells. Add Shatter and Lee's ↵evktalo2009-09-305-5/+18
| | | | | | | | | | | | Rapid Deconstruction (SPELL_FRAGMENTATION) to the list. Signed-off-by: evktalo <evktalo@users.sourceforge.net>
* | Clean up fungal_bloom()'s zombie decay/ghoul-type monster destructionDavid Lawrence Ramsey2009-09-301-14/+6
|/ | | | routines a bit.
* Add wording fix.David Lawrence Ramsey2009-09-301-1/+1
|
* Ignore UNIX makefile dependencies file (mafefile.dep) and Emacs/vimMatthew Cline2009-09-301-0/+3
| | | | backup files (*~).
* Merge branch 'master' of ↵evktalo2009-09-3010-10/+52
|\ | | | | | | ssh://crawl-ref.git.sourceforge.net/gitroot/crawl-ref/crawl-ref
| * Revert "util/*/Makefile: allow compiler selection on command-line"Steven Noonan2009-09-302-2/+2
| | | | | | | | | | | | | | | | This reverts commit 4be2bf2502f892afebbb0ea51d621556c0e88019. For some reason, CC is defined by GNU make by default. Signed-off-by: Steven Noonan <steven@uplinklabs.net>
| * Revert "makefiles: set CXX variable only if not overridden on command-line"Steven Noonan2009-09-303-3/+3
| | | | | | | | | | | | | | | | This reverts commit 72068573977f6c562a7a0928ba37a16172a57b13. For some reason, CXX is defined by GNU make by default. Signed-off-by: Steven Noonan <steven@uplinklabs.net>
| * files.cc, newgame.cc: support savegame paths with spaces in themSteven Noonan2009-09-302-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For instance, on Mac OS X, we save to this path: ~/Library/Application Support/Dungeon Crawl Stone Soup But if we just pass this path to an external program via system() without doing anything to it, the app assumes that spaces are intended to indicate separate parameters. We have to escape the paths in one of two ways. UNIX (backslashes): ~/This\ Crappy\ Path\ Has\ Spaces\ In\ It or Windows (doublequotes): "C:\This Crappy Path Has Spaces In It" Signed-off-by: Steven Noonan <steven@uplinklabs.net>
| * Xcode: add AppHdr.h to project for easy accessSteven Noonan2009-09-301-0/+2
| | | | | | | | Signed-off-by: Steven Noonan <steven@uplinklabs.net>
| * libutil.cc: add escape_path_spaces()Steven Noonan2009-09-302-0/+32
| | | | | | | | | | | | | | | | Spaces need to be escaped in any system() calls, so we have this simple function which escapes spaces with either doublequotes (Windows style) or backslashes (UNIX style). Signed-off-by: Steven Noonan <steven@uplinklabs.net>
* | Vehumet modifications. Remove the warding effect, replace it with extended ↵Charles Otto2009-09-306-20/+34
|/ | | | | | | | range for conjurations spells. Starting at **** piety reduce the cost of high level (>=5) conjurations and summonings spells by 1. (Additional wording tweaks by Eino) Signed-off-by: evktalo <evktalo@users.sourceforge.net>
* Lua updated to v5.1.4Steven Noonan2009-09-2964-655/+1077
| | | | | | | | | | | | | | | | | | | | | | | | Worth noting that this was done as follows, to preserve the project-specific changes we've made: wget http://www.lua.org/ftp/lua-5.1.2.tar.gz wget http://www.lua.org/ftp/lua-5.1.4.tar.gz tar -xzf lua-5.1.2.tar.gz tar -xzf lua-5.1.4.tar.gz cd lua-5.1.2 git init git add . git commit -sv -m "Lua 5.1.2" rsync --exclude .git ../lua-5.1.4/. . git commit -asv -m "Lua 5.1.4" git checkout -b patched-version HEAD~1 rsync --exclude .git ~/Development/crawl-ref/crawl-ref/source/util/lua/. . git commit -asv -m "patched" git rebase master And voila, we've rebased our patches with the latest Lua! Signed-off-by: Steven Noonan <steven@uplinklabs.net>
* Mac OS X: use SQLite on Mac OS X buildsSteven Noonan2009-09-292-4/+243
| | | | | | There's no reason not to. Signed-off-by: Steven Noonan <steven@uplinklabs.net>
* util/sqlite: update from v3.3.16 to v3.6.18Steven Noonan2009-09-292-30857/+78647
| | | | | | Why has a two year old sqlite been used this long? Signed-off-by: Steven Noonan <steven@uplinklabs.net>
* AppHdr.h: fix "already defined" macro warnings on OSX and FREEBSDSteven Noonan2009-09-291-0/+4
| | | | | | | If you specify OSX as a macro, it shouldn't cause the compiler to throw a warning. Signed-off-by: Steven Noonan <steven@uplinklabs.net>
* Xcode: rename non-USE_TILE app bundleSteven Noonan2009-09-291-12/+12
| | | | | | | Just calling it "Crawl.app" doesn't tell how it's different from "Dungeon Crawl Stone Soup.app". Signed-off-by: Steven Noonan <steven@uplinklabs.net>
* Fix makefile.obj reference to 'Kills.o'Steven Noonan2009-09-291-1/+1
| | | | Signed-off-by: Steven Noonan <steven@uplinklabs.net>
* Fix projects referencing 'Kills.cc' to reference 'kills.cc'Steven Noonan2009-09-293-8/+8
| | | | Signed-off-by: Steven Noonan <steven@uplinklabs.net>
* Move 'FixAry.h' -> 'fixary.h', 'FixVec.h' -> 'fixvec.h' for file naming ↵Steven Noonan2009-09-2914-17/+17
| | | | | | consistency Signed-off-by: Steven Noonan <steven@uplinklabs.net>
* move 'Kills.h' -> 'kills.h', 'Kills.cc' -> 'kills.cc' for file naming ↵Steven Noonan2009-09-2923-28/+28
| | | | | | consistency Signed-off-by: Steven Noonan <steven@uplinklabs.net>
* Merge branch 'master' of ↵David Lawrence Ramsey2009-09-291-0/+6
|\ | | | | | | ssh://crawl-ref.git.sourceforge.net/gitroot/crawl-ref/crawl-ref
| * gitignore: ignore folders and symlinks created by dolinks.shSteven Noonan2009-09-291-0/+5
| | | | | | | | Signed-off-by: Steven Noonan <steven@uplinklabs.net>
| * gitignore: add dat/tiles/gui.png to ignore listSteven Noonan2009-09-291-0/+1
| | | | | | | | Signed-off-by: Steven Noonan <steven@uplinklabs.net>
* | Since miasma is no longer tied to negative energy, death drakesDavid Lawrence Ramsey2009-09-292-2/+2
|/ | | | shouldn't be evil.