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