Christoph Oelckers 5207aa6cc0 Merge commit '125afcf3defb901e23bd44d32fa86681ef1748f6' into scripting ... Conflicts: src/p_local.h src/p_mobj.cpp src/thingdef/thingdef_codeptr.cpp wadsrc/static/actors/shared/inventory.txt		2016-01-17 19:09:05 +01:00
..
chex	- added pickup sprite for Chex Quest's Mini Zorcher (i.e. pistol replacement.)	2015-04-27 10:24:49 +02:00
doom	- more DECORATE fixing of Doom monsters, this time the Mancubus.	2015-09-06 16:36:32 +02:00
heretic	Fixed missing hit sound for Heretic weapon Dragon Claw	2015-09-16 13:38:47 +03:00
hexen	- moved spawn ID definitions to MAPINFO as well and removed all 'Game' directives from DECORATE because editor and spawn numbers are the only thing that required them.	2015-04-04 00:39:09 +02:00
raven	- moved spawn ID definitions to MAPINFO as well and removed all 'Game' directives from DECORATE because editor and spawn numbers are the only thing that required them.	2015-04-04 00:39:09 +02:00
shared	Merge commit '125afcf3defb901e23bd44d32fa86681ef1748f6' into scripting	2016-01-17 19:09:05 +01:00
strife	- move conversation ID definition to MAPINFO as well. Uses the newly added filter feature to handle the teaser differences.	2015-04-05 00:31:15 +02:00
actor.txt	Merge commit '125afcf3defb901e23bd44d32fa86681ef1748f6' into scripting	2016-01-17 19:09:05 +01:00
constants.txt	Merge commit '125afcf3defb901e23bd44d32fa86681ef1748f6' into scripting	2016-01-17 19:09:05 +01:00