Commit Graph

365 Commits

Author SHA1 Message Date
nhmall
be5998b6e4 Merge branch 'NetHack-3.6.2' 2019-01-01 08:37:25 -05:00
nhmall
c2777860e9 incorrect header 2018-12-30 22:02:42 -05:00
nhmall
8db202d90f Merge branch 'NetHack-3.6.2' 2018-12-30 21:45:25 -05:00
PatR
3cc4db7950 Unix Makefile
Separate the compiler flags used for compiling X11 code from the rest
of CFLAGS.  Affects hints/macosx10.8 and later.

Add an explicit output argument to the generated compile rules.
2018-12-30 17:39:56 -08:00
nhmall
5b3168e1c5 Merge branch 'NetHack-3.6.2' 2018-12-30 08:43:54 -05:00
PatR
d418008b31 curses splash/copyright screen, role prompt
Back out '#include "date.h"' so that cursinit.c won't be recompiled
every time any other file(s) need to be compiled.  It doesn't need
patchlevel.h either.  There is already a straightforward way to fetch
the copyright banner lines from version.c.

The splash screen (ascii art spelling "NetHack" preceding the normal
copyright lines) was invisible when showing white text on white-ish
background.  Make it honor !guicolor.

"Shall I pick a character's role, race, gender and alignment for you?
 [ynaq] (y) " was too wide to accept the answer on the same line on
an 80-column display so "(y) " was placed on the second line.  That's
constructed in the core; change the construction to omit " a" when
using "character" rather than a role name.  (tty shortens it by omitting
the default " (y)"; with " a" gone, it could revert to normal prompt.)

Also a bit of lint cleanup and some reformatting of cursinit.c....
2018-12-29 18:38:30 -08:00
nhmall
a09d2248cb Merge branch 'NetHack-3.6.2' 2018-12-29 08:47:16 -05:00
PatR
5882832ef0 X11 on OSX
The change to Makefile.src for X11+XPM on linux broke linking X11 on
OSX.  This updates the hints files (except for the -qt one) so that
 make WANT_WIN_X11=1
and
 make WANT_WIN_X11=1 USE_XPM=1
work correctly.

The comment in macosx10.14 about what version(s) it's intended for
and been tested on is just cloned from 10.10 and should be updated.
2018-12-29 03:28:07 -08:00
Pasi Kallinen
6ac681b5fa X11: default to XPM-format tile file and rip screen
People have been wondering how to change the tiles on the X11
version, and the old default of NetHack-specific binary tile data
isn't directly editable with image editing tools.

