gzdoom-gles/wadsrc/static/actors
Randy Heit b3b0886b64 Merge branch 'scripting'
Conflicts:
	src/actor.h
	src/g_doom/a_doomweaps.cpp
	src/g_hexen/a_blastradius.cpp
	src/p_enemy.cpp
	src/p_enemy.h
	src/thingdef/thingdef.h
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/constants.txt
2016-02-04 15:17:22 -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 branch 'scripting' 2016-02-04 15:17:22 -06:00
strife - fixed incorrect state settings in Macil. 2015-11-25 13:06:39 +01:00
actor.txt Merge branch 'scripting' 2016-02-04 15:17:22 -06:00
constants.txt Merge branch 'scripting' 2016-02-04 15:17:22 -06:00