nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity
18,059 Commits 2 Branches 0 Tags
9b375ea488068f121a02f4f1c882e1b79dbdf4b2
Commit Graph
646 Commits
Author SHA1 Message Date
Derek S. Ray 7c644c1507 Merge branch 'win32-x64-working' of https://rodney.nethack.org:20040/git/NHsource into win32-x64-working 
* 'win32-x64-working' of https://rodney.nethack.org:20040/git/NHsource: (27 commits)
  Makefile bit
  gcc Makefile updates for recent file additions
  ...

Conflicts:
	src/files.c
 2015-04-15 18:30:13 -04:00
Derek S. Ray df52ba17ec add debugger window support via _RPT*; add regex 
currently it's locked behind _MSC_VER, but anything that runs on Win32
should be able to use those functions as long as it has something that
can pass as a debug window.

also, add a non-wildcard-accepting version of showdebug for the dumpit()
functions in dungeon.c and questpgr.c; this makes DEBUGFILES=* workable
without being excruciatingly painful
 2015-04-15 18:19:16 -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
Alex Kompel 116a4147a7 win32_gui: follow-up bit on x64 patch (premature optimization) 2015-04-14 09:33:05 -07: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
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 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 7e781d4013 Merge branch 'master' into win32-x64-working 
Conflicts:
	include/config.h
	src/options.c
 2015-04-12 11:58:14 -04:00
Derek S. Ray 38861c1e0d add cppregex.cpp to NetHackW so it'll link properly 2015-04-12 11:46:56 -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
Derek S. Ray f448dfbbd6 add YY_NO_UNISTD_H into the levcomp projects 2015-04-10 23:52:15 -04:00
Derek S. Ray b4142b5894 Merge branch 'master' into win32-x64-working 
* master: (354 commits)
  Add missing protos
  a warning bout lc_error
  Add S_poisoncloud to Guidebooks
  ...

Conflicts:
	.gitattributes
	dat/.gitattributes
	doc/.gitattributes
	doc/Guidebook.mn
	include/config.h
	include/decl.h
	include/extern.h
	include/flag.h
	include/hack.h
	include/ntconf.h
	include/sys.h
	include/wceconf.h
	src/apply.c
	src/attrib.c
	src/bones.c
	src/botl.c
	src/dbridge.c
	src/dig.c
	src/do.c
	src/do_name.c
	src/dog.c
	src/dungeon.c
	src/eat.c
	src/end.c
	src/files.c
	src/fountain.c
	src/hack.c
	src/invent.c
	src/light.c
	src/makemon.c
	src/mhitu.c
	src/mklev.c
	src/mkmaze.c
	src/mkobj.c
	src/mkroom.c
	src/mon.c
	src/objnam.c
	src/options.c
	src/pager.c
	src/pickup.c
	src/potion.c
	src/pray.c
	src/questpgr.c
	src/read.c
	src/restore.c
	src/rnd.c
	src/role.c
	src/rumors.c
	src/save.c
	src/shk.c
	src/sit.c
	src/sp_lev.c
	src/sys.c
	src/teleport.c
	src/trap.c
	src/u_init.c
	src/uhitm.c
	src/wield.c
	src/worn.c
	src/zap.c
	sys/amiga/.gitattributes
	sys/mac/.gitattributes
	sys/msdos/.gitattributes
	sys/msdos/pctiles.c
	sys/msdos/vidvga.c
	sys/os2/.gitattributes
	sys/share/.gitattributes
	sys/share/pcmain.c
	sys/unix/.gitattributes
	sys/unix/hints/.gitattributes
	sys/unix/sysconf
	sys/unix/unixmain.c
	sys/vms/.gitattributes
	sys/wince/.gitattributes
	sys/wince/mhstatus.c
	sys/winnt/.gitattributes
	sys/winnt/Makefile.msc
	sys/winnt/nhsetup.bat
	util/lev_comp.l
	util/makedefs.c
	win/X11/winmenu.c
	win/X11/winstat.c
	win/gnome/gnstatus.c
	win/share/tilemap.c
	win/tty/termcap.c
	win/tty/topl.c
	win/tty/wintty.c
 2015-04-05 23:42:15 -04:00
