nhmall
ca84486133
clean master after moving of newer content to feature branch
2018-12-10 22:16:08 -05:00
nhmall
1ee4b34d33
Merge branch 'NetHack-3.6.2'
2018-11-30 20:25:40 -05:00
nhmall
385a9963d4
Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2
2018-11-29 21:08:28 -05:00
nhmall
3db1e42dc8
dungeoneers update - Karl Garrison
2018-11-28 21:46:52 -05:00
nhmall
a0b53ee391
merge
2018-11-11 10:29:52 -05:00
nhmall
adbe567ba1
Merge branch 'NetHack-3.6.2'
2018-11-10 15:09:41 -05:00
keni
8556613408
Add missing control file.
2018-11-10 14:45:50 -05:00
nhmall
1ac064f03f
Merge branch 'NetHack-3.6.2'
2018-09-28 20:01:41 -04:00
nhmall
141ddb98dc
Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2
2018-09-28 20:01:08 -04:00
Patric Mueller
f87931a7bf
fix typo of the Junethack tournament
2018-09-27 22:14:28 +02:00
PatR
e0b7d2f5a9
monpolycontrol, wizdebug_*
...
Demote #monpolycontrol and #wizdebug_traveldisplay from commands to
simple boolean options. The former has the same name, the latter
is called travel_debug. Rename #wizdebug_bury to #wizbury; it
shouldn't matter that it goes away when compiled without DEBUG.
There are now five wizard-mode boolean options: monpolycontrol,
sanity_check, and wizweight are documented in the Guidebook;
menu_tab_sep and travel_debug are commented out there.
Guidebook.mn has been tested; Guidebook.tex has not.
2018-09-26 18:40:13 -07:00
nhmall
3c25703576
Merge branch 'NetHack-3.6.2'
2018-09-26 17:39:20 -04:00
nhmall
a2d7722472
Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2
2018-09-26 17:38:39 -04:00
nhmall
22d69d2424
update tournament reference
2018-09-24 15:59:38 -04:00
nhmall
96304908fd
Merge branch 'NetHack-3.6.2'
2018-09-21 16:41:00 -04:00
nhmall
a6ff1147ac
Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2
2018-09-21 16:40:28 -04:00
nhmall
a18ae517f8
some orctown follow-up bits, fix Bad fruit #0 and some minor tuning
2018-09-21 11:31:01 -04:00
nhmall
b286ed510a
Merge branch 'NetHack-3.6.2'
2018-09-20 18:45:37 -04:00
nhmall
2ea332544b
Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2
2018-09-20 18:45:08 -04:00
nhmall
672e28d294
Merge branch 'fix-grammar-and-punctuation' of https://github.com/mogigoma/NetHack into mogigoma-fix-grammar-and-punctuation
2018-09-20 18:01:32 -04:00
Mak Kolybabi
9c46a26af4
Grammar and punctuation fixes.
2018-09-19 22:48:43 -05:00
nhmall
647b671c76
some data.base bits
...
Take some of the entries from the github pull request.
resolves #35
2018-09-19 23:30:19 -04:00
Mak Kolybabi
0500040427
Fix spelling and capitalization issues in dat and DEVEL.
2018-09-19 16:55:43 -05:00
nhmall
6f4b2ffbad
Merge branch 'NetHack-3.6.2'
2018-08-16 08:01:22 -04:00
nhmall
4eaf09bdd0
Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2
2018-08-16 07:58:57 -04:00
PatR
3774cb29f3
quest message typo
...
Remove an extra space from Val 00021.
This does not address github issue #124 where the extra space shown
on the message line is the result of combining two separate plines
rather than coming from the data.
2018-08-12 17:02:12 -07:00
nhmall
29b43ca682
Merge branch 'NetHack-3.6.2'
2018-08-03 06:24:44 -04:00
nhmall
3da11775c4
Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2
2018-08-03 06:24:13 -04:00
PatR
4dabfb5c3c
fix github issue #120 - quest message typo
...
Fixes #120
The one-line summary [for inclusion in message history] of the priest
quest's block message when bringing the quest artifact back to leader
misspelled "congratulations".
2018-08-01 17:39:02 -07:00
nhmall
6585b58c57
Merge branch 'NetHack-3.6.2'
2018-06-11 16:36:27 -04:00
keni
0e51afc7cd
update Files attributes with priorities and %s substitution
2018-05-31 21:42:06 -04:00
keni
e7b901419b
Merge branch 'NetHack-3.6.2' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.6.2
2018-05-29 19:31:18 -04:00
keni
9858f69fa8
update .gitattributes files for auto-generation of Files
2018-05-29 19:28:26 -04:00
nhmall
82afd4b17c
Merge branch 'NetHack-3.6.2'
2018-05-27 21:32:11 -04:00
nhmall
d9975e5afc
Revert "update some history"
...
This reverts commit 61bf743fb1 .
2018-05-27 11:50:57 -04:00
nhmall
ced7ebafec
Merge branch 'NetHack-3.6.2'
2018-05-26 19:02:43 -04:00
nhmall
61bf743fb1
update some history
2018-05-26 18:23:19 -04:00
nhmall
0e2555881a
Merge branch 'NetHack-3.6.0'
2018-04-25 18:15:49 -04:00
nhmall
5101b9efb8
Update some dates and comment out BETA
2018-04-25 17:11:28 -04:00
keni
0f58af6f37
add missing copyright info
2018-04-25 16:54:50 -04:00
keni
09502df9f1
force expand unexpanded substitution variables
2018-04-25 15:36:11 -04:00
keni
11f1983253
update .gitattributes files for substitution and copyright headers
2018-04-25 14:52:43 -04:00
nhmall
df7d10bec8
Merge branch 'NetHack-3.6.0'
2018-04-23 21:41:06 -04:00
nhmall
d420d8073d
update some old version references
2018-04-21 18:05:46 -04:00
nhmall
12e65cde47
history paragraph sync with Guidebook
2018-04-19 22:43:21 -04:00
keni
6cf611cbc7
Merge remote-tracking branch 'origin/NetHack-3.6.0'
...
(required manual merge in include/config.h)
2018-04-15 13:50:59 -04:00
PatR
5054e7154b
dat/history formatting
...
A bunch of trailing spaces crept in with the most recent udpate;
remove them. Also, most sentences are separated from each other by
two spaces, but 2 or 3 had only one space. Also, rewrap a couple of
the widest lines although none of them were too wide for displaying
within 80 columns.
2018-04-14 12:19:23 -07:00
nhmall
297fb5522e
updated
2018-04-07 08:58:35 -04:00
Pasi Kallinen
c15546585a
Update opthelp
2018-04-03 18:42:04 +03:00
keni
6afb3ead34
Merge remote-tracking branch 'origin/NetHack-3.6.0'
2018-03-10 19:14:11 -05:00