nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity
8,361 Commits 2 Branches 0 Tags
16d5d3f2e55161fa4570890d2ebaa0a3dc5e35ca
Commit Graph

8361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
nhmall
1e388fc1b9 update Makefile.gcc 
Changes to be committed:
	modified:   sys/winnt/Makefile.gcc
 2015-04-14 20:18:19 -04:00
nhmall
e8667b36a1 win32 perm inventory fix (from Alex) 2015-04-14 18:31:00 -04:00
nhmall
3d3ee78a0b Merge branch 'master' into win32-x64-working 
Conflicts:
	src/files.c
	src/potion.c
	sys/winnt/Makefile.msc

 Changes to be committed:
	modified:   .gitignore
	modified:   DEVEL/hooksdir/nhsub
	modified:   dat/.gitignore
	modified:   dat/opthelp
	modified:   doc/Guidebook.mn
	modified:   doc/Guidebook.tex
	modified:   doc/fixes35.0
	modified:   include/context.h
	modified:   include/decl.h
	modified:   include/extern.h
	modified:   include/flag.h
	modified:   include/hack.h
	modified:   include/patchlevel.h
	modified:   src/apply.c
	modified:   src/attrib.c
	modified:   src/decl.c
	modified:   src/do.c
	modified:   src/do_name.c
	modified:   src/dothrow.c
	modified:   src/eat.c
	modified:   src/files.c
	modified:   src/hack.c
	modified:   src/invent.c
	modified:   src/lock.c
	modified:   src/mklev.c
	modified:   src/mondata.c
	modified:   src/monmove.c
	modified:   src/music.c
	modified:   src/options.c
	modified:   src/potion.c
	modified:   src/pray.c
	modified:   src/sit.c
	modified:   src/sp_lev.c
	modified:   src/uhitm.c
	modified:   sys/share/posixregex.c
	modified:   sys/winnt/Makefile.msc
	modified:   util/.gitignore
	modified:   win/win32/vs2010/NetHackW.vcxproj
 2015-04-14 18:23:48 -04:00
Pasi Kallinen
647a072b62 Move triplicate defines into single place 2015-04-14 20:33:30 +03:00
Pasi Kallinen
dc7d8eb244 YAFM for magic flute 2015-04-14 20:04:46 +03:00
Pasi Kallinen
cd3b0efe5d Unify description of hero's visage into single function 2015-04-14 19:41:44 +03:00
Alex Kompel
116a4147a7 win32_gui: follow-up bit on x64 patch (premature optimization) 2015-04-14 09:33:05 -07:00
Pasi Kallinen
9b2c298fec Sinks may be teleported or polymorphed by rings 
Original patches by Leon Arnott and me.
 2015-04-14 19:21:37 +03:00
Alex Kompel
62617092b5 win32_gui: gettting x64 build to work 2015-04-14 08:54:44 -07:00
Alex Kompel
3c6f01f022 win32_gui: couple of perm_invent tweaks 2015-04-13 23:47:42 -07:00
Alex Kompel
7eefb8a250 win32_gui: use AdjustWindowRect to get more accurate measurement of status window 2015-04-13 23:29:02 -07:00
Alex Kompel
16ffab2c3c win32-gui: use showdebug() to control nhtrace logging 2015-04-13 23:19:52 -07:00
Pasi Kallinen
f1a5de16d9 Guard against merge segfaults 
Trying to throw a quivered object resulted in a segfault, when
the code tried to merge the quivered object into itself.
 2015-04-14 08:55:47 +03:00
Pasi Kallinen
31eed002c3 YAFM for dragon sitting on gold 2015-04-14 08:45:29 +03:00
Derek S. Ray
f244fd34f8 cppregex target accidentally commented out; fix 2015-04-13 20:57:01 -04:00
PatR
615b25f5fc lint bits 2015-04-13 17:50:17 -07:00
PatR
cf74f1cfd8 regex lint 
For the POSIX regexp interface, move local declaration to beginning
of block to avoid requiring C99.  Also switch to alloc() from bare
malloc() so that MONITOR_HEAP won't log a free which doesn't match
up to any allocation.  This results in a change in behavior:  if
the allocation fails, nethack will panic rather than report an
option parsing error.  In practice there will be no difference
because nethack is not going to run out of dynamic memory during
initial options processing.
 2015-04-13 17:21:59 -07:00
keni
b490b10b0f Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-04-13 19:33:26 -04:00
keni
4e45cf3e7f nhsub: handle git add/commit options that take an argument 2015-04-13 19:32:51 -04:00
Pasi Kallinen
879f6d55c2 Add Auto open doors -patch 2015-04-13 21:11:44 +03:00
Pasi Kallinen
1dd43be266 Inaccessible niches occasionally have iron bars 2015-04-13 19:55:10 +03:00
Pasi Kallinen
1c970b171e Some monsters can eat through iron bars 
Any monster with rusting or corrosion attack can eat through
the bars. This includes rust monsters, grey oozes, and black puddings.

Original patch by Malcolm Ryan
 2015-04-13 19:41:51 +03:00
Pasi Kallinen
6209d458f9 A camera may contain a picture-painting demon 
Original patch by Leon Arnott
 2015-04-13 18:54:24 +03:00
Pasi Kallinen
eba5bf7d5e Add litmus test 
Original patch by Dylan O'Donnell
 2015-04-13 18:30:53 +03:00
Pasi Kallinen
0b0c769a05 Use our dupstr instead of strdup 2015-04-13 10:07:12 +03:00
Pasi Kallinen
ee5002210f Fix gitignored 2015-04-13 08:30:47 +03:00
Alex Kompel
aae391d274 Merge branch 'win32-x64-working' of https://rodney.nethack.org:20040/git/NHsource into win32-x64-working 2015-04-12 17:51:32 -07:00
Alex Kompel
261c128b84 win32-gui: fix menu item measuring bug (ever-increasing item height on window resize) 2015-04-12 17:47:42 -07:00
nhmall
6e62d56367 fix Makefile build in branch 2015-04-12 20:27:21 -04:00
nhmall
ed783b9940 yet more integration bits (thanks to my typo) 2015-04-12 16:48:06 -04:00
nhmall
636da9887b more regex integration bits 2015-04-12 13:27:36 -04:00
nhmall
5dd00aca54 Makefile bit following merge 2015-04-12 12:16:59 -04:00
nhmall
7e781d4013 Merge branch 'master' into win32-x64-working 
Conflicts:
	include/config.h
	src/options.c
 2015-04-12 11:58:14 -04:00
nhmall
a66224f9dc Add some new files to top level Files 2015-04-12 11:46:56 -04:00
Derek S. Ray
38861c1e0d add cppregex.cpp to NetHackW so it'll link properly 2015-04-12 11:46:56 -04:00
Sean Hunt
c7578b7c34 Add POSIX implementation of regex. 
This also includes documentation of the regex engine in posixregex.c,
because I couldn't think of anywhere better to put it.
 2015-04-12 11:46:56 -04:00
Sean Hunt
302ad5025f Catch regex matching errors to avoid crashing. 2015-04-12 11:46:56 -04:00
Sean Hunt
80aa109855 Use extern.h for regexes. 
I was planning to do this anyway, but it created an include loop that
was breaking it on Windows.
 2015-04-12 11:46:54 -04:00
Sean Hunt
b86ad06d6b Implement a new system-based matching harness. 
The intent is to look for platform-specific facilities for regex
matching, to provide portable MENUCOLORS configuration files.

This is a prototype implementation being committed to see if Windows can
use the POSIX regex implementation provided with the C++11 standard
library. If this works, I will write a harness for POSIX regexes and for
pmatch(), and those can be linked in by platforms as appropriate.

pmatch() should be used only as a very last resort, because it breaks
compatibility between platforms.
 2015-04-12 11:46:26 -04:00
Sean Hunt
a3387432ac Document wallification changes. 2015-04-12 11:45:29 -04:00
nhmall
5905a17242 visual studio mods for tribute, sysconf 
Changes to be committed:
	modified:   win/win32/mhmenu.h
	modified:   win/win32/vs2013/NetHack.vcxproj
	modified:   win/win32/vs2013/NetHackW.vcxproj
	modified:   win/win32/vs2013/dlb_main.vcxproj
 2015-04-12 10:58:13 -04:00
nhmall
83a7513c13 Merge branch 'master' into win32-x64-working 
Conflicts:
	src/do_name.c
	src/trap.c
	src/zap.c
	win/X11/winmenu.c
 2015-04-12 10:35:00 -04:00
nhmall
7da3ed32e1 tribute post-merge smoothing 
Changes to be committed:
	modified:   src/mon.c
	modified:   win/share/objects.txt
 2015-04-12 10:31:26 -04:00
nhmall
11560933cc Merge branch 'master' into nhmall-booktribute 
Conflicts:
	doc/fixes35.0
	include/extern.h
	src/mkobj.c
	src/mon.c
	src/objnam.c
	win/share/objects.txt
 2015-04-12 10:02:17 -04:00
nhmall
a7b4309cc1 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-04-12 08:58:16 -04:00
nhmall
ea96cdd547 More Guidebook 
Changes to be committed:
	modified:   doc/Guidebook.mn
	modified:   doc/Guidebook.tex
 2015-04-12 08:57:41 -04:00
PatR
8b9ce73c31 revised menu searching 
Convert search in tty menus from pmatch to case-insensitive pmatchi;
convert search in X11 menus from substring strstri to wildcard pmatchi.

tty bug:  if the menu is full screen, the search prompt and subsequent
user input clobbers the menu header.
 2015-04-12 01:48:01 -07:00
nhmall
c03a37c440 Merge branch 'master' into win32-x64-working 
Conflicts:
	include/extern.h
 2015-04-12 00:35:57 -04:00
nhmall
be5fa68bde Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-04-12 00:34:06 -04:00
nhmall
816589e626 windows team update 2015-04-12 00:33:30 -04:00