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
..
2002-01-05 21:05:59 +00:00
2015-03-31 09:50:02 -04:00
2002-01-05 21:05:57 +00:00
2009-05-11 22:53:51 +00:00
2009-05-11 22:53:51 +00:00
2015-03-17 18:45:12 +02:00
2015-03-21 20:37:44 +02:00
2015-03-21 20:37:44 +02:00
2015-03-21 20:37:44 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:43 +02:00
2015-03-17 18:45:12 +02:00
2015-03-25 22:35:24 -04:00
2015-03-17 18:46:41 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:43 +02:00
2015-03-17 18:45:12 +02:00
2002-01-05 21:05:58 +00:00
2002-01-05 21:05:58 +00:00
2015-03-17 18:46:39 +02:00
2015-03-17 18:45:43 +02:00