Christoph Oelckers f7834061df Merge commit 'b6a4511dd1e74440fad99bc673c1f2b3680dba48' into scripting ... Conflicts: src/dobjtype.cpp src/p_conversation.cpp src/p_local.h src/p_things.cpp src/thingdef/thingdef_properties.cpp (This is just the conversationID to MAPINFO stuff to keep the conflicts as small as possible)		2015-04-28 13:08:18 +02:00
..
chex	- 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
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 commit '2ec8e2c2ac61d30f7f1d666ec58ca0fd37e2e3b0' into scripting	2015-04-28 12:54:01 +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 commit '4f7ec3ad891d556c0d3f680e209a120ed38e9cdb' into scripting	2015-04-28 12:48:33 +02:00
constants.txt	Merge commit '3849cb86231ce24131a86e9c29795a8cf3706a3d' into scripting	2015-04-28 11:59:33 +02:00