Also show in the #version info if xpm and graphic rip are enabled.
2018-12-29 07:19:24 +02:00
nhmall
1a77387345 Merge branch 'NetHack-3.6.2' 2018-12-28 09:42:37 -05:00
Patric Mueller
19f0a2d3ba Fix missing compilation dependency for cursinit.c 2018-12-28 15:21:33 +01:00
Bart House
ed096f74c3 shk followmsg moved to instance globals. early_init introduced. 2018-12-25 17:46:52 -08:00
Bart House
64be5fd35a lock -> g.lock 2018-12-25 13:05:43 -08:00
Bart House
c67f7e5122 globals from files.c moved to instance globals. 2018-12-25 12:56:27 -08:00
Bart House
b1ab64db43 program_state moved to g. 2018-12-25 10:09:04 -08:00
Bart House
ab73df996f Fix typo lockum -> locknum 2018-12-25 09:40:30 -08:00
Bart House
16db7498d0 UNIX, VMS, DEF_PAGER, MICRO and MFLOPPY globals moved to g. 2018-12-25 09:34:24 -08:00
Bart House
e5e906dc3b Changes needed in various ports due to globals changes. 2018-12-24 14:47:51 -08:00
Bart House
b863fad3ea Changes needed in the mac terminal port due to globals changes. 2018-12-22 13:53:10 -08:00
Bart House
912886a73f First set of changes to move globals to instance_globals. 2018-12-19 20:00:35 -08:00
nhmall
bdae51503c stale dependency 2018-12-13 20:21:26 -05:00
nhmall
dc2539701a Revert "some fixes provided from Hardfought"
This reverts commit ab9e28d1aa.
2018-12-04 11:59:41 -05:00
nhmall
ab9e28d1aa some fixes provided from Hardfought 2018-12-04 11:58:05 -05:00
PatR
a8fe565912 'make depend' update for unix/Makefile.src
The dependency for pcmain.o is different from depend.awk generates
so re-running 'make depend' after this will think another change is
needed.
2018-11-28 15:23:02 -08:00
Pasi Kallinen
9e6ba48dbd Typofix 2018-11-28 15:59:48 +02:00
Bart House
f38dc942c0 Macosx post install script fix to avoid changing save games owner to root. 2018-11-26 22:47:51 -08:00
Bart House
7d3103ad9d Merge branch 'NetHack-3.6.2-beta01' into macosx-minor 2018-11-26 22:45:22 -08:00
nhmall
9db124f650 Revert "Fix compiler warnings in macos build."
This reverts commit 0d59f1a22b.
2018-11-23 22:16:49 -05:00
Bart House
0d59f1a22b Fix compiler warnings in macos build. 2018-11-23 15:22:54 -08:00
Pasi Kallinen
3517277467 Add some commented out flags to linux hints file 2018-11-23 19:26:13 +02:00
Patric Mueller
a7ebb35d5e Adding a travis job for a minimal build 2018-11-23 17:44:31 +01:00
Bart House
d7b77d0625 Additional cleanup of macosx10.14. 2018-11-21 22:58:05 -08:00
Bart House
e321b6d1d2 Added ability to sign tty package. 2018-11-21 21:23:30 -08:00
Bart House
f4fb476e50 Modified the spotless make rule to use double colon syntax. 2018-11-21 21:21:43 -08:00
Bart House
8b1fbd15b6 Improved the wording in XCode.xcconfig 2018-11-21 21:21:07 -08:00
Bart House
1b8f07bc36 Created macosx10.14 from macosx10.10 with no other changes. 2018-11-21 18:19:07 -08:00
Bart House
d10a18ff00 Switching back to tty on picked by default for XCode biuld. 2018-11-20 16:11:22 -08:00
Bart House
b195025635 Added all header files to Xcode project. 2018-11-20 13:22:48 -08:00
Bart House
aa939a62b0 Adding README for building NetHack with XCode. 2018-11-20 11:16:24 -08:00
Bart House
da1e7de925 Adjusted compiler settings to reduce warnings in XCode project. 2018-11-20 10:51:03 -08:00
Bart House
8c61ac476d Fixed HACKDIR buid setting. 2018-11-20 07:32:23 -08:00
Groot
f768197074 Created mechanism to provide development team ID which is git friendly.
Please see XCodeConfig.xcconfig for details.
2018-11-20 01:14:18 -08:00
Bart House
9f8b419ec8 Added necessary build dependencies for xcode project. 2018-11-19 19:58:21 -08:00
Bart House
a68a8f21d4 Full build of nethack now supported in xcode. 2018-11-19 19:48:01 -08:00
Bart House
1af98716f2 Added the building of nhdat to xcode project. 2018-11-19 17:23:04 -08:00
Bart House
dd9ca9202c Added building of nhdat to xcode project. 2018-11-19 16:54:31 -08:00
Bart House
6cf6e3c750 Added support for building Guidebook in xcode build. 2018-11-19 16:22:16 -08:00
Bart House
abb59e7283 Added building dungeon to xcode project. 2018-11-19 14:51:24 -08:00
Bart House
8dc9a3d930 Merge branch 'macosx-curses-fall2018' of https://rodney.nethack.org:20040/git/NHsource into macosx-curses-fall2018 2018-11-19 14:11:59 -08:00
Bart House
9f525b3241 Added building of special and quest levels in xcode build. 2018-11-19 14:11:39 -08:00