nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity
4,526 Commits 2 Branches 0 Tags
f448dfbbd6a9b4c629a8bfb958f59cc5aaf325e8
Commit Graph
33 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek S. Ray f448dfbbd6 add YY_NO_UNISTD_H into the levcomp projects 2015-04-10 23:52:15 -04:00
Derek S. Ray cdb1c264d9 fix misnumbered tiles in other.txt 
update version of renumtiles to work on all files
 2015-04-10 23:46:05 -04:00
Derek S. Ray 6f16530913 regex.h remains nonpossible on Win32; define it out 
Once cppregex.cpp is merged into this branch, this can be fixed
 2015-04-10 18:47:39 -04:00
Derek S. Ray 61ffe9028d re-fix wintty.c; disable warnings on sp_lev.c 
don't ask me why wintty.c was actually compiling before.
also, make studio shut up about all the long-to-short stuff.
 2015-04-06 18:56:30 -04:00
Derek S. Ray aac78fe62e Fix up errors from mass manual conflict resolution 2015-04-06 17:18:48 -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
Derek S. Ray 12ca92aa42 Fix 'fetch' syntax, include sparkly 'git log' trick 
And bolt a couple more Win32-folders onto .gitignore.
 2015-03-25 17:07:10 -04: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
Derek S. Ray b1835cc65d Swap out Frontier Town with Orctown 2015-03-20 15:09:51 +02:00
Derek S. Ray b6ec0f066e finally remember to add the 'nh-' versions 2015-03-17 18:47:38 +02:00
Derek S. Ray 4c28a96b92 Some few updates/additions; clean up formatting 2015-03-17 18:47:29 +02:00
Derek S. Ray 3b89c474ab Initial version of simple recipes file 2015-03-17 18:47:27 +02:00
Derek S. Ray 66289b13ab remove and transfer INVISIBLE_OBJECTS to branch 2015-03-17 18:46:49 +02:00
Derek S. Ray 8fa8e02415 Remove unused size from questpgr.c 2015-03-17 18:46:48 +02:00
Derek S. Ray e1e55c31c7 more win32-specific pieces 2015-03-17 18:44:54 +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 4914e256bf finally remember to add the 'nh-' versions 2015-03-16 17:26:31 -04:00
Derek S. Ray de8e1a5a9d Some few updates/additions; clean up formatting 2015-03-15 14:28:01 -04:00
Derek S. Ray 3e94fa63c7 get rid of code-analysis clutter 2015-03-15 13:44:26 -04:00
Derek S. Ray 1e76ed28ae Initial version of simple recipes file 2015-03-12 22:47:44 -04: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
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
Derek S. Ray 4dddb97301 remove and transfer INVISIBLE_OBJECTS to branch 2015-02-27 19:34:32 -05:00
Derek S. Ray 5ee52039ca Remove unused size from questpgr.c 2015-02-27 19:34:31 -05:00
Derek S. Ray 7f0ff8f011 Make nhsetup smart enough to see VC2013, VC2010 
Only detects Express editions for now until I can verify
what registry keys correspond to each set of full editions.
 2015-02-27 18:14:10 -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
Derek S. Ray 18ca81d963 token .gitignore change to differentiate branch 2015-02-26 21:57:47 -05:00
Derek S. Ray d34bab1509 more win32-specific pieces 2015-02-15 14:45:36 -05:00
Derek f5089838c1 Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource 2015-02-13 13:29:23 -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