Randy Heit 9744b9e0d9 Merge branch 'master' into scripting ... Conflicts: src/actor.h src/dobject.h src/dobjgc.cpp src/p_local.h src/thingdef/thingdef_codeptr.cpp		2016-01-21 12:45:06 -06: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 '38df0665e3a2018cf1d0028a36357df6c7e908e9' into scripting	2016-01-17 19:50:34 +01:00
strife	- fixed incorrect state settings in Macil.	2015-11-25 13:06:39 +01:00
actor.txt	Merge branch 'master' into scripting	2016-01-21 12:45:06 -06:00
constants.txt	Fixed an issue which caused A_Teleport to set the caller and itself to SpotZ's z position.	2016-01-20 18:18:00 -06:00