Pasi Kallinen c8e781c418 Add menucolors 
-Add a boolean option menucolors to toggle menu color
-Add MENUCOLOR -config file option

TODO:
-Better support for win32
-Support more windowports
-Update Guidebook
-Allow changing menucolor lines in-game
 2015-04-02 20:16:25 +03:00
Pasi Kallinen 2649cb385c Merge branch 'master' into paxed-new_lev_comp 
Conflicts:
	.gitignore
	doc/fixes35.0
	include/obj.h
	include/patchlevel.h
	src/dig.c
	src/mklev.c
	src/rumors.c
	src/save.c
	src/topten.c
	src/trap.c
	sys/winnt/Makefile.msc
	util/makedefs.c
	win/win32/levstuff.mak
 2015-03-21 19:39:48 +02:00
Derek S. Ray 7f03ee4216 Changes for Win32; update precompiled files 
Also fix Orctown probabilities; fixed support for snprintf;
update Win32 makefile to allow level compiler use

Conflicts:
	win/win32/levstuff.mak
 2015-03-20 15:14:31 +02:00
Sean Hunt 05f7a63728 Make GOLDOBJ unconditional. 2015-03-17 18:46:23 +02:00
Sean Hunt ffd201495c Make REINCARNATION unconditional. 
There is a lot of code affected by this, and Pat Rankin correctly
observes that it would be better to store roguelike as a level flag
rather than just using Is_rogue_level. A note for the future.
 2015-03-17 18:46:08 +02:00
keni 4e50ba93f4 A batch of manual header var additions. 2015-03-17 18:45:42 +02:00
keni 25cd007c48 Bulk recovery of file CVS headers and addition of NHDT- headers. 2015-03-17 18:45:12 +02:00
Derek 4c496d089e Exclude all the Win32 build artifacts (Studio and otherwise) 
Squashed commit of the following:

commit e37c7626f035a29321c9ac12cca83a0af2132abb
commit 86ebb3e66aedb6b5a31d61d57c39cf84c12d2276
commit 6cd677c8fca4102f223fb1708d00a65c2ded6658
Author: Derek <derekray@gmail.com>
Date:   Fri Feb 13 13:24:29 2015 -0500
 2015-03-17 18:44:53 +02:00
Derek S. Ray 6ebb7db138 fix build order for nhdefkey, add to nhsetup 
also minor cosmetics; clean up two warnings in Release mode,
turn off multi-processor, and fix /Oi /Oi- discrepancy
 2015-02-28 22:56:03 -05:00
nhmall 4794329e89 Ensure nethack.exe gets copied to binary folder after it is built 2015-02-28 13:17:55 -05:00
nhmall 5411039780 more work on getting nethack.exe to build along with nethackw.exe via VS 2015-02-28 11:44:08 -05:00
nhmall 1b980f34ac adjust project dependencies to ensure makedefs builds before nethack.exe 2015-02-28 00:52:00 -05:00
nhmall 796f6f85d0 VS 2013 build of NetHack.exe and also fix level file locking 2015-02-28 00:37:05 -05:00
Derek S. Ray 528e8b34e0 fix (hopefully) last few warnings; fix Release too 
VS2013 _really_ doesn't like having shared directories for
any sort of intermediate files, and will generate a nice little
pile of useless warnings as a result.
 2015-02-27 23:08:20 -05:00
Derek S. Ray 335bdeb042 clean up all the miscellaneous warnings 
shared-intermediate-directory fixed
linker weirdness fixed
 2015-02-27 22:26:59 -05:00
