summaryrefslogtreecommitdiffstats
path: root/crawl-ref
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into wizlabJude Brown2009-12-3078-332/+1289
|\
| * Don't create name.tdl files in non-tiles builds.Enne Walker2009-12-291-7/+0
| * Readjust Ilsuiw's minivault.Darshan Shaligram2009-12-301-9/+10
| * Change scorpion to yellow (N78291), 052 glyph settings (jpeg).Jude Brown2009-12-302-1/+32
| * Remove shoal decoy huts. The rune huts are now also used as decoys, with the ...Darshan Shaligram2009-12-304-31/+27
| * Add a Shoal:$ Ilsuiw minivault to (almost) guarantee her showing up on Shoal:...Darshan Shaligram2009-12-301-0/+20
| * headers: fix inconsistent struct/class forward declarationsSteven Noonan2009-12-2913-14/+14
| * message.h: remove superfluous semicolonSteven Noonan2009-12-291-1/+1
| * store.{cc,h}: remove pointless special case for MSVCSteven Noonan2009-12-292-91/+2
| * Give Shoals huts a guard of shoals monsters, remove plants from Shoals random...Darshan Shaligram2009-12-303-15/+11
| * Give boss merfolk small bands of regular merfolk as lackeys.Darshan Shaligram2009-12-304-5/+57
| * Fix grouping of monster names in wizmode &"Darshan Shaligram2009-12-301-2/+15
| * Move the giant spore tile into the fungi_plants subfolder.Johanna Ploog2009-12-292-0/+2
| * Remove the statue tiles predating the weapon overlays.Johanna Ploog2009-12-297-0/+0
| * And use it for the non-vinecovered statue tiles.Johanna Ploog2009-12-291-1/+1
| * Add a mage statue overlay including a wizard hat.Johanna Ploog2009-12-291-0/+0
| * Cleanup animated statues' weapon overlays.Johanna Ploog2009-12-297-0/+0
| * More call tide fixes: don't flash view if Ilsuiw is not in LOS, apply tide re...Darshan Shaligram2009-12-302-8/+14
| * Add extra check to prevent Ilsuiw using call tide outside Shoals.Darshan Shaligram2009-12-301-9/+10
| * Change aquamancer -> green, Ilsuiw -> lightgreen, remove aquamancer cold res....Darshan Shaligram2009-12-291-3/+3
| * Merge branch 'shoals++'Darshan Shaligram2009-12-2934-148/+1043
| |\
| | * Give Ilsuiw a more interesting band.Darshan Shaligram2009-12-291-3/+8
| | * Weaken merfolk impalers and javelineers, give sirens and mermaids extra hp, a...Darshan Shaligram2009-12-292-10/+6
| | * Boost Ilsuiw stats and give her Call Tide, which strongly boosts the tide in ...Darshan Shaligram2009-12-2916-34/+169
| | * Add merfolk javelineers to the Shoals, add descriptions for the three new mer...Darshan Shaligram2009-12-296-28/+71
| | * Fix warnings for double->int implicit conversion (Napkin).Darshan Shaligram2009-12-292-6/+8
| | * s/merfolk gladiator/merfolk impaler/Darshan Shaligram2009-12-294-7/+7
| | * s/merfolk elementalist/merfolk aquamancer/ (sorear).Darshan Shaligram2009-12-295-9/+9
| | * Merfolk (water/ice) elementalists join the Shoals guard.Darshan Shaligram2009-12-2922-78/+368
| | * Boost harpy attack damage.Darshan Shaligram2009-12-291-1/+1
| | * Merfolk gladiators join the Shoals party.Darshan Shaligram2009-12-294-1/+61
| | * Generalise shopping-list-disable-check to need_save; fixes crashes on arena.Darshan Shaligram2009-12-291-1/+1
| | * Experimental kraken adjustments.Darshan Shaligram2009-12-296-12/+37
| | * Place clumps of plants on Shoals levels.Darshan Shaligram2009-12-283-13/+352
| * | Make clarity allow intentional berserk.Adam Borowski2009-12-296-13/+13
| * | Give tier 3 (= long blade) stabbing bonuses to all 1-handed polearms.Adam Borowski2009-12-291-1/+4
| * | Remove resistances from Ilsuiw that other merfolk lost.Adam Borowski2009-12-291-1/+1
| * | Add light and dark vine-covered statue bases.Jude Brown2009-12-2912-10/+47
* | | Merge branch 'master' into wizlabJude Brown2009-12-291-0/+6
|\| |
| * | Colour-variant "white smoke" tile.Jude Brown2009-12-291-0/+6
* | | Rename clouds to "white fluffiness".Jude Brown2009-12-291-1/+1
* | | Merge branch 'master' into wizlabJude Brown2009-12-2941-136/+317
|\| |
| * | Update Fulsome descriptionStefan O'Rear2009-12-281-1/+1
| * | Fulsome Distillation tweaks (dshaligram)Stefan O'Rear2009-12-282-21/+3
| * | Switch the order of trees and deep sea in enum.h, makes more sense.Johanna Ploog2009-12-291-1/+1
| * | Add two placeholder tiles for trees.Johanna Ploog2009-12-294-0/+5
| * | Move plant and fungi tiles into their own subdirectory.Johanna Ploog2009-12-288-0/+2
| * | Add purge's ballistomycete tiles, thanks!Johanna Ploog2009-12-285-3/+5
| |/
| * Fix shoals tides being arrested on squares with items that cannot be moved to...Darshan Shaligram2009-12-281-4/+5
| * Postprocess shoals levels to fix heightmap for vaults on the level so that th...Darshan Shaligram2009-12-283-20/+83