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 |
||
|---|---|---|
| .. | ||
| colormaps.cpp | ||
| colormaps.h | ||
| r_interpolate.cpp | ||
| r_interpolate.h | ||
| r_translate.cpp | ||
| r_translate.h | ||
| renderstyle.cpp | ||
| renderstyle.h | ||
| sprites.cpp | ||
| sprites.h | ||
| voxels.cpp | ||
| voxels.h | ||