Derek S. Ray af5ed436b8 Merge branch 'master' into derek-farming ...

* master: (160 commits)
  Add doors correctly
  bug fixes for nhsub
  Generate oracle monsters after subroom
  Generate minetown guards after subrooms
  ...

Conflicts:
	src/do.c
	src/files.c
	src/hack.c
	src/mon.c
	src/vision.c

2015-04-01 17:40:25 -04:00

16 KiB

Raw Blame History

View Raw