diff options
| author | pubby <pubby8@gmail.com> | 2013-08-31 16:40:44 -0500 |
|---|---|---|
| committer | pubby <pubby8@gmail.com> | 2013-08-31 16:49:50 -0500 |
| commit | 65c58ed6ccd53a9a080255ee37e131123ac65e96 (patch) | |
| tree | d4a3d59267fa5c14ae7573b91f7dac9b66955159 /crawl-ref/source/rltiles/player | |
| parent | c4b51221cd6f40f90127768df0e2e1ad7ed7310e (diff) | |
| parent | 70ca29ee15926336c0ab2369cb25743a9e510e08 (diff) | |
| download | crawl-ref-65c58ed6ccd53a9a080255ee37e131123ac65e96.tar.gz crawl-ref-65c58ed6ccd53a9a080255ee37e131123ac65e96.zip | |
Merge branch 'master' into dwants
Conflicts:
crawl-ref/docs/crawl_manual.reST
crawl-ref/source/abl-show.cc
crawl-ref/source/dat/descript/ability.txt
crawl-ref/source/delay.cc
crawl-ref/source/enum.h
crawl-ref/source/main.cc
crawl-ref/source/mon-cast.cc
crawl-ref/source/mon-gear.cc
crawl-ref/source/mon-spll.h
crawl-ref/source/mutation-data.h
crawl-ref/source/mutation.cc
crawl-ref/source/ng-restr.cc
crawl-ref/source/ng-setup.cc
crawl-ref/source/output.cc
crawl-ref/source/player-act.cc
crawl-ref/source/player.cc
crawl-ref/source/species.cc
crawl-ref/source/spl-data.h
crawl-ref/source/wiz-you.cc
Diffstat (limited to 'crawl-ref/source/rltiles/player')
12 files changed, 0 insertions, 0 deletions
diff --git a/crawl-ref/source/rltiles/player/base/gargoyle_f.png b/crawl-ref/source/rltiles/player/base/gargoyle_f.png Binary files differnew file mode 100644 index 0000000000..b6b7b1ba53 --- /dev/null +++ b/crawl-ref/source/rltiles/player/base/gargoyle_f.png diff --git a/crawl-ref/source/rltiles/player/base/gargoyle_m.png b/crawl-ref/source/rltiles/player/base/gargoyle_m.png Binary files differnew file mode 100644 index 0000000000..3a88be0650 --- /dev/null +++ b/crawl-ref/source/rltiles/player/base/gargoyle_m.png diff --git a/crawl-ref/source/rltiles/player/hand1/artefact/doom_knight.png b/crawl-ref/source/rltiles/player/hand1/artefact/doom_knight.png Binary files differindex 65244eecda..530653060f 100644 --- a/crawl-ref/source/rltiles/player/hand1/artefact/doom_knight.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/doom_knight.png diff --git a/crawl-ref/source/rltiles/player/hand1/artefact/flaming_death.png b/crawl-ref/source/rltiles/player/hand1/artefact/flaming_death.png Binary files differindex 7a95207bf5..3f4f5dc52c 100644 --- a/crawl-ref/source/rltiles/player/hand1/artefact/flaming_death.png +++ b/crawl-ref/source/rltiles/player/hand1/artefact/flaming_death.png diff --git a/crawl-ref/source/rltiles/player/hand1/axe_executioner.png b/crawl-ref/source/rltiles/player/hand1/axe_executioner.png Binary files differindex 70fc123c05..5afaed1464 100644 --- a/crawl-ref/source/rltiles/player/hand1/axe_executioner.png +++ b/crawl-ref/source/rltiles/player/hand1/axe_executioner.png diff --git a/crawl-ref/source/rltiles/player/hand1/axe_executioner2.png b/crawl-ref/source/rltiles/player/hand1/axe_executioner2.png Binary files differindex 8c462ee814..348df9deb8 100644 --- a/crawl-ref/source/rltiles/player/hand1/axe_executioner2.png +++ b/crawl-ref/source/rltiles/player/hand1/axe_executioner2.png diff --git a/crawl-ref/source/rltiles/player/hand1/flail_spike.png b/crawl-ref/source/rltiles/player/hand1/flail_spike.png Binary files differdeleted file mode 100644 index 1e005e5780..0000000000 --- a/crawl-ref/source/rltiles/player/hand1/flail_spike.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/player/hand1/flail_spike2.png b/crawl-ref/source/rltiles/player/hand1/flail_spike2.png Binary files differdeleted file mode 100644 index 3e27429cda..0000000000 --- a/crawl-ref/source/rltiles/player/hand1/flail_spike2.png +++ /dev/null diff --git a/crawl-ref/source/rltiles/player/hand1/giant_club_spike_slant.png b/crawl-ref/source/rltiles/player/hand1/giant_club_spike_slant.png Binary files differindex bc067481eb..2c1977933c 100644 --- a/crawl-ref/source/rltiles/player/hand1/giant_club_spike_slant.png +++ b/crawl-ref/source/rltiles/player/hand1/giant_club_spike_slant.png diff --git a/crawl-ref/source/rltiles/player/hand1/great_mace.png b/crawl-ref/source/rltiles/player/hand1/great_mace.png Binary files differindex c396d92f2d..9d4cb129b7 100644 --- a/crawl-ref/source/rltiles/player/hand1/great_mace.png +++ b/crawl-ref/source/rltiles/player/hand1/great_mace.png diff --git a/crawl-ref/source/rltiles/player/hand1/great_mace2.png b/crawl-ref/source/rltiles/player/hand1/great_mace2.png Binary files differindex 1a291fbb6b..ea6a8d7bf0 100644 --- a/crawl-ref/source/rltiles/player/hand1/great_mace2.png +++ b/crawl-ref/source/rltiles/player/hand1/great_mace2.png diff --git a/crawl-ref/source/rltiles/player/transform/spider_form.png b/crawl-ref/source/rltiles/player/transform/spider_form.png Binary files differindex d42affd9e7..505105344d 100644 --- a/crawl-ref/source/rltiles/player/transform/spider_form.png +++ b/crawl-ref/source/rltiles/player/transform/spider_form.png |
