Commit Graph
10026 Commits
Author SHA1 Message Date
Patric Mueller cb2e02ef75 Merge branch 'copperwater-vs_teleport' into NetHack-3.7
Closes #252
2019-12-08 20:00:31 +01:00
copperwater 4a3d5f95d9 Allow teleportation onto the Vibrating Square
It's a minor annoyance when you forget you can't do this in vanilla and
then get relocated somewhere random on the level. Since it's not a
harmful "trap", just allow the adventurer to teleport directly onto it.
2019-12-08 19:57:35 +01:00
PatR d43f8f6f9e altar color revisited
The issue of mimics masquerading as altars just came up two weeks
ago but never entered my mind when I worked on this yesterday.
2019-12-08 10:36:52 -08:00
PatR 625bfd1efd questpgr memory bug
Pointed out by heaputil:  attempt to free null pointer.  ANSI C
allows that, so no crash, but it still indicates a mistake.
2019-12-08 10:33:38 -08:00
Patric Mueller b9f3a33ec9 Update depend.awk for the new Qt location and lua headers 2019-12-08 14:41:54 +01:00
nhmall e81f761969 patchlevel 2019-12-08 08:02:39 -05:00
nhmall 8a47f13935 more files 2019-12-08 07:35:43 -05:00
nhmall f78b4db7f0 more files 2019-12-08 07:32:58 -05:00
nhmall bc8c1f8f56 remove field-level savefile code 2019-12-08 07:27:01 -05:00
Pasi Kallinen 2cb46c4153 Initialize object containment field
This is 3.7 bug caused by the lua implementation, so no fixes entry.
2019-12-08 11:53:01 +02:00
nhmall b6e7734877 fix game save/restore 2019-12-07 22:57:31 -05:00
PatR e9fab48aeb weakening the mysterious force effect
Izchak implemented the mysterious force and as far as I'm concerned,
it's here to stay.  But it can be fine tuned.  This is an experimental
attempt to make it happen less.  Each time it happens, the chance for
it happening again later will usually go down by an amount proportional
to how far it sent the hero back.  So chaotics will be sent back--or
"side to side"--less often than in 3.6.x but the tapering off of such
occurrences will be slower for them.  Lawfuls will also be sent back
less often--still potentially farther down than others--but tapering
off of send backs for them will be quicker.

I'll let somebody else figure out the before and after values for
number of attempts to climb up it takes to finally get out of Gehennom.
The numbers might need tuning.
2019-12-07 19:26:47 -08:00
nhw_cron ba36e7107f This is cron-daily v1-Dec-2-2019. files updated: Files 2019-12-07 22:06:16 -05:00
nhmall 2bf55a6ec7 mapglyph level-related function calls are done once per level 2019-12-07 22:03:43 -05:00
PatR bb72823d7b redo the #H9479 fix - worn dented pot
Handle recently changed armoroff() differently.  There should be no
change in behavior.

boots_simple_name(), shield_simple_name(), and shirt_simple_name()
are for no-delay armor types so won't be called by armoroff().  But
they'll undoubtedly get some use in the future.
2019-12-07 17:26:58 -08:00
PatR 9318bb816b 'make depend' update for sys/unix/Makefile.src
I deleted three lines
  ../include/../lib/lua-5.3.5/src/lua.h \
  ../include/../lib/lua-5.3.5/src/lualib.h \
  ../include/../lib/lua-5.3.5/src/lauxlib.h \
from $(CONFIG_H) but other than that, this is as-is with unmodified
'make depend'.  depend.awk will need to be taught about suppressing
those lua headers.
2019-12-07 17:06:07 -08:00
PatR 708773c514 color altars
Something I noticed in the hardfought diff what looked interesting.
Unfortunately the most interesting bit turns out to be unuseable.

