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
..
colormaps.cpp	fixed: if we allow long names for the fade table we must also check for them when the colormap gets loaded.	2014-05-13 11:39:25 +02:00
colormaps.h
r_interpolate.cpp
r_interpolate.h
r_translate.cpp	- Switched to a genericly extensible representation for userinfo.	2013-05-12 18:27:03 +00:00
r_translate.h	- Changed FRemapTable::AddDesaturation() to take doubles as parameters, since the C ABI always	2012-09-19 01:45:00 +00:00
renderstyle.cpp	- added new renderstyles AddStencil and AddShaded.	2014-05-13 21:16:06 +02:00
renderstyle.h	- added new renderstyles AddStencil and AddShaded.	2014-05-13 21:16:06 +02:00
sprites.cpp	Merge branch 'master' into gonesolong	2014-12-20 19:13:14 -06:00
sprites.h
voxels.cpp	- Added Gez's OverridePalette VOXELDEF flag.	2013-06-01 02:09:09 +00:00
voxels.h	- Added Gez's OverridePalette VOXELDEF flag.	2013-06-01 02:09:09 +00:00