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
keni
c5bc6a5268
Manually fix botched NHDT-Branch expansions.
2015-03-17 18:46:55 +02:00
Sean Hunt
bb647dc33c
Make TOURIST unconditional.
2015-03-17 18:46:01 +02:00
Sean Hunt
44ca9fc16a
Make SINKS unconditional.
2015-03-17 18:45:58 +02:00
Sean Hunt
161070ce56
Make KOPS unconditional.
2015-03-17 18:45:56 +02:00
Sean Hunt
9759f5bf6d
Make STEED unconditional.
2015-03-17 18:45:49 +02:00
keni
25cd007c48
Bulk recovery of file CVS headers and addition of NHDT- headers.
2015-03-17 18:45:12 +02:00
Derek S. Ray
b1a7bbbbdb
pull in the recent unconditionals merge from master
2015-02-27 21:25:00 -05:00
keni
665dedc3de
Add RCS version lines
2009-05-06 11:00:43 +00:00
nethack.allison
a0986b1e30
statue patch (trunk only)
...
Pat wrote:
> <Someone> has a patch (we've added a couple of
> his earlier ones) which changes the statue display from a single
> one size fits all "`" to a gray monster symbol instead.
> But I think the idea is a good one, and along with the
> bouldersym option could make the fairly hard to
> distinguish back-tick character go away.
Sources tagged before applying NETHACK_PRE_STATUE,
and afterwards with NETHACK_POST_STATUE for easy
rollback.
2006-10-01 21:17:38 +00:00
nethack.allison
e9b022d579
housekeeping: mark trunk sources 3.5 (misc)
2005-01-02 17:21:18 +00:00
nethack.allison
51f9892b3b
Allow MICRO and WIN32 code paths to diverge
...
There's still a lot of overlap for 3.4.1, but not
100% any longer and it facilitates some improvements
- Allow error save files on WIN32
2002-03-30 19:09:56 +00:00
jwalz
e833424555
Make pre-ANSI compiler happy.
2002-03-09 01:59:47 +00:00
nethack.allison
742e1e8c90
3.3.2 to 3.4.0
2002-02-04 16:11:00 +00:00
jwalz
a890b719d2
*** empty log message ***
2002-01-05 21:06:02 +00:00