Commit Graph

1142 Commits

Author SHA1 Message Date
nhmall
cba260641d Merge branch 'NetHack-3.6.2' 2018-10-27 19:30:23 -04:00
nhmall
b720c36b42 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2018-10-27 19:29:50 -04:00
PatR
bb62ab6fc1 another Guidebook update - mostly NETHACKOPTIONS
Move some 'roff macros from Guidebook.mn to new file tmac.nh.

Header for tmac.nh is not being updated, even after explicitly adding
it to .gitattributes.  I'm not sure what I've done wrong.  (I'm using
'git nhadd doc/' here rather than explicit 'git nhadd doc/tmac.nh'.)

In Guidebook.mn, change the ``setenv NETHACKOPTIONS'' example so that
it fits within one line in Guidebook.txt.  (I looked at 3.4.3's
edition of that file and the example went not just beyond the margin
of the formatted text but beyond 80 columns, so wrapped in an ugly
fashion.)  I had previously changed 'autoquiver' to 'color' to shorten
it, now have changed '!autopickup' to '!leg' to show an example of
truncated option name as well as shorten, and also 'fruit:papaya' to
'fruit:lime' to squeeze out the last two columns needed to fit within
the text margin while retaining 'name:Blue Meanie' as requested.
Guidebook.txt shows both NETHACKOPTIONS examples with indentation
suppressed, Guidebook.ps uses normal indentation (evidently using a
narrower font, even with \f(CR (constant-width Roman) to approximate
TeX's \tt, since the indented example fits fine and looks better).

Some Guidebook.tex catchup.  I suspect that lots of bits and bobs
don't match between Guidebook.mn and Guidebook.tex these days.
Particularly quoting and variant font (italics, bold, \tt) usage.
Also the recently added box around the sample screenshot.  This
modifies the screenshot to match Guidebook.mn's, reflecting change
in status field spacing by STATUS_HILITES.
2018-10-27 00:42:11 -07:00
nhmall
968a958853 Merge branch 'NetHack-3.6.2' 2018-10-25 17:54:37 -04:00
keni
cd3078c8be Remove "makedefs -m" and monstr.c from the Unix build. 2018-10-21 08:45:55 -04:00
nhmall
b25db777aa windows build mods to support branch change
Changes to be committed:
	modified:   sys/winnt/Makefile.gcc
	modified:   sys/winnt/Makefile.msc
	modified:   win/win32/vs2015/NetHack.vcxproj
	modified:   win/win32/vs2015/NetHackW.vcxproj
	modified:   win/win32/vs2015/files.props
	modified:   win/win32/vs2017/NetHack.vcxproj
	modified:   win/win32/vs2017/NetHackW.vcxproj
	modified:   win/win32/vs2017/files.props
2018-10-21 08:45:55 -04:00
keni
17b48480a5 Remove "makedefs -m" and monstr.c from the Unix build. 2018-10-20 23:14:34 -04:00
nhmall
270c228b60 windows build mods to support branch change
Changes to be committed:
	modified:   sys/winnt/Makefile.gcc
	modified:   sys/winnt/Makefile.msc
	modified:   win/win32/vs2015/NetHack.vcxproj
	modified:   win/win32/vs2015/NetHackW.vcxproj
	modified:   win/win32/vs2015/files.props
	modified:   win/win32/vs2017/NetHack.vcxproj
	modified:   win/win32/vs2017/NetHackW.vcxproj
	modified:   win/win32/vs2017/files.props
2018-10-20 23:14:33 -04:00
nhmall
a15c49d663 Merge branch 'NetHack-3.6.2' 2018-10-14 13:05:31 -04:00
nhmall
b7ca652ee3 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2018-10-12 21:09:40 -04:00
nhmall
e25c7be719 keyhelp missed during Windows build steps
BUG REPORT:

    comments:
    1. I start a new character.
    2. The first command I type is '&'
    3. I type "?" and "<enter key>" at the prompt.
    4. Cannot open "keyhelp" data file!--More--
       ?    give a help message.

1559
2018-10-12 20:57:26 -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
Mak Kolybabi
60ea2874ed Fix other spelling issues. 2018-09-19 21:46:07 -05:00
nhmall
fc7b79a192 Merge branch 'NetHack-3.6.2' 2018-09-11 08:50:07 -04:00
nhmall
3ac2041656 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2018-09-11 08:23:12 -04:00
nhmall
59019910b5 heed OPTIONS=symset:default in config file in windows and msdos 2018-09-10 15:27:05 -04:00
Ray Chason
25f770509a -ansi -pedantic can't come after -std=c++11 2018-09-10 21:13:28 +03:00
Ray Chason
7de9266b04 Qt on Win32: add stub for Qt window_procs 2018-09-10 21:13:20 +03:00
Ray Chason
8dbaafbb7b Ignore Win32 build products 2018-09-10 21:13:10 +03:00
Ray Chason
3fc2373ca2 Add build configuration for Qt 4 and 5 2018-09-10 21:13:05 +03:00
Ray Chason
6894e464d4 Win32: delete the o directory only if it exists 2018-09-10 21:13:00 +03:00
Ray Chason
5be0044c62 Add -lgdi32 to conlibs, needed to link 2018-09-10 21:12:56 +03:00
Ray Chason
e7a3390d74 Add build products to make spotless
Win32 Makefile.gcc now cleans up all build products except the binary
directory.
2018-09-10 21:12:47 +03:00
Ray Chason
5e04a6e6cb New hints file for Qt 5 on Mac OS X 2018-09-10 21:12:17 +03:00
Pasi Kallinen
249494c8ee Qt4 moc is moc-qt4
At least on my Debian, the Qt4 MOC is now called moc-qt4,
when it used to be just moc - probably due to Qt5 being moc-qt5
2018-09-10 21:06:37 +03:00
Ray Chason
08ef5ff99f Provide Qt 5 configuration on Linux
* CXX specifies -std=gnu++11
* WINQT5LIB variable added
* Hints file can specify CXX and MOC
2018-09-09 18:10:20 +03: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
nhmall
1d4b2f7b19 adjust wording on recent install.mw change 2018-08-12 10:21:52 -04:00
nhmall
910df450cc Merge branch 'NetHack-3.6.2' 2018-08-12 10:16:03 -04:00
nhmall
d212236866 Merge branch 'NetHack-3.6.2-beta01' into NetHack-3.6.2 2018-08-12 10:15:26 -04:00
nhmall
42b5415d6d further OS X clarification 2018-08-06 08:03:46 -04: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
nhmall
eb85c4cb49 Makefile recognition of VS 15.7.5 2018-07-28 17:48:57 -04: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
9858f69fa8 update .gitattributes files for auto-generation of Files 2018-05-29 19:28:26 -04:00
nhmall
ced7ebafec Merge branch 'NetHack-3.6.2' 2018-05-26 19:02:43 -04:00
nhmall
e41c80e5eb missed one 2018-05-25 18:57:41 -04:00
nhmall
6c9aa091cd guidebk.txt over guideboo.txt 2018-05-25 18:52:26 -04:00
nhmall
4d7f2869c6 Merge branch 'msdos-build' of https://github.com/chasonr/NetHack into msdos 2018-05-25 18:42:50 -04:00
nhmall
3a027289ed Merge branch 'NetHack-3.6.2' 2018-05-25 18:36:30 -04:00
Ray Chason
bd5743f758 MS-DOS does not use getreturn_enabled 2018-05-23 21:44:42 -04:00
Ray Chason
2357cb3fc2 Work around quirky FreeDOS behavior 2018-05-23 21:44:20 -04:00
nhmall
81e422189c Windows wouldn't compile without TTY_GRAPHICS defined 2018-05-21 16:44:19 -04:00
nhmall
3b77543bcc preserve change from old branch 2018-05-18 22:05:05 -04:00