nhmall 77dd76ed17 Merge branch 'master' into win32-x64-working ...

Resolved Conflicts:
	src/cmd.c
	src/mkobj.c

 All conflicts fixed but you are still merging.

 Changes to be committed:
	modified:   dat/Priest.des
	modified:   dat/Rogue.des
	modified:   dat/Valkyrie.des
	modified:   dat/Wizard.des
	modified:   dat/gehennom.des
	modified:   src/cmd.c
	modified:   src/mkobj.c
	modified:   src/steal.c
	modified:   sys/share/lev_yacc.c
	modified:   util/lev_comp.y

2015-05-02 13:53:08 -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 win32-x64-working

2015-04-17 06:34:48 -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

Unify description of hero's visage into single function

2015-04-14 19:41:44 +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-14 18:23:48 -04:00

ball.c

fix a panic and infinite recursion

2015-04-29 23:53:31 -04:00

bones.c

nhclose

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

botl.c

win32_gui: implement STATUS_VIA_WINDOWPORT and STATUS_HILITES

2015-04-17 22:14:04 -07:00

cmd.c

Merge branch 'master' into win32-x64-working

2015-05-02 13:53:08 -04:00

dbridge.c

Merge branch 'master' into win32-x64-working

2015-04-30 06:39:44 -04:00

decl.c

Add litmus test

2015-04-13 18:30:53 +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-30 06:39:44 -04:00

display.c

fix a panic and infinite recursion

2015-04-29 23:53:31 -04: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-26 08:39:18 -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-26 08:39:18 -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

Unify guards yelling

2015-04-27 21:31:25 +03:00

dothrow.c

A camera may contain a picture-painting demon

2015-04-13 18:54:24 +03:00

drawing.c

Handle boulder-option in config file

2015-05-01 22:03:13 +03:00

dungeon.c

Merge branch 'master' into win32-x64-working

2015-04-30 06:39:44 -04:00

eat.c

Merge branch 'master' into win32-x64-working

2015-04-24 11:50:34 -04:00

end.c

Merge branch 'master' into win32-x64-working

2015-04-25 08:58:59 -04:00

engrave.c

isspace() usage

2015-04-25 02:11:13 -07: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-25 08:58:59 -04:00

fountain.c

Merge branch 'master' into win32-x64-working

2015-04-30 06:39:44 -04:00

hack.c

Merge branch 'master' into win32-x64-working

2015-04-22 08:08:50 -04:00

hacklib.c

isspace() usage

2015-04-25 02:11:13 -07:00

invent.c

Uninitialized variable

2015-05-01 14:52:25 +03:00

light.c

Merge branch 'master' into win32-x64-working

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

lock.c

lint

2015-04-22 19:17:49 -07: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-24 11:50:34 -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-25 08:58:59 -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 'AlexK-misc'

2015-05-01 18:24:59 -04:00

mkobj.c

Merge branch 'master' into win32-x64-working

2015-05-02 13:53:08 -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-05-01 08:22:36 -04:00

mondata.c

Some monsters can eat through iron bars

2015-04-13 19:41:51 +03:00

monmove.c

Unify getting terrain under drawbridge

2015-04-27 22:15:23 +03: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

Prevent monsters throwing items out of map

2015-04-29 16:28:05 +03:00

muse.c

Unify boulder dropping on player

2015-04-22 20:22:55 +03:00

music.c

YAFM for magic flute

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

o_init.c

Show object symbols in menu headings

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

objects.c

suggested booktribute mods

2015-04-18 17:45:27 -04:00

objnam.c

fix "bad fruit #0"

2015-04-18 20:18:43 -07:00

options.c

Merge branch 'master' into win32-x64-working

2015-05-01 18:36:39 -04:00

pager.c

comment termination bit

2015-04-25 15:49:14 -04:00

pickup.c

Merge branch 'master' into win32-x64-working

2015-04-30 06:39:44 -04:00

pline.c

Make coalescence message be smart about status

2015-04-21 21:47:33 -04:00

polyself.c

Give honorifics to vampires and elves

2015-04-23 21:46:10 +03:00

potion.c

Merge branch 'master' into win32-x64-working

2015-04-14 18:23:48 -04:00

pray.c

Merge branch 'master' into win32-x64-working

2015-04-14 18:23:48 -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

add debugger window support via _RPT*; add regex

2015-04-15 18:19:16 -04:00

read.c

Merge branch 'master' into win32-x64-working

2015-04-22 22:33:22 -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-23 07:03:45 -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

Merge branch 'master' into win32-x64-working

2015-04-23 07:03:45 -04:00

shk.c

Merge branch 'master' into win32-x64-working

2015-04-25 08:58:59 -04:00

shknam.c

Changes to be committed:

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

sit.c

Unquiver gold before making it vanish

2015-04-28 22:14:23 +03:00

sounds.c

Make sure can't chat out of the map

2015-04-20 18:09:59 +03:00

sp_lev.c

Fix a Borland compile error. Now fix the linking...

2015-04-26 15:47:14 +02:00

spell.c

Make spell list title obey menu_headings

2015-04-28 14:13:01 +03:00

steal.c

stabilize loss of gold

2015-05-01 18:01:12 -07:00

steed.c

Unify hero free hand check and msg

2015-04-22 09:02:38 +03: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-24 11:50:34 -04:00

u_init.c

Options to create the character blind or nudist

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

uhitm.c

Add is_watch define for watchmen

2015-04-27 21:09:26 +03:00

vault.c

mongone vs vault guard

2015-04-20 19:45:13 -07: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-30 06:39:44 -04:00