Edward Richardson e5c67cee83 Merge branch conflicts fix ... - CONFLICT (content): Merge conflict in src/p_acs.cpp - Updated position variables		2016-01-21 10:49:57 +13: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	A_CustomPunch Extension	2015-11-30 11:42:08 -06:00
strife	- fixed incorrect state settings in Macil.	2015-11-25 13:06:39 +01:00
actor.txt	SpawnParticle functions	2015-12-08 22:58:24 +13:00
constants.txt	Cleanup the zoom/reload/userX handling for A_WeaponReady	2015-12-31 16:46:19 -06:00