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
..
2015-03-17 18:44:53 +02:00
2015-03-31 11:46:46 +03:00
2015-03-17 18:45:12 +02:00
2015-03-31 21:40:49 +03:00
2015-03-29 22:12:19 +03:00
2015-03-30 22:12:54 +03:00
2015-03-17 18:45:49 +02:00
2015-03-17 18:47:31 +02:00
2015-03-17 18:46:55 +02:00
2015-03-31 19:07:25 -04:00
2015-03-17 18:47:31 +02:00
2015-03-29 22:12:19 +03:00
2015-03-29 22:12:19 +03:00
2015-04-01 16:09:53 +03:00
2015-03-17 18:46:53 +02:00
2015-03-17 18:45:12 +02:00
2015-03-28 13:32:24 +02:00
2015-03-29 22:12:19 +03:00
2015-04-01 17:40:25 -04:00
2015-03-31 08:36:36 +03:00
2015-03-17 18:46:35 +02:00
2015-03-29 17:45:45 +03:00
2015-03-29 22:12:19 +03:00
2015-03-17 18:46:45 +02:00
2015-03-18 18:57:52 +02:00
2015-03-30 17:09:12 +03:00
2015-03-29 22:12:19 +03:00
2015-03-18 22:05:10 +02:00
2015-03-17 18:46:17 +02:00
2015-03-18 22:05:10 +02:00
2015-03-17 18:46:08 +02:00
2015-04-01 17:40:25 -04:00
2015-03-23 11:42:36 -04:00
2015-04-01 17:40:25 -04:00
2015-04-01 16:38:56 +03:00
2015-03-29 17:32:12 -04:00
2015-03-17 18:47:31 +02:00
2015-03-17 18:47:28 +02:00
2015-03-31 18:32:23 +03:00
2015-03-27 00:21:40 -07:00
2015-03-17 18:46:45 +02:00
2015-03-29 22:12:19 +03:00
2015-03-17 18:47:10 +02:00
2015-03-29 22:12:19 +03:00
2015-03-17 18:46:23 +02:00
2015-03-17 18:52:42 +02:00
2015-03-17 18:45:12 +02:00
2015-04-01 16:09:53 +03:00
2015-03-25 17:23:59 -04:00
2015-03-31 08:36:36 +03:00
2015-04-01 17:40:25 -04:00
2015-03-17 18:45:56 +02:00
2015-03-17 18:46:35 +02:00
2015-03-23 23:13:53 -04:00
2015-03-17 18:46:23 +02:00
2015-03-17 18:46:01 +02:00
2015-03-18 22:05:10 +02:00
2015-03-17 18:47:16 +02:00
2015-03-25 22:13:28 +02:00
2015-03-20 11:37:50 -04:00
2015-03-29 17:32:12 -04:00
2015-03-30 22:12:54 +03:00
2015-03-31 12:59:48 +03:00
2015-03-29 22:12:19 +03:00
2015-03-17 18:46:45 +02:00
2015-03-29 22:12:19 +03:00
2015-03-31 08:36:36 +03:00
2015-03-29 19:10:46 -04:00
2015-03-29 22:12:19 +03:00
2015-03-17 18:46:17 +02:00
2015-03-17 18:47:31 +02:00
2015-03-31 08:36:36 +03:00
2015-03-17 18:46:17 +02:00
2015-03-17 18:45:12 +02:00
2015-03-31 08:36:36 +03:00
2015-03-17 18:46:23 +02:00
2015-03-17 18:47:31 +02:00
2015-03-17 18:47:39 +02:00
2015-03-18 22:05:10 +02:00
2015-03-27 23:34:13 +02:00
2015-03-17 18:47:31 +02:00
2015-03-17 18:46:23 +02:00
2015-03-17 18:47:01 +02:00
2015-03-29 22:12:19 +03:00
2015-04-01 23:01:25 +03:00
2015-04-01 16:38:56 +03:00
2015-03-29 22:12:19 +03:00
2015-03-17 18:46:17 +02:00
2015-03-31 18:14:16 +03:00
2015-03-17 18:47:31 +02:00
2015-03-29 22:12:19 +03:00
2015-04-01 16:09:53 +03:00
2015-03-17 18:45:12 +02:00
2015-04-01 16:09:53 +03:00
2015-03-30 22:12:54 +03:00
2015-03-29 22:12:19 +03:00
2015-03-17 18:46:23 +02:00
2015-03-17 18:45:12 +02:00
2015-04-01 17:40:25 -04:00
2015-03-17 18:46:49 +02:00
2015-03-17 18:45:12 +02:00
2015-03-22 18:11:49 -04:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-17 18:45:12 +02:00
2015-03-30 22:12:54 +03:00
2015-03-17 18:45:12 +02:00
2015-03-31 00:13:20 -07:00