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

..

.gitignore

Exclude all the Win32 build artifacts (Studio and otherwise)

2015-03-17 18:44:53 +02:00

allmain.c

Merge branch 'master' into nhmall-booktribute

2015-04-06 17:47:11 -04:00

alloc.c

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

apply.c

Indicator glyph for good target positions

2015-04-07 18:18:54 +03:00

artifact.c

Add more explicit helpless reasons

2015-03-29 22:12:19 +03:00

attrib.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

ball.c

Make STEED unconditional.

2015-03-17 18:45:49 +02:00

bones.c

nhclose

2015-04-06 10:12:10 -04:00

botl.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

cmd.c

Fix comment typo

2015-04-11 20:45:37 +03:00

dbridge.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

decl.c

Add menucolors

2015-04-02 20:16:25 +03:00

detect.c

Add more explicit helpless reasons

2015-03-29 22:12:19 +03:00

dig.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

display.c

Fix magic mapped dark room symbols

2015-04-10 22:43:13 +03:00

dlb.c

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

do_name.c

Merge branch 'master' into win32-x64-working

2015-04-12 10:35:00 -04:00

do_wear.c

Add more explicit helpless reasons

2015-03-29 22:12:19 +03:00

do.c

Merge branch 'master' into win32-x64-working

2015-04-12 00:15:40 -04:00

dog.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

dogmove.c

Make BARGETHROUGH unconditional.

2015-03-17 18:46:35 +02:00

dokick.c

Kicking a grave may topple the gravestone

2015-03-29 17:45:45 +03:00

dothrow.c

Add more explicit helpless reasons

2015-03-29 22:12:19 +03:00

drawing.c

Clive Crous' Dark Room patch

2015-04-07 21:01:21 +03:00

dungeon.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

eat.c

Merge branch 'master' into win32-x64-working

2015-04-12 00:15:40 -04:00

end.c

Merge branch 'master' into win32-x64-working

2015-04-12 00:15:40 -04:00

engrave.c

Move some hard-coded string arrays into data files.

2015-03-18 22:05:10 +02:00

exper.c

Make WIZARD unconditional.

2015-03-17 18:46:17 +02:00

explode.c

Move some hard-coded string arrays into data files.

2015-03-18 22:05:10 +02:00

extralev.c

Make REINCARNATION unconditional.

2015-03-17 18:46:08 +02:00

files.c

Merge branch 'master' into win32-x64-working

2015-04-12 10:35:00 -04:00

fountain.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

hack.c

Merge branch 'master' into win32-x64-working

2015-04-12 00:15:40 -04:00

hacklib.c

new pmatch variations

2015-04-11 19:39:59 -07:00

invent.c

Merge branch 'master' into derek-farming

2015-04-10 16:56:30 -04:00

light.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

lock.c

Additional obstruction messaging fixup

2015-03-17 18:47:28 +02:00

mail.c

Some spam for mail daemon to deliver

2015-03-31 18:32:23 +03:00

makemon.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

mapglyph.c

Clive Crous' Dark Room patch

2015-04-07 21:01:21 +03:00

mcastu.c

fire effects should burn green slime globs, too

2015-04-05 21:56:15 -04:00

mhitm.c

Merge fire-based erosion to common codepaths.

2015-03-17 18:47:10 +02:00

mhitu.c

Prevent segfaults, makemon can return null

2015-04-03 14:46:28 +03:00

minion.c

Make GOLDOBJ unconditional.

2015-03-17 18:46:23 +02:00

mklev.c

Merge branch 'master' into win32-x64-working

2015-04-12 00:15:40 -04:00

mkmap.c

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

mkmaze.c

Merge branch 'master' into win32-x64-working

2015-04-12 00:15:40 -04:00

mkobj.c

Merge branch 'master' into win32-x64-working

2015-04-12 10:35:00 -04:00

mkroom.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

mon.c

Merge branch 'master' into win32-x64-working

2015-04-12 10:35:00 -04:00

mondata.c

Make KOPS unconditional.

2015-03-17 18:45:56 +02:00

monmove.c

Make BARGETHROUGH unconditional.

2015-03-17 18:46:35 +02:00

