gzdoom-gles/wadsrc/static/actors
Christoph Oelckers 065c0a79cd Merge commit '4f7ec3ad891d556c0d3f680e209a120ed38e9cdb' into scripting
Conflicts:
	src/d_main.cpp
	src/info.cpp
	src/info.h
	src/p_acs.cpp
	src/p_interaction.cpp
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
	src/thingdef/thingdef_properties.cpp

(scripting branch update part 5)
2015-04-28 12:48:33 +02:00
..
chex - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +02:00
doom - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +02:00
heretic - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +02:00
hexen - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +02:00
raven - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +02:00
shared Merge commit '4f7ec3ad891d556c0d3f680e209a120ed38e9cdb' into scripting 2015-04-28 12:48:33 +02:00
strife - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +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