gzdoom-gles/wadsrc/static/actors
Randy Heit 2d87eb0ba2 Merge branch 'master' into gonesolong
Conflicts:
	src/CMakeLists.txt
	src/actor.h
	src/g_heretic/a_hereticmisc.cpp
	src/g_heretic/a_hereticweaps.cpp
	src/g_heretic/a_ironlich.cpp
	src/info.h
	src/namedef.h
	src/p_buildmap.cpp
	src/p_enemy.cpp
	src/p_map.cpp
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
	zdoom.vcproj
2014-12-20 19:13:14 -06:00
..
chex - Fixed some typos with chex quest obituaries and French translation error. 2014-07-15 21:20:05 -04:00
doom - changed the invisible waiting frame of the ExplosiveBarrel to use TNTA10 instead of the real barrel frame. This is so that sprite checks do not erroneously determine that there's still something to see. GZDoom's dynamic light code has problems with this. 2013-09-20 10:43:10 +02:00
heretic Enable fighting between different types of gargoyles and golems 2014-03-30 13:27:27 +03:00
hexen Add NOBLOOD flag to Heresiarch actor 2014-03-18 12:29:14 +02:00
raven Add NOGRAVITY to every Raven actor with FLOATBOB 2013-11-19 19:42:13 -06:00
shared Merge branch 'master' into gonesolong 2014-12-20 19:13:14 -06:00
strife Added slow states to relevant Strife monsters 2014-04-17 17:42:16 +02:00
actor.txt Merge branch 'master' into gonesolong 2014-12-20 19:13:14 -06:00
constants.txt Merge branch 'master' into gonesolong 2014-12-20 19:13:14 -06:00