Display high altars (Moloch's Sanctum and the Astral Plane) in
bright-magenta and unaligned altars (aside from the Sanctum one) in
red.  Hardfought's code also uses white for lawful, gray for neutral,
and black for chaotic, matching the unicorn colors associated with
the alignments.  But those colors don't render in a reliable fashion
(see the comment in mapglyph.c) and become confusing about why they're
used for altars of particular alignments.
2019-12-07 13:44:46 -08:00
nhmall f2dd00f86b more Qt follow-up 2019-12-07 15:27:57 -05:00
nhmall 17867059b5 Qt follow-up bit
name collision with 2 existing files
adjust Makefile.src to falter on the obsolete version, if at all, not the current
2019-12-07 15:18:44 -05:00
nhmall fe9ed530b1 Qt code rearranging fixes entry 2019-12-07 11:50:24 -05:00
nhmall 3073a588eb Rename Qt4 directory to Qt 2019-12-07 17:07:50 +01:00
nhmall 4b7c8d5f0f Merge branch 'NetHack-3.7' 2019-12-06 21:59:54 -05:00
nhmall c4add2680c Merge branch 'NetHack-3.6' 2019-12-06 21:59:23 -05:00
nhw_cron 850d37b47f This is cron-daily v1-Dec-2-2019. files updated: Files 2019-12-06 21:57:45 -05:00
nhw_cron 4ac02e0cc3 This is cron-daily v1-Dec-2-2019. files updated: Files 2019-12-06 21:55:51 -05:00
nhmall 66e90ab19b re-add Windows visual studio build back into the travis-ci tests
New procedures added to win/win32/vs2017/travisci.sh for travis-ci testing.

- use curl to obtain Lua from http://www.lua.org/ftp/lua-5.3.5.tar.gz
- use tar to unzip lua into lib/lua-5.3.5/...

Note: curl and tar were both added as part of Windows 10 in late Dec 2017
   https://techcommunity.microsoft.com/t5/Containers/Tar-and-Curl-Come-to-Windows/ba-p/382409

- use git to clone pdcurses into lib/pdcurses
- use git to clone universal-ctags into lib/ctags
- build universal-ctags ahead of building NetHack + lua + pdcurses
- adjust sys/winnt/Makefile.msc to look for those things in their lib locations when
  building under travis
2019-12-06 21:28:19 -05:00
nhmall fa65384ed4 Merge branch 'master' into NetHack-3.7 2019-12-06 17:52:14 -05:00
nhmall 0c6d801148 Merge branch 'NetHack-3.6' 2019-12-06 17:52:01 -05:00
nhmall a7ac5ce7f3 article fix for polymorphing steed 2019-12-06 17:50:59 -05:00
nhmall 31429f10cc Merge branch 'master' into NetHack-3.7 2019-12-06 16:55:20 -05:00
nhmall a512567103 Merge branch 'NetHack-3.6' 2019-12-06 16:48:00 -05:00
nhmall 7a3ce901ab make this branch recognizable for post-3.6.3 patch commits and patch tests 2019-12-06 16:35:47 -05:00
PatR afb4a67f0e PANICTRACE memory leak
Changing from BETA to RELEASED resulted in turning off PANICTRACE
and that exposed a minor memory leak.  Only applies to program exit
so doesn't impact play.
2019-12-06 12:59:18 -08:00
nhmall 7de0b39b53 Merge branch 'Tangles-2019-12-06' into NetHack-3.7 2019-12-06 09:47:27 -05:00
Tangles 5266fb9ca3 fix VAR_PLAYGROUND / fqn_prefix in unixmain.c 2019-12-06 09:46:37 -05:00
nhmall 28f50066e0 the latest Qt4 travis breakage 2019-12-06 09:06:31 -05:00
nhmall d6b8dc9b3f Merge branch 'NetHack-3.7' of https://rodney.nethack.org:20040/git/NHsource into NetHack-3.7 2019-12-05 23:22:58 -05:00
nhmall 33fd570829 cross-compile Makefile1.cross bit 2019-12-05 23:22:14 -05:00
nhmall 3118454872 try to fix the broken travis-ci build
yml file may have had a mistake
2019-12-05 22:36:14 -05:00
nhmall 27c778ea2f add creation of nhlua.h to msdos cross-compile Makefile1.cross 2019-12-05 22:24:29 -05:00
nhmall cb20548d17 travis build failure on 1 of 7 configurations 2019-12-05 20:46:13 -05:00
nhmall d3ba4c85f0 Merge branch 'NetHack-3.7' 2019-12-05 20:39:18 -05:00
nhmall 6fe101fac5 Merge branch 'NetHack-3.6' 2019-12-05 20:39:06 -05:00
nhmall 13f2a30d14 README verbiage 2019-12-05 20:36:55 -05:00
nhw_cron b80241492c This is cron-daily v1-Dec-2-2019. guidebook updated: doc/Guidebook.txt 2019-12-05 18:26:47 -05:00
nhmall 7ea41cd31d another bit 2019-12-05 18:24:04 -05:00
nhmall 3f2abab48c README bit 2019-12-05 18:18:17 -05:00
nhmall 9990bb86c6 Merge branch 'master' into NetHack-3.7 2019-12-05 18:16:14 -05:00
nhmall 7c7db8ed60 Merge branch 'NetHack-3.6' 2019-12-05 18:15:34 -05:00
nhw_cron bd7547fe62 This is cron-daily v1-Dec-2-2019. guidebook updated: doc/Guidebook.txt 2019-12-05 18:10:19 -05:00