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 |
||
|---|---|---|
| .. | ||
| chex | ||
| doom | ||
| heretic | ||
| hexen | ||
| raven | ||
| shared | ||
| strife | ||
| actor.txt | ||
| constants.txt | ||