From 6ec0c0ee5c1d651079036c14d157f998353d4307 Mon Sep 17 00:00:00 2001 From: nhmall Date: Mon, 28 Oct 2019 12:59:00 -0400 Subject: [PATCH 1/4] .travis.yml update --- .travis.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 00a6c1153..3cc2f5849 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,6 +85,11 @@ matrix: - cp ../sys/winnt/Makefile.gcc ./Makefile - mingw32-make install exclude: +# - os: osx +# osx_image: xcode10.3 +# env: DESCR=osx-xcode10.3-x11 HINTS=macosx10.14 WANT_WIN_CURSES=1 WANT_WIN_X11=1 USE_XPM=1 +# compiler: clang +# script: "cd sys/unix/ && sh setup.sh hints/$HINTS && cd ../../ && make install" - os: osx osx_image: xcode10.2 env: HINTS=macosx10.14 @@ -108,5 +113,6 @@ deploy: on: tags: true prerelease: true - name: "Pre-release build of NetHack 3.6.3" - body: "This is auto generated pre-release build of NetHack 3.6.3 and as such has not been tested." + name: "Pre-release build of NetHack 3.6.3" + body: "This is auto generated pre-release build of NetHack 3.6.3." + From b1e0b6b17bc58ac790d9d725cdfddc32f5c17e2c Mon Sep 17 00:00:00 2001 From: PatR Date: Mon, 28 Oct 2019 16:02:16 -0700 Subject: [PATCH 2/4] avoid warning and check whether pushing commits has been straightened out. --- src/options.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/options.c b/src/options.c index 6c1abf617..28de184c3 100644 --- a/src/options.c +++ b/src/options.c @@ -1,4 +1,4 @@ -/* NetHack 3.6 options.c $NHDT-Date: 1572070255 2019/10/26 06:10:55 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.381 $ */ +/* NetHack 3.6 options.c $NHDT-Date: 1572303730 2019/10/28 23:02:10 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.383 $ */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /*-Copyright (c) Michael Allison, 2008. */ /* NetHack may be freely redistributed. See license for details. */ @@ -6116,9 +6116,6 @@ int which_set; int val; char *op, *symname, *strval; struct symparse *symp; -#ifdef DEBUG - int sym_max = SYM_MAX; -#endif if ((op = index(opts, ',')) != 0) { *op++ = 0; From 5a95c0372dec63a7e8e7e3d451f2e4aee126b136 Mon Sep 17 00:00:00 2001 From: nhmall Date: Mon, 28 Oct 2019 20:34:36 -0400 Subject: [PATCH 3/4] README update for 3.6.3 work-in-progress --- README | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/README b/README index 0592a5efc..2caae21f9 100644 --- a/README +++ b/README @@ -1,24 +1,24 @@ - NetHack 3.6.2 -- General information + NetHack 3.6.3 work-in-progress -- General information NetHack 3.6 is an enhancement to the dungeon exploration game NetHack, which is a distant descendent of Rogue and Hack, and a direct descendent of NetHack 3.4 as there was no NetHack 3.5 release. -NetHack 3.6.2 contains a collection of about 320 bug fixes to NetHack 3.6.1 -and more than 20 enhancements. The file doc/fixes36.2 in the source -distribution has a full list of them. The text in there was written for the -development team's own use and is provided "as is", so please do not ask us -to further explain the entries in that file. Some entries might be considered -"spoilers", particularly in the "new features" section. +NetHack 3.6.3 work-in-progress is not an official release of NetHack. It +currently contains a collection of over 140 bug fixes to NetHack 3.6.3 +and more than 16 enhancements and community contributions. The file +doc/fixes36.3 in the source distribution has a full list of them. +The text in there was written for the development team's own use and is +provided "as is", so please do not ask us to further explain the entries +in that file. Some entries might be considered "spoilers", particularly in +the "new features" section. Below you will find some other general notes that were not considered spoilers: -* Performance optimizations with tty including the ability to do per field - updating -* sys/winnt/nttty performance improvements mainly through the introduction - of a back buffer approach -* a couple of windows crash bug fixes -* adoption of the curses window port that was in use in the community + +* Over 30 refinements to the curses window port. +* Some refinements to status highlights. +* A couple of fixes to prevent potential game crashes. - - - - - - - - - - - @@ -125,8 +125,7 @@ Please read items (1), (2) and (3) BEFORE doing anything with your new code. If you have problems building the game, or you find bugs in it, we recommend filing a bug report from our "Contact Us" web page at: - https://www.nethack.org/common/contact.html or - http://www.nethack.org/common/contact.html + https://www.nethack.org/common/contact.html Please include the version information from #version or the command line option --version in the appropriate field. @@ -167,6 +166,6 @@ In our own patches, we will assume that your code is synchronized with ours. -- Good luck, and happy Hacking -- -# $NHDT-Date: 1557077369 2019/05/05 17:29:29 $ $NHDT-Branch: NetHack-3.6.2 $:$NHDT-Revision: 1.55 $ +# $NHDT-Date: 1572309271 2019/10/29 00:34:31 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.57 $ # Copyright (c) 2012 by Michael Allison # NetHack may be freely redistributed. See license for details. From 81e39e3bffa606711f4329046b9cc629010c84c2 Mon Sep 17 00:00:00 2001 From: nhmall Date: Mon, 28 Oct 2019 20:36:32 -0400 Subject: [PATCH 4/4] typo in README --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 2caae21f9..d7698ffd4 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ which is a distant descendent of Rogue and Hack, and a direct descendent of NetHack 3.4 as there was no NetHack 3.5 release. NetHack 3.6.3 work-in-progress is not an official release of NetHack. It -currently contains a collection of over 140 bug fixes to NetHack 3.6.3 +currently contains a collection of over 140 bug fixes to NetHack 3.6.2 and more than 16 enhancements and community contributions. The file doc/fixes36.3 in the source distribution has a full list of them. The text in there was written for the development team's own use and is