monst.c

Merge branch 'master' into derek-farming

2015-04-10 16:56:30 -04:00

mplayer.c

Make GOLDOBJ unconditional.

2015-03-17 18:46:23 +02:00

mthrowu.c

Make TOURIST unconditional.

2015-03-17 18:46:01 +02:00

muse.c

Move some hard-coded string arrays into data files.

2015-03-18 22:05:10 +02:00

music.c

nhclose

2015-04-06 10:12:10 -04:00

o_init.c

Show object symbols in menu headings

2015-03-25 22:13:28 +02:00

objects.c

Merge branch 'master' into nhmall-booktribute

2015-04-12 10:02:17 -04:00

objnam.c

Merge branch 'master' into nhmall-booktribute

2015-04-12 10:02:17 -04:00

options.c

Merge branch 'master' into win32-x64-working

2015-04-12 00:15:40 -04:00

pager.c

Clive Crous' Dark Room patch

2015-04-07 21:01:21 +03:00

pickup.c

Merge branch 'master' into win32-x64-working

2015-04-12 00:15:40 -04:00

pline.c

Remove experimental Unicode support.

2015-03-17 18:46:45 +02:00

polyself.c

Add more explicit helpless reasons

2015-03-29 22:12:19 +03:00

potion.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

pray.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

priest.c

Add more explicit helpless reasons

2015-03-29 22:12:19 +03:00

quest.c

Make WIZARD unconditional.

2015-03-17 18:46:17 +02:00

questpgr.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

read.c

Merge branch 'master' into win32-x64-working

2015-04-12 10:35:00 -04:00

rect.c

Make WIZARD unconditional.

2015-03-17 18:46:17 +02:00

region.c

Add poison cloud glyph, fumaroles to fire plane.

2015-04-05 12:31:55 +03:00

restore.c

Merge branch 'master' into win32-x64-working

2015-04-12 00:15:40 -04:00

rip.c

Make GOLDOBJ unconditional.

2015-03-17 18:46:23 +02:00

rnd.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

role.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

rumors.c

Move some hard-coded string arrays into data files.

2015-03-18 22:05:10 +02:00

save.c

nhclose

2015-04-06 10:12:10 -04:00

shk.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

shknam.c

Changes to be committed:

2015-04-05 00:20:42 -04:00

sit.c

A lot more cleanup to rust and water.

2015-03-17 18:47:01 +02:00

sounds.c

Add more explicit helpless reasons

2015-03-29 22:12:19 +03:00

sp_lev.c

Merge branch 'master' into win32-x64-working

2015-04-12 00:15:40 -04:00

spell.c

Merge branch 'master' into nhmall-booktribute

2015-04-02 19:19:50 -04:00

steal.c

Add more explicit helpless reasons

2015-03-29 22:12:19 +03:00

steed.c

Make WIZARD unconditional.

2015-03-17 18:46:17 +02:00

sys.c

Allow disabling savefile UID checking in sysconf

2015-04-11 21:07:57 +03:00

teleport.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

timeout.c

Add more explicit helpless reasons

2015-03-29 22:12:19 +03:00

topten.c

Record in xlogfile if any bones were loaded

2015-04-02 13:06:45 +03:00

track.c

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

trap.c

Merge branch 'master' into win32-x64-working

2015-04-12 10:35:00 -04:00

u_init.c

Options to create the character blind or nudist

2015-03-30 22:12:54 +03:00

uhitm.c

Add more explicit helpless reasons

2015-03-29 22:12:19 +03:00

vault.c

Make GOLDOBJ unconditional.

2015-03-17 18:46:23 +02:00

version.c

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

vision.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

weapon.c

remove and transfer INVISIBLE_OBJECTS to branch

2015-03-17 18:46:49 +02:00

were.c

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

wield.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

windows.c

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

wizard.c

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

worm.c

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

worn.c

Merge branch 'master' into win32-x64-working

2015-04-05 23:42:15 -04:00

write.c

Bulk recovery of file CVS headers and addition of NHDT- headers.

2015-03-17 18:45:12 +02:00

zap.c

Merge branch 'master' into win32-x64-working

2015-04-12 10:35:00 -04:00