Derek S. Ray b1a7bbbbdb pull in the recent unconditionals merge from master 2015-02-27 21:25:00 -05:00
Sean Hunt ac108cd365 Make GOLDOBJ unconditional. 2015-02-27 19:33:40 -05:00
Sean Hunt 1edadd1d48 Make REINCARNATION unconditional. 
There is a lot of code affected by this, and Pat Rankin correctly
observes that it would be better to store roguelike as a level flag
rather than just using Is_rogue_level. A note for the future.
 2015-02-27 19:33:16 -05:00
Derek S. Ray f15a640120 remove old projects from root win/win32 directory 2015-02-27 16:06:47 -05:00
Derek S. Ray 2f8d6502fd Initial changes to support both VS2010 and VS2013 
Mostly it's just project formats, but VS2013 does require
parallel compilation to be turned off and synchronous
PDB writes to be turned on (since we reuse intermediate
output directories).

Cleaning that up is for some time in the future.
 2015-02-27 16:00:58 -05:00
nhmall e400723863 undo a set of code reverts in last commit 2015-02-26 22:48:32 -05:00
nhmall e1dfe9c48a Roll back the win/win32 tree to the way it was before x64 attempt 2015-02-26 22:09:31 -05:00
keni 0109f9715b A batch of manual header var additions. 2015-02-26 17:10:11 -05:00
keni 03140969ee Bulk recovery of file CVS headers and addition of NHDT- headers. 2015-02-26 09:19:03 -05:00
Derek bae3c6088f Exclude all the Win32 build artifacts (Studio and otherwise) 
Squashed commit of the following:

commit e37c7626f035a29321c9ac12cca83a0af2132abb
commit 86ebb3e66aedb6b5a31d61d57c39cf84c12d2276
commit 6cd677c8fca4102f223fb1708d00a65c2ded6658
Author: Derek <derekray@gmail.com>
Date:   Fri Feb 13 13:24:29 2015 -0500
 2015-02-13 13:26:05 -05:00
nethack.rankin a871ad06e9 outrip() updating (trunk only) 
Part II of the bones tracking patch.  Change umpteen different outrip()
routines to handle its new time_t argument, and use formatkiller() instead
of directly accessing killer.{format,name} and killed_by_prefix[].  The
latter is now static within formatkiller().

     The many sys/* and win/* changes are untested....
 2012-01-24 04:26:33 +00:00
nethack.allison 586e2cb67e Suppress an x64 build warning (trunk only) 2012-01-11 01:53:44 +00:00
nethack.allison 593181421d More clean up of the Windows x64 build (trunk only) 2012-01-11 01:45:02 +00:00
nethack.allison 783413bb57 Start trying to clean up the Windows x64 build (trunk only) 2012-01-11 01:15:37 +00:00
keni b97d53fb30 cleanup: outdated SCCS lines 
Pat noted that I neglected to drop the SCCS lines on the files I've been
committing, so clean up those and any others I could find where the SCCS
line date is out of date.
 2012-01-10 17:47:45 +00:00
nethack.allison 93ee252e87 More MS Visual Studio 2010 Express stuff 2012-01-07 22:57:39 +00:00
keni 4e5e720334 display version and build info at startup (trunk only) 
Tested on the unix port; I've updated as many other ports as I can figure
out but they're not tested.  See window.doc for info on the changed banner
lines.  Also adds the ability to override the generic "Unix" port - used now to get
"MacOSX" into the version line instead of "Unix" (so we don't scare people who don't
know what's going on).
 2011-10-11 02:37:31 +00:00
nethack.rankin ddf5aced48 fix W343-7 - strange topten output on Windows 
Move the toptenwin option from flags to iflags to keep it out of
save files, thus preventing odd behavior from win32 (nethackW.exe) when
restoring and finishing games started and saved with tty (nethack.exe).
[See cvs log entry for flag.h for more complete explanation.]
 2011-09-19 03:10:01 +00:00
nethack.allison aac052f0f0 Clean up the visual studio express build further 
Committed on the Free edition of March Hare Software CVSNT Server.
Upgrade to CVS Suite for more features and support:
http://march-hare.com/cvsnt/
 2010-09-05 14:22:20 +00:00