Christoph Oelckers 2e0f999fea Merge branch 'master' into scripting ... Conflicts: src/p_effect.cpp src/p_effect.h src/p_local.h src/p_map.cpp src/thingdef/thingdef_codeptr.cpp wadsrc/static/actors/actor.txt wadsrc/static/actors/shared/inventory.txt zdoom.vcproj		2015-04-28 14:45:13 +02:00
..
chex	- added pickup sprite for Chex Quest's Mini Zorcher (i.e. pistol replacement.)	2015-04-27 10:24:49 +02:00
doom	- 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
heretic	- 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
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 branch 'master' into scripting	2015-04-28 14:45:13 +02: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 branch 'master' into scripting	2015-04-28 14:45:13 +02:00
constants.txt	Merge commit '3849cb86231ce24131a86e9c29795a8cf3706a3d' into scripting	2015-04-28 11:59:33 +02:00