Randy Heit 775e33ede7 Merge branch 'master' into scripting ... Conflicts: src/actor.h src/g_doom/a_archvile.cpp src/g_shared/a_morph.cpp src/p_enemy.h src/p_local.h src/p_mobj.cpp src/sc_man_tokens.h src/thingdef/thingdef_codeptr.cpp src/thingdef/thingdef_exp.h src/thingdef/thingdef_expression.cpp src/thingdef/thingdef_states.cpp wadsrc/static/actors/actor.txt		2015-01-29 20:53:08 -06:00
..
chex	- Fixed some typos with chex quest obituaries and French translation error.	2014-07-15 21:20:05 -04:00
doom	Whoops.	2015-01-06 19:34:11 -06:00
heretic	- added pickup sprite and editor number for Heretic's gold wand.	2014-10-24 00:06:18 +02: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-21 21:15:11 -06:00
strife	- fixed: With P_ExplodeMissile now working properly it is no longer valid to terminate a looping sound in a missile's death state because it now gets called after the death sound has been started.	2014-11-25 16:49:27 +01:00
actor.txt	Merge branch 'master' into scripting	2015-01-29 20:53:08 -06:00
constants.txt	Merge branch 'master' into scripting	2015-01-29 20:53:08